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

[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_atomic.c

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 965be21b82809fd81f0a6f2fd6aa11a25b0d6537..e6062c779aaf85d6b58842b921fb4a2677e8e95c 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1111,6 +1111,7 @@ static void drm_atomic_plane_print_state(struct drm_printer *p,
        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",
@@ -1585,7 +1586,7 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,
                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;
@@ -1595,7 +1596,7 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,
                                                       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)
@@ -1704,7 +1705,7 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,
                                                           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;
@@ -1716,7 +1717,7 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,
                        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;
@@ -1843,7 +1844,7 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state,
         */
        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);