| Message ID | 1452164052-21752-8-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 07, 2016 at 11:54:12AM +0100, Maarten Lankhorst wrote: > 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> One less weird difference between the planes. Yay. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +--- > drivers/gpu/drm/i915/intel_drv.h | 2 -- > 2 files changed, 1 insertion(+), 5 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, > 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 068050884353..5c41d2030594 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -669,8 +669,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 { > -- > 2.1.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
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, 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 068050884353..5c41d2030594 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -669,8 +669,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 {
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> --- drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +--- drivers/gpu/drm/i915/intel_drv.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-)