Merge commit 'refs/for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm...

"mali-dp driver changes for drm-next, includes the driver implementation
for writeback, improvements for power management handling in the driver
and a debugfs entry for reporting possible internal errors. Please pull
at your earliest convenience.

Boris Brezillon is also interested in this pull as he is going to change
slightly the parameter for the writeback connector's atomic_commit() and
he needs to fix the mali-dp driver in his series."

Signed-off-by: Dave Airlie <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --combined drivers/gpu/drm/drm_atomic.c
index d5cefb1cb2a240988a213b568916a876c4c177d7,965be21b82809fd81f0a6f2fd6aa11a25b0d6537..4215be9a9fc5692e99111523b43f443d602b2da4
--- 1/drivers/gpu/drm/drm_atomic.c
--- 2/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@@ -1436,6 -1436,10 +1436,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);
  }
@@@ -1581,7 -1585,7 +1585,7 @@@ drm_atomic_set_crtc_for_plane(struct dr
                if (WARN_ON(IS_ERR(crtc_state)))
                        return PTR_ERR(crtc_state);
  
 -              crtc_state->plane_mask &= ~(1 << drm_plane_index(plane));
 +              crtc_state->plane_mask &= ~drm_plane_mask(plane);
        }
  
        plane_state->crtc = crtc;
@@@ -1591,7 -1595,7 +1595,7 @@@
                                                       crtc);
                if (IS_ERR(crtc_state))
                        return PTR_ERR(crtc_state);
 -              crtc_state->plane_mask |= (1 << drm_plane_index(plane));
 +              crtc_state->plane_mask |= drm_plane_mask(plane);
        }
  
        if (crtc)
@@@ -1700,7 -1704,7 +1704,7 @@@ drm_atomic_set_crtc_for_connector(struc
                                                           conn_state->crtc);
  
                crtc_state->connector_mask &=
 -                      ~(1 << drm_connector_index(conn_state->connector));
 +                      ~drm_connector_mask(conn_state->connector);
  
                drm_connector_put(conn_state->connector);
                conn_state->crtc = NULL;
@@@ -1712,7 -1716,7 +1716,7 @@@
                        return PTR_ERR(crtc_state);
  
                crtc_state->connector_mask |=
 -                      1 << drm_connector_index(conn_state->connector);
 +                      drm_connector_mask(conn_state->connector);
  
                drm_connector_get(conn_state->connector);
                conn_state->crtc = crtc;
@@@ -1839,7 -1843,7 +1843,7 @@@ drm_atomic_add_affected_connectors(stru
         */
        drm_connector_list_iter_begin(state->dev, &conn_iter);
        drm_for_each_connector_iter(connector, &conn_iter) {
 -              if (!(crtc_state->connector_mask & (1 << drm_connector_index(connector))))
 +              if (!(crtc_state->connector_mask & drm_connector_mask(connector)))
                        continue;
  
                conn_state = drm_atomic_get_connector_state(state, connector);