drm/i915: Remove commit_plane function pointer.

With sprites, cursors and primary planes taking the atomic state
this is now unused. It's removed in a separate commit to allow
a revert.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1452164052-21752-8-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index 969aa410deaae67ba4599c7e32b8d673cc693dd5..e0b851a0004abd3dc2dde47e9b7af90e5a177510 100644 (file)
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -198,9 +198,7 @@ static void intel_plane_atomic_update(struct drm_plane *plane,
        struct drm_crtc_state *crtc_state =
                drm_atomic_get_existing_crtc_state(old_state->state, crtc);
 
-       if (intel_plane->commit_plane)
-               intel_plane->commit_plane(plane, intel_state);
-       else if (intel_state->visible)
+       if (intel_state->visible)
                intel_plane->update_plane(plane,
                                          to_intel_crtc_state(crtc_state),
                                          intel_state);

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 6f3850beccd9f080210645c11173e54b80542426..bdfe4035e0744a4b4acc4da4912f8efcf333b085 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -692,8 +692,6 @@ struct intel_plane {
        int (*check_plane)(struct drm_plane *plane,
                           struct intel_crtc_state *crtc_state,
                           struct intel_plane_state *state);
-       void (*commit_plane)(struct drm_plane *plane,
-                            struct intel_plane_state *state);
 };
 
 struct intel_watermark_params {