[Intel-gfx] [PATCH v2 09/11] drm/i915: Implement async flip for ivb/hsw

[Karthik B S]

On 1/11/2021 10:07 PM, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Add support for async flips on ivb/hsw. Unlike bdw+ we don't need
> any workarounds to disable async flips. Apart from that the only
> real difference from the bdw implementation is the location of the
> flip_done interrupt bits.
>
> Cc: Karthik B S <karthik.b.s at intel.com>
> Cc: Vandita Kulkarni <vandita.kulkarni at intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Looks good to me.

Reviewed-by: Karthik B S <karthik.b.s at intel.com>

> ---
>   drivers/gpu/drm/i915/display/i9xx_plane.c    | 24 ++++++++++++++++++++
>   drivers/gpu/drm/i915/display/intel_display.c |  3 ++-
>   drivers/gpu/drm/i915/i915_irq.c              |  6 +++++
>   3 files changed, 32 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
> index 44004558ebbd..f75be2292caa 100644
> --- a/drivers/gpu/drm/i915/display/i9xx_plane.c
> +++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
> @@ -539,6 +539,26 @@ bdw_primary_disable_flip_done(struct intel_plane *plane)
>   	spin_unlock_irq(&i915->irq_lock);
>   }
>   
> +static void
> +ivb_primary_enable_flip_done(struct intel_plane *plane)
> +{
> +	struct drm_i915_private *i915 = to_i915(plane->base.dev);
> +
> +	spin_lock_irq(&i915->irq_lock);
> +	ilk_enable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
> +	spin_unlock_irq(&i915->irq_lock);
> +}
> +
> +static void
> +ivb_primary_disable_flip_done(struct intel_plane *plane)
> +{
> +	struct drm_i915_private *i915 = to_i915(plane->base.dev);
> +
> +	spin_lock_irq(&i915->irq_lock);
> +	ilk_disable_display_irq(i915, DE_PLANE_FLIP_DONE_IVB(plane->i9xx_plane));
> +	spin_unlock_irq(&i915->irq_lock);
> +}
> +
>   static bool i9xx_plane_get_hw_state(struct intel_plane *plane,
>   				    enum pipe *pipe)
>   {
> @@ -757,6 +777,10 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
>   		plane->async_flip = g4x_primary_async_flip;
>   		plane->enable_flip_done = bdw_primary_enable_flip_done;
>   		plane->disable_flip_done = bdw_primary_disable_flip_done;
> +	} else if (IS_HASWELL(dev_priv) || IS_IVYBRIDGE(dev_priv)) {
> +		plane->async_flip = g4x_primary_async_flip;
> +		plane->enable_flip_done = ivb_primary_enable_flip_done;
> +		plane->disable_flip_done = ivb_primary_disable_flip_done;
>   	}
>   
>   	if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv))
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 6db3e6b69a53..25da68f12df1 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -2122,7 +2122,8 @@ static unsigned int intel_linear_alignment(const struct drm_i915_private *dev_pr
>   
>   static bool has_async_flips(struct drm_i915_private *i915)
>   {
> -	return INTEL_GEN(i915) >= 9 || IS_BROADWELL(i915);
> +	return INTEL_GEN(i915) >= 9 || IS_BROADWELL(i915) ||
> +		IS_HASWELL(i915) || IS_IVYBRIDGE(i915);
>   }
>   
>   static unsigned int intel_surf_alignment(const struct drm_framebuffer *fb,
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 407a9dd0a21e..3518f6f23896 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2081,6 +2081,9 @@ static void ivb_display_irq_handler(struct drm_i915_private *dev_priv,
>   	for_each_pipe(dev_priv, pipe) {
>   		if (de_iir & DE_PIPE_VBLANK_IVB(pipe))
>   			intel_handle_vblank(dev_priv, pipe);
> +
> +		if (de_iir & DE_PLANE_FLIP_DONE_IVB(pipe))
> +			flip_done_handler(dev_priv, pipe);
>   	}
>   
>   	/* check event from PCH */
> @@ -3564,6 +3567,9 @@ static void ilk_irq_postinstall(struct drm_i915_private *dev_priv)
>   				DE_PCH_EVENT_IVB | DE_AUX_CHANNEL_A_IVB);
>   		extra_mask = (DE_PIPEC_VBLANK_IVB | DE_PIPEB_VBLANK_IVB |
>   			      DE_PIPEA_VBLANK_IVB | DE_ERR_INT_IVB |
> +			      DE_PLANE_FLIP_DONE_IVB(PLANE_C) |
> +			      DE_PLANE_FLIP_DONE_IVB(PLANE_B) |
> +			      DE_PLANE_FLIP_DONE_IVB(PLANE_A) |
>   			      DE_DP_A_HOTPLUG_IVB);
>   	} else {
>   		display_mask = (DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT |