[Intel-gfx] [PATCH v2 12/14] drm/i915: Nuke fbc members from intel_crtc->atomic.
Ander Conselvan De Oliveira
conselvan2 at gmail.com
Tue Nov 10 05:21:46 PST 2015
On Tue, 2015-11-03 at 08:31 +0100, Maarten Lankhorst wrote:
> This leaves intel_crtc->atomic empty, so zap it as well.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 84 ++++++++++++++---------------------
> -
> drivers/gpu/drm/i915/intel_drv.h | 16 -------
> 2 files changed, 33 insertions(+), 67 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index c42e87c62133..ecd3169b45ef 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4746,7 +4746,6 @@ static void intel_post_plane_update(struct
> intel_crtc_state *old_crtc_state)
> {
> struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
> struct drm_atomic_state *old_state = old_crtc_state->base.state;
> - struct intel_crtc_atomic_commit *atomic = &crtc->atomic;
> struct intel_crtc_state *pipe_config =
> to_intel_crtc_state(crtc->base.state);
> struct drm_device *dev = crtc->base.dev;
> @@ -4762,22 +4761,20 @@ static void intel_post_plane_update(struct
> intel_crtc_state *old_crtc_state)
> if (pipe_config->wm_changed)
> intel_update_watermarks(&crtc->base);
>
> - if (atomic->update_fbc)
> - intel_fbc_update(dev_priv);
> -
> if (old_pri_state) {
> struct intel_plane_state *primary_state =
> to_intel_plane_state(primary->state);
> struct intel_plane_state *old_primary_state =
> to_intel_plane_state(old_pri_state);
>
> + if (primary_state->visible)
> + intel_fbc_update(dev_priv);
> +
> if (primary_state->visible &&
> (needs_modeset(&pipe_config->base) ||
> !old_primary_state->visible))
> intel_post_enable_primary(&crtc->base);
> }
> -
> - memset(atomic, 0, sizeof(*atomic));
> }
>
> static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state)
> @@ -4785,7 +4782,6 @@ static void intel_pre_plane_update(struct
> intel_crtc_state *old_crtc_state)
> struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
> struct drm_device *dev = crtc->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> - struct intel_crtc_atomic_commit *atomic = &crtc->atomic;
> struct intel_crtc_state *pipe_config =
> to_intel_crtc_state(crtc->base.state);
> struct drm_atomic_state *old_state = old_crtc_state->base.state;
> @@ -4794,9 +4790,6 @@ static void intel_pre_plane_update(struct
> intel_crtc_state *old_crtc_state)
> drm_atomic_get_existing_plane_state(old_state, primary);
> bool modeset = needs_modeset(&pipe_config->base);
>
> - if (atomic->disable_fbc)
> - intel_fbc_disable_crtc(crtc);
> -
> if (old_pri_state) {
> struct intel_plane_state *primary_state =
> to_intel_plane_state(primary->state);
> @@ -4804,8 +4797,27 @@ static void intel_pre_plane_update(struct
> intel_crtc_state *old_crtc_state)
> to_intel_plane_state(old_pri_state);
>
> if (old_primary_state->visible &&
> - (modeset || !primary_state->visible))
> + (modeset || !primary_state->visible)) {
> + intel_fbc_disable_crtc(crtc);
> +
> intel_pre_disable_primary(&crtc->base);
> + } else if (primary_state->visible &&
> + INTEL_INFO(dev_priv)->gen <= 4 && !IS_G4X(dev_priv)
> &&
> + dev_priv->fbc.crtc == crtc &&
> + primary_state->base.rotation != BIT(DRM_ROTATE_0)) {
> + /*
> + * FBC does not work on some platforms for rotated
> + * planes, so disable it when rotation is not 0 and
> + * update it when rotation is set back to 0.
The comment gets a bit confusing now, since the update call is done in
intel_post_plane_update() it is a bit difficult to make the connection.
> + *
> + * FIXME: This is redundant with the fbc update done
> in
> + * the primary plane enable function except that that
> + * one is done too late. We eventually need to unify
> + * this.
> + */
> +
> + intel_fbc_disable_crtc(crtc);
> + }
I think having all this fbc logic here makes this function hard to read. I'd
suggest moving the fbc rotation to a bool function, and then this could be
written like this:
bool turn_off = old_primary_state->visible &&
(modeset || !primary_state->visible);
if (turn_off || !fbc_supports_rotation(...))
intel_fbc_disable_crtc(crtc);
if (turn_off)
intel_pre_disable_primary(...);
Would look a bit cleaner, IMO.
Ander
> }
>
> if (pipe_config->visible_changed) {
> @@ -11642,7 +11654,6 @@ int intel_plane_atomic_calc_changes(struct
> drm_crtc_state *crtc_state,
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> struct drm_plane *plane = plane_state->plane;
> struct drm_device *dev = crtc->dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_plane_state *old_plane_state =
> to_intel_plane_state(plane->state);
> int idx = intel_crtc->base.base.id, ret;
> @@ -11701,46 +11712,17 @@ int intel_plane_atomic_calc_changes(struct
> drm_crtc_state *crtc_state,
> if (visible || was_visible)
> pipe_config->fb_bits |= to_intel_plane(plane)
> ->frontbuffer_bit;
>
> - switch (plane->type) {
> - case DRM_PLANE_TYPE_PRIMARY:
> - if (turn_off)
> - intel_crtc->atomic.disable_fbc = true;
> -
> - /*
> - * FBC does not work on some platforms for rotated
> - * planes, so disable it when rotation is not 0 and
> - * update it when rotation is set back to 0.
> - *
> - * FIXME: This is redundant with the fbc update done in
> - * the primary plane enable function except that that
> - * one is done too late. We eventually need to unify
> - * this.
> - */
> -
> - if (visible &&
> - INTEL_INFO(dev)->gen <= 4 && !IS_G4X(dev) &&
> - dev_priv->fbc.crtc == intel_crtc &&
> - plane_state->rotation != BIT(DRM_ROTATE_0))
> - intel_crtc->atomic.disable_fbc = true;
> -
> - intel_crtc->atomic.update_fbc |= visible || mode_changed;
> - break;
> - case DRM_PLANE_TYPE_CURSOR:
> - break;
> - case DRM_PLANE_TYPE_OVERLAY:
> - /*
> - * WaCxSRDisabledForSpriteScaling:ivb
> - *
> - * cstate->update_wm was already set above, so this flag will
> - * take effect when we commit and program watermarks.
> - */
> - if (IS_IVYBRIDGE(dev) &&
> - needs_scaling(to_intel_plane_state(plane_state)) &&
> - !needs_scaling(old_plane_state))
> - pipe_config->disable_lp_wm = true;
> + /*
> + * WaCxSRDisabledForSpriteScaling:ivb
> + *
> + * cstate->update_wm was already set above, so this flag will
> + * take effect when we commit and program watermarks.
> + */
> + if (plane->type == DRM_PLANE_TYPE_OVERLAY && IS_IVYBRIDGE(dev) &&
> + needs_scaling(to_intel_plane_state(plane_state)) &&
> + !needs_scaling(old_plane_state))
> + pipe_config->disable_lp_wm = true;
>
> - break;
> - }
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index aceeeccec09b..e2261e22642d 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -529,20 +529,6 @@ struct intel_mmio_flip {
> unsigned int rotation;
> };
>
> -/*
> - * Tracking of operations that need to be performed at the beginning/end of
> an
> - * atomic commit, outside the atomic section where interrupts are disabled.
> - * These are generally operations that grab mutexes or might otherwise sleep
> - * and thus can't be run with interrupts disabled.
> - */
> -struct intel_crtc_atomic_commit {
> - /* Sleepable operations to perform before commit */
> - bool disable_fbc;
> -
> - /* Sleepable operations to perform after commit */
> - bool update_fbc;
> -};
> -
> struct intel_crtc {
> struct drm_crtc base;
> enum pipe pipe;
> @@ -603,8 +589,6 @@ struct intel_crtc {
> int scanline_start;
> } debug;
>
> - struct intel_crtc_atomic_commit atomic;
> -
> /* scalers available on this crtc */
> int num_scalers;
>
More information about the Intel-gfx
mailing list