Re: [PATCH 2/6] drm/i915/cursor: Add helper to update cursor plane

["Borah, Chaitanya Kumar" <chaitanya.kumar.borah@intel.com>]

On 6/8/2026 11:56 AM, Nemesa Garg wrote:
> Move cursor fast path plane state update into helper
> function.
> 

Not a pure move.

> Assisted-by: Claude:claude-sonnet-4.6
> Signed-off-by: Nemesa Garg <nemesa.garg@intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_cursor.c | 41 +++++++++++++++------
>   1 file changed, 29 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
> index f8b24865c93a..38234c6292ec 100644
> --- a/drivers/gpu/drm/i915/display/intel_cursor.c
> +++ b/drivers/gpu/drm/i915/display/intel_cursor.c
> @@ -849,6 +849,31 @@ intel_cursor_joiner_commits_idle(struct intel_display *display,
>   	return true;
>   }
>   
> +static void
> +intel_cursor_fastpath_update_plane_state(struct intel_plane_state *plane_state,
> +					 struct drm_framebuffer *fb,
> +					 struct drm_crtc *uapi_crtc,
> +					 struct intel_crtc *hw_crtc,
> +					 int crtc_x, int crtc_y,
> +					 unsigned int crtc_w, unsigned int crtc_h,
> +					 u32 src_x, u32 src_y,
> +					 u32 src_w, u32 src_h)
> +{
> +	drm_atomic_set_fb_for_plane(&plane_state->uapi, fb);
> +
> +	plane_state->uapi.crtc = uapi_crtc;

The original inline block didn't set uapi.crtc.
> +	plane_state->uapi.src_x = src_x;
> +	plane_state->uapi.src_y = src_y;
> +	plane_state->uapi.src_w = src_w;
> +	plane_state->uapi.src_h = src_h;
> +	plane_state->uapi.crtc_x = crtc_x;
> +	plane_state->uapi.crtc_y = crtc_y;
> +	plane_state->uapi.crtc_w = crtc_w;
> +	plane_state->uapi.crtc_h = crtc_h;
> +
> +	intel_plane_copy_uapi_to_hw_state(NULL, plane_state, plane_state, hw_crtc);
> +}
> +
>   static int
>   intel_legacy_cursor_update(struct drm_plane *_plane,
>   			   struct drm_crtc *_crtc,
> @@ -928,18 +953,10 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
>   		goto out_free;
>   	}
>   
> -	drm_atomic_set_fb_for_plane(&new_plane_state->uapi, fb);
> -
> -	new_plane_state->uapi.src_x = src_x;
> -	new_plane_state->uapi.src_y = src_y;
> -	new_plane_state->uapi.src_w = src_w;
> -	new_plane_state->uapi.src_h = src_h;
> -	new_plane_state->uapi.crtc_x = crtc_x;
> -	new_plane_state->uapi.crtc_y = crtc_y;
> -	new_plane_state->uapi.crtc_w = crtc_w;
> -	new_plane_state->uapi.crtc_h = crtc_h;
> -
> -	intel_plane_copy_uapi_to_hw_state(NULL, new_plane_state, new_plane_state, crtc);
> +	intel_cursor_fastpath_update_plane_state(new_plane_state, fb,
> +						 &crtc->base, crtc,
> +						 crtc_x, crtc_y, crtc_w, crtc_h,
> +						 src_x, src_y, src_w, src_h);

I guess the idea was to mirror intel_plane_copy_uapi_to_hw_state(), 
where a joiner secondary has uapi.crtc == primary but hw.crtc == 
secondary. But even that seems to be mishandled in the patch that adds 
the caller for secondary pipes. More on it later.

I would suggest explain the two-crtc signature in the commit message 
otherwise it's looks unmotivated here.

==
Chaitanya

>   
>   	ret = intel_plane_atomic_check_with_state(crtc_state, new_crtc_state,
>   						  old_plane_state, new_plane_state);