| Message ID | 1452164052-21752-3-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 07, 2016 at 11:54:07AM +0100, Maarten Lankhorst wrote: > Use update_plane and disable_plane directly. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_atomic_plane.c | 12 +++++++++++- > drivers/gpu/drm/i915/intel_sprite.c | 19 ------------------- > 2 files changed, 11 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c > index 856c3118bb87..969aa410deaa 100644 > --- a/drivers/gpu/drm/i915/intel_atomic_plane.c > +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c > @@ -194,8 +194,18 @@ static void intel_plane_atomic_update(struct drm_plane *plane, > struct intel_plane *intel_plane = to_intel_plane(plane); > struct intel_plane_state *intel_state = > to_intel_plane_state(plane->state); > + struct drm_crtc *crtc = plane->state->crtc ?: old_state->crtc; > + struct drm_crtc_state *crtc_state = > + drm_atomic_get_existing_crtc_state(old_state->state, crtc); > > - intel_plane->commit_plane(plane, intel_state); > + if (intel_plane->commit_plane) > + intel_plane->commit_plane(plane, intel_state); > + else if (intel_state->visible) > + intel_plane->update_plane(plane, > + to_intel_crtc_state(crtc_state), > + intel_state); > + else > + intel_plane->disable_plane(plane, crtc); > } > > const struct drm_plane_helper_funcs intel_plane_helper_funcs = { > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index 9f64289333e8..4d448b990c50 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -931,24 +931,6 @@ intel_check_sprite_plane(struct drm_plane *plane, > return 0; > } > > -static void > -intel_commit_sprite_plane(struct drm_plane *plane, > - struct intel_plane_state *state) > -{ > - struct intel_plane *intel_plane = to_intel_plane(plane); > - > - if (state->visible) { > - struct intel_crtc_state *crtc_state = > - to_intel_crtc(state->base.crtc)->config; > - > - intel_plane->update_plane(plane, crtc_state, state); > - } else { > - struct drm_crtc *crtc = state->base.crtc; > - > - intel_plane->disable_plane(plane, crtc ?: plane->crtc); > - } > -} > - > int intel_sprite_set_colorkey(struct drm_device *dev, void *data, > struct drm_file *file_priv) > { > @@ -1130,7 +1112,6 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) > intel_plane->plane = plane; > intel_plane->frontbuffer_bit = INTEL_FRONTBUFFER_SPRITE(pipe, plane); > intel_plane->check_plane = intel_check_sprite_plane; > - intel_plane->commit_plane = intel_commit_sprite_plane; > possible_crtcs = (1 << pipe); > ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs, > &intel_plane_funcs, > -- > 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 856c3118bb87..969aa410deaa 100644 --- a/drivers/gpu/drm/i915/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c @@ -194,8 +194,18 @@ static void intel_plane_atomic_update(struct drm_plane *plane, struct intel_plane *intel_plane = to_intel_plane(plane); struct intel_plane_state *intel_state = to_intel_plane_state(plane->state); + struct drm_crtc *crtc = plane->state->crtc ?: old_state->crtc; + struct drm_crtc_state *crtc_state = + drm_atomic_get_existing_crtc_state(old_state->state, crtc); - intel_plane->commit_plane(plane, intel_state); + if (intel_plane->commit_plane) + intel_plane->commit_plane(plane, intel_state); + else if (intel_state->visible) + intel_plane->update_plane(plane, + to_intel_crtc_state(crtc_state), + intel_state); + else + intel_plane->disable_plane(plane, crtc); } const struct drm_plane_helper_funcs intel_plane_helper_funcs = { diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 9f64289333e8..4d448b990c50 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -931,24 +931,6 @@ intel_check_sprite_plane(struct drm_plane *plane, return 0; } -static void -intel_commit_sprite_plane(struct drm_plane *plane, - struct intel_plane_state *state) -{ - struct intel_plane *intel_plane = to_intel_plane(plane); - - if (state->visible) { - struct intel_crtc_state *crtc_state = - to_intel_crtc(state->base.crtc)->config; - - intel_plane->update_plane(plane, crtc_state, state); - } else { - struct drm_crtc *crtc = state->base.crtc; - - intel_plane->disable_plane(plane, crtc ?: plane->crtc); - } -} - int intel_sprite_set_colorkey(struct drm_device *dev, void *data, struct drm_file *file_priv) { @@ -1130,7 +1112,6 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) intel_plane->plane = plane; intel_plane->frontbuffer_bit = INTEL_FRONTBUFFER_SPRITE(pipe, plane); intel_plane->check_plane = intel_check_sprite_plane; - intel_plane->commit_plane = intel_commit_sprite_plane; possible_crtcs = (1 << pipe); ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs, &intel_plane_funcs,
Use update_plane and disable_plane directly. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/intel_atomic_plane.c | 12 +++++++++++- drivers/gpu/drm/i915/intel_sprite.c | 19 ------------------- 2 files changed, 11 insertions(+), 20 deletions(-)