On Tue, Jun 14, 2016 at 02:24:20PM +0200, Maarten Lankhorst wrote: > The patch was reverted as part of the original nonblocking commit > support, but is required for any kind of nonblocking commit. > > This is required to let fbc updates run async. It has a lot of > checks whether certain locks are taken, which can be removed when > the relevant states are passed in as pointers. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > Link: http://patchwork.freedesktop.org/patch/msgid/1463490484-19540-17-git-send-email-maarten.lankhorst@xxxxxxxxxxxxxxx > Reviewed-by: Patrik Jakobsson <patrik.jakobsson@xxxxxxxxxxxxxxx> lgtm too, Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > --- > drivers/gpu/drm/i915/intel_display.c | 8 +++++--- > drivers/gpu/drm/i915/intel_drv.h | 8 ++++++-- > drivers/gpu/drm/i915/intel_fbc.c | 39 +++++++++++++++++------------------- > 3 files changed, 29 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 5d0081067bac..ddcf966c515a 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -4641,7 +4641,7 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state) > struct intel_plane_state *old_primary_state = > to_intel_plane_state(old_pri_state); > > - intel_fbc_pre_update(crtc); > + intel_fbc_pre_update(crtc, pipe_config, primary_state); > > if (old_primary_state->visible && > (modeset || !primary_state->visible)) > @@ -11708,7 +11708,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, > > crtc->primary->fb = fb; > update_state_fb(crtc->primary); > - intel_fbc_pre_update(intel_crtc); > + > + intel_fbc_pre_update(intel_crtc, intel_crtc->config, > + to_intel_plane_state(primary->state)); > > work->pending_flip_obj = obj; > > @@ -13799,7 +13801,7 @@ static int intel_atomic_commit(struct drm_device *dev, > > if (crtc->state->active && > drm_atomic_get_existing_plane_state(state, crtc->primary)) > - intel_fbc_enable(intel_crtc); > + intel_fbc_enable(intel_crtc, pipe_config, to_intel_plane_state(crtc->primary->state)); > > if (crtc->state->active) > drm_atomic_helper_commit_planes_on_crtc(old_crtc_state); > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 8dc67adace6b..0c1dc9bae170 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1431,11 +1431,15 @@ static inline void intel_fbdev_restore_mode(struct drm_device *dev) > void intel_fbc_choose_crtc(struct drm_i915_private *dev_priv, > struct drm_atomic_state *state); > bool intel_fbc_is_active(struct drm_i915_private *dev_priv); > -void intel_fbc_pre_update(struct intel_crtc *crtc); > +void intel_fbc_pre_update(struct intel_crtc *crtc, > + struct intel_crtc_state *crtc_state, > + struct intel_plane_state *plane_state); > void intel_fbc_post_update(struct intel_crtc *crtc); > void intel_fbc_init(struct drm_i915_private *dev_priv); > void intel_fbc_init_pipe_state(struct drm_i915_private *dev_priv); > -void intel_fbc_enable(struct intel_crtc *crtc); > +void intel_fbc_enable(struct intel_crtc *crtc, > + struct intel_crtc_state *crtc_state, > + struct intel_plane_state *plane_state); > void intel_fbc_disable(struct intel_crtc *crtc); > void intel_fbc_global_disable(struct drm_i915_private *dev_priv); > void intel_fbc_invalidate(struct drm_i915_private *dev_priv, > diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c > index 45ee07b888a0..ecabd59ffbaf 100644 > --- a/drivers/gpu/drm/i915/intel_fbc.c > +++ b/drivers/gpu/drm/i915/intel_fbc.c > @@ -481,10 +481,10 @@ static void intel_fbc_deactivate(struct drm_i915_private *dev_priv) > intel_fbc_hw_deactivate(dev_priv); > } > > -static bool multiple_pipes_ok(struct intel_crtc *crtc) > +static bool multiple_pipes_ok(struct intel_crtc *crtc, > + struct intel_plane_state *plane_state) > { > - struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; > - struct drm_plane *primary = crtc->base.primary; > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > struct intel_fbc *fbc = &dev_priv->fbc; > enum pipe pipe = crtc->pipe; > > @@ -492,9 +492,7 @@ static bool multiple_pipes_ok(struct intel_crtc *crtc) > if (!no_fbc_on_multiple_pipes(dev_priv)) > return true; > > - WARN_ON(!drm_modeset_is_locked(&primary->mutex)); > - > - if (to_intel_plane_state(primary->state)->visible) > + if (plane_state->visible) > fbc->visible_pipes_mask |= (1 << pipe); > else > fbc->visible_pipes_mask &= ~(1 << pipe); > @@ -709,21 +707,16 @@ static bool intel_fbc_hw_tracking_covers_screen(struct intel_crtc *crtc) > return effective_w <= max_w && effective_h <= max_h; > } > > -static void intel_fbc_update_state_cache(struct intel_crtc *crtc) > +static void intel_fbc_update_state_cache(struct intel_crtc *crtc, > + struct intel_crtc_state *crtc_state, > + struct intel_plane_state *plane_state) > { > struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; > struct intel_fbc *fbc = &dev_priv->fbc; > struct intel_fbc_state_cache *cache = &fbc->state_cache; > - struct intel_crtc_state *crtc_state = > - to_intel_crtc_state(crtc->base.state); > - struct intel_plane_state *plane_state = > - to_intel_plane_state(crtc->base.primary->state); > struct drm_framebuffer *fb = plane_state->base.fb; > struct drm_i915_gem_object *obj; > > - WARN_ON(!drm_modeset_is_locked(&crtc->base.mutex)); > - WARN_ON(!drm_modeset_is_locked(&crtc->base.primary->mutex)); > - > cache->crtc.mode_flags = crtc_state->base.adjusted_mode.flags; > if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > cache->crtc.hsw_bdw_pixel_rate = > @@ -888,7 +881,9 @@ static bool intel_fbc_reg_params_equal(struct intel_fbc_reg_params *params1, > return memcmp(params1, params2, sizeof(*params1)) == 0; > } > > -void intel_fbc_pre_update(struct intel_crtc *crtc) > +void intel_fbc_pre_update(struct intel_crtc *crtc, > + struct intel_crtc_state *crtc_state, > + struct intel_plane_state *plane_state) > { > struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; > struct intel_fbc *fbc = &dev_priv->fbc; > @@ -898,7 +893,7 @@ void intel_fbc_pre_update(struct intel_crtc *crtc) > > mutex_lock(&fbc->lock); > > - if (!multiple_pipes_ok(crtc)) { > + if (!multiple_pipes_ok(crtc, plane_state)) { > fbc->no_fbc_reason = "more than one pipe active"; > goto deactivate; > } > @@ -906,7 +901,7 @@ void intel_fbc_pre_update(struct intel_crtc *crtc) > if (!fbc->enabled || fbc->crtc != crtc) > goto unlock; > > - intel_fbc_update_state_cache(crtc); > + intel_fbc_update_state_cache(crtc, crtc_state, plane_state); > > deactivate: > intel_fbc_deactivate(dev_priv); > @@ -1090,7 +1085,9 @@ out: > * intel_fbc_enable multiple times for the same pipe without an > * intel_fbc_disable in the middle, as long as it is deactivated. > */ > -void intel_fbc_enable(struct intel_crtc *crtc) > +void intel_fbc_enable(struct intel_crtc *crtc, > + struct intel_crtc_state *crtc_state, > + struct intel_plane_state *plane_state) > { > struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; > struct intel_fbc *fbc = &dev_priv->fbc; > @@ -1103,19 +1100,19 @@ void intel_fbc_enable(struct intel_crtc *crtc) > if (fbc->enabled) { > WARN_ON(fbc->crtc == NULL); > if (fbc->crtc == crtc) { > - WARN_ON(!crtc->config->enable_fbc); > + WARN_ON(!crtc_state->enable_fbc); > WARN_ON(fbc->active); > } > goto out; > } > > - if (!crtc->config->enable_fbc) > + if (!crtc_state->enable_fbc) > goto out; > > WARN_ON(fbc->active); > WARN_ON(fbc->crtc != NULL); > > - intel_fbc_update_state_cache(crtc); > + intel_fbc_update_state_cache(crtc, crtc_state, plane_state); > if (intel_fbc_alloc_cfb(crtc)) { > fbc->no_fbc_reason = "not enough stolen memory"; > goto out; > -- > 2.5.5 > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
