[PATCH 16/18] drm/i915/vrr: Plumb the DSB into intel_vrr_send_push()

[Nautiyal, Ankit K]

On 12/11/2024 2:40 AM, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Plumb the DSB down into intel_vrr_send_push() so that we can
> perform the opration on the DSB.
>
> TRANS_PUSH, being a transcoder register, needs non-posted writes
> to make it through.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>


> ---
>   drivers/gpu/drm/i915/display/intel_crtc.c |  2 +-
>   drivers/gpu/drm/i915/display/intel_vrr.c  | 14 +++++++++++---
>   drivers/gpu/drm/i915/display/intel_vrr.h  |  4 +++-
>   3 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
> index a2c528d707f4..3bb57a74b333 100644
> --- a/drivers/gpu/drm/i915/display/intel_crtc.c
> +++ b/drivers/gpu/drm/i915/display/intel_crtc.c
> @@ -713,7 +713,7 @@ void intel_pipe_update_end(struct intel_atomic_state *state,
>   	 * which would cause the next frame to terminate already at vmin
>   	 * vblank start instead of vmax vblank start.
>   	 */
> -	intel_vrr_send_push(new_crtc_state);
> +	intel_vrr_send_push(NULL, new_crtc_state);
>   
>   	local_irq_enable();
>   
> diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c
> index 98dd92316595..d589a62fcfed 100644
> --- a/drivers/gpu/drm/i915/display/intel_vrr.c
> +++ b/drivers/gpu/drm/i915/display/intel_vrr.c
> @@ -391,7 +391,8 @@ void intel_vrr_set_transcoder_timings(const struct intel_crtc_state *crtc_state)
>   		       crtc_state->vrr.flipline - 1);
>   }
>   
> -void intel_vrr_send_push(const struct intel_crtc_state *crtc_state)
> +void intel_vrr_send_push(struct intel_dsb *dsb,
> +			 const struct intel_crtc_state *crtc_state)
>   {
>   	struct intel_display *display = to_intel_display(crtc_state);
>   	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
> @@ -399,8 +400,15 @@ void intel_vrr_send_push(const struct intel_crtc_state *crtc_state)
>   	if (!crtc_state->vrr.enable)
>   		return;
>   
> -	intel_de_write(display, TRANS_PUSH(display, cpu_transcoder),
> -		       TRANS_PUSH_EN | TRANS_PUSH_SEND);
> +	if (dsb)
> +		intel_dsb_nonpost_start(dsb);
> +
> +	intel_de_write_dsb(display, dsb,
> +			   TRANS_PUSH(display, cpu_transcoder),
> +			   TRANS_PUSH_EN | TRANS_PUSH_SEND);
> +
> +	if (dsb)
> +		intel_dsb_nonpost_end(dsb);
>   }
>   
>   bool intel_vrr_is_push_sent(const struct intel_crtc_state *crtc_state)
> diff --git a/drivers/gpu/drm/i915/display/intel_vrr.h b/drivers/gpu/drm/i915/display/intel_vrr.h
> index 8e8961adce39..899cbf40f880 100644
> --- a/drivers/gpu/drm/i915/display/intel_vrr.h
> +++ b/drivers/gpu/drm/i915/display/intel_vrr.h
> @@ -12,6 +12,7 @@ struct drm_connector_state;
>   struct intel_atomic_state;
>   struct intel_connector;
>   struct intel_crtc_state;
> +struct intel_dsb;
>   
>   bool intel_vrr_is_capable(struct intel_connector *connector);
>   bool intel_vrr_is_in_range(struct intel_connector *connector, int vrefresh);
> @@ -22,7 +23,8 @@ void intel_vrr_compute_config(struct intel_crtc_state *crtc_state,
>   void intel_vrr_compute_config_late(struct intel_crtc_state *crtc_state);
>   void intel_vrr_set_transcoder_timings(const struct intel_crtc_state *crtc_state);
>   void intel_vrr_enable(const struct intel_crtc_state *crtc_state);
> -void intel_vrr_send_push(const struct intel_crtc_state *crtc_state);
> +void intel_vrr_send_push(struct intel_dsb *dsb,
> +			 const struct intel_crtc_state *crtc_state);
>   bool intel_vrr_is_push_sent(const struct intel_crtc_state *crtc_state);
>   void intel_vrr_disable(const struct intel_crtc_state *old_crtc_state);
>   void intel_vrr_get_config(struct intel_crtc_state *crtc_state);