diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-01-07 05:54:12 -0500 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-01-07 07:52:04 -0500 |
commit | c03242b1317694e50e2c781026bb7bee8dfcc2bb (patch) | |
tree | d759f400238dc7898992d27e0e0519c886213659 /drivers/gpu/drm/i915/intel_atomic_plane.c | |
parent | a8d201af68506b375b701d0d8dbe8487034256f2 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic_plane.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_atomic_plane.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c index 969aa410deaa..e0b851a0004a 100644 --- 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, | |||
198 | struct drm_crtc_state *crtc_state = | 198 | struct drm_crtc_state *crtc_state = |
199 | drm_atomic_get_existing_crtc_state(old_state->state, crtc); | 199 | drm_atomic_get_existing_crtc_state(old_state->state, crtc); |
200 | 200 | ||
201 | if (intel_plane->commit_plane) | 201 | if (intel_state->visible) |
202 | intel_plane->commit_plane(plane, intel_state); | ||
203 | else if (intel_state->visible) | ||
204 | intel_plane->update_plane(plane, | 202 | intel_plane->update_plane(plane, |
205 | to_intel_crtc_state(crtc_state), | 203 | to_intel_crtc_state(crtc_state), |
206 | intel_state); | 204 | intel_state); |