drm/i915: Switch to full atomic helpers for plane updates/disable, take two

Switch from our plane update/disable entrypoints to use the full atomic
helpers (which generate a top-level atomic transaction) rather than the
transitional helpers (which only create/manipulate orphaned plane states
independent of a top-level transaction).  Various upcoming work (SKL
scalers, atomic watermarks, etc.) requires a full atomic transaction to
behave properly/cleanly.

Last time we tried this, we had to back out the change because we still
call the drm_plane vfuncs directly from within our legacy modesetting
code.  This potentially results in nested atomic transactions, locking
collisions, and other failures.  To avoid that problem again, we
sidestep the issue by calling the transitional helpers directly (rather
than through a vfunc) when we're nested inside of other legacy
modesetting code.  However this does allow legacy SetPlane() ioctl's to
process an entire drm_atomic_state transaction, which is important for
upcoming patches.

Cc: Chandra Konduru <chandra.konduru@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 7bfe2af42030f90c23582599acaa34fb85a54348..11b958a56515ae259036d4ba76c1ce9735edd8e2 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5576,7 +5576,7 @@ static void intel_crtc_disable(struct drm_crtc *crtc)
        dev_priv->display.crtc_disable(crtc);
        dev_priv->display.off(crtc);
 
-       crtc->primary->funcs->disable_plane(crtc->primary);
+       drm_plane_helper_disable(crtc->primary);
 
        /* Update computed state. */
        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
@@ -11731,11 +11731,11 @@ static int __intel_set_mode(struct drm_crtc *crtc,
                int vdisplay, hdisplay;
 
                drm_crtc_get_hv_timing(mode, &hdisplay, &vdisplay);
-               ret = primary->funcs->update_plane(primary, &intel_crtc->base,
-                                                  fb, 0, 0,
-                                                  hdisplay, vdisplay,
-                                                  x << 16, y << 16,
-                                                  hdisplay << 16, vdisplay << 16);
+               ret = drm_plane_helper_update(primary, &intel_crtc->base,
+                                             fb, 0, 0,
+                                             hdisplay, vdisplay,
+                                             x << 16, y << 16,
+                                             hdisplay << 16, vdisplay << 16);
        }
 
        /* Now enable the clocks, plane, pipe, and connectors that we set up. */
@@ -12286,10 +12286,10 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
                int vdisplay, hdisplay;
 
                drm_crtc_get_hv_timing(set->mode, &hdisplay, &vdisplay);
-               ret = primary->funcs->update_plane(primary, set->crtc, set->fb,
-                                                  0, 0, hdisplay, vdisplay,
-                                                  set->x << 16, set->y << 16,
-                                                  hdisplay << 16, vdisplay << 16);
+               ret = drm_plane_helper_update(primary, set->crtc, set->fb,
+                                             0, 0, hdisplay, vdisplay,
+                                             set->x << 16, set->y << 16,
+                                             hdisplay << 16, vdisplay << 16);
 
                /*
                 * We need to make sure the primary plane is re-enabled if it
@@ -12773,8 +12773,8 @@ void intel_plane_destroy(struct drm_plane *plane)
 }
 
 const struct drm_plane_funcs intel_plane_funcs = {
-       .update_plane = drm_plane_helper_update,
-       .disable_plane = drm_plane_helper_disable,
+       .update_plane = drm_atomic_helper_update_plane,
+       .disable_plane = drm_atomic_helper_disable_plane,
        .destroy = intel_plane_destroy,
        .set_property = drm_atomic_helper_plane_set_property,
        .atomic_get_property = intel_plane_atomic_get_property,

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index e9ff6fc6126726a24bdf19e4f0f5b50adab8c0d5..f009c8f970eafbe41d2d24d5fa10422faf32b324 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1139,11 +1139,11 @@ int intel_plane_restore(struct drm_plane *plane)
        if (!plane->crtc || !plane->state->fb)
                return 0;
 
-       return plane->funcs->update_plane(plane, plane->crtc, plane->state->fb,
-                                 plane->state->crtc_x, plane->state->crtc_y,
-                                 plane->state->crtc_w, plane->state->crtc_h,
-                                 plane->state->src_x, plane->state->src_y,
-                                 plane->state->src_w, plane->state->src_h);
+       return drm_plane_helper_update(plane, plane->crtc, plane->state->fb,
+                                      plane->state->crtc_x, plane->state->crtc_y,
+                                      plane->state->crtc_w, plane->state->crtc_h,
+                                      plane->state->src_x, plane->state->src_y,
+                                      plane->state->src_w, plane->state->src_h);
 }
 
 static uint32_t ilk_plane_formats[] = {