Merge drm-upstream/drm-next into drm-misc-next

Pull in the malidp writeback implementation for further work on writeback in drm-misc-next.

Signed-off-by: Gustavo Padovan <[email protected]>

diff --combined drivers/gpu/drm/drm_atomic.c
index 7c55991170cc8eab3c3a6cef04adb261f928802b,4215be9a9fc5692e99111523b43f443d602b2da4..e6062c779aaf85d6b58842b921fb4a2677e8e95c
--- 1/drivers/gpu/drm/drm_atomic.c
--- 2/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@@ -1111,7 -1111,6 +1111,7 @@@ static void drm_atomic_plane_print_stat
        drm_printf(p, "\tcrtc-pos=" DRM_RECT_FMT "\n", DRM_RECT_ARG(&dest));
        drm_printf(p, "\tsrc-pos=" DRM_RECT_FP_FMT "\n", DRM_RECT_FP_ARG(&src));
        drm_printf(p, "\trotation=%x\n", state->rotation);
 +      drm_printf(p, "\tnormalized-zpos=%x\n", state->normalized_zpos);
        drm_printf(p, "\tcolor-encoding=%s\n",
                   drm_get_color_encoding_name(state->color_encoding));
        drm_printf(p, "\tcolor-range=%s\n",
@@@ -1437,6 -1436,10 +1437,10 @@@ static void drm_atomic_connector_print_
        drm_printf(p, "connector[%u]: %s\n", connector->base.id, connector->name);
        drm_printf(p, "\tcrtc=%s\n", state->crtc ? state->crtc->name : "(null)");
  
+       if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
+               if (state->writeback_job && state->writeback_job->fb)
+                       drm_printf(p, "\tfb=%d\n", state->writeback_job->fb->base.id);
+ 
        if (connector->funcs->atomic_print_state)
                connector->funcs->atomic_print_state(p, state);
  }