Re: [PATCH 5/6] drm/i915/cursor: Program secondary cursor planes

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

On 6/8/2026 11:56 AM, Nemesa Garg wrote:
> During the vblank-evade, program all joined cursor
> planes using intel_plane_update_noarm()/intel_plane_update_arm()
> or intel_plane_disable_arm() based on plane visibility.
> 
> V2: Check primary and secondary pipe together. [Ville]
> 
> Assisted-by: Claude:claude-sonnet-4.6
> Signed-off-by: Nemesa Garg <nemesa.garg@intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_cursor.c | 19 ++++++++++++++-----
>   1 file changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
> index 147ed6efb174..cb1fcae8a445 100644
> --- a/drivers/gpu/drm/i915/display/intel_cursor.c
> +++ b/drivers/gpu/drm/i915/display/intel_cursor.c
> @@ -896,6 +896,7 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
>   	struct intel_vblank_evade_ctx evade;
>   	struct intel_plane_state *old_pipe_states[4] = {};
>   	struct intel_plane_state *new_pipe_states[4] = {};
> +	struct intel_crtc_state *pipe_crtc_states[4] = {};

Another candidate for the struct.

>   	struct intel_plane *pipe_planes[4] = {};
>   	struct intel_crtc *pipe_crtcs[4] = {};
>   	struct intel_crtc *pipe_crtc;
> @@ -977,6 +978,7 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
>   
>   	pipe_planes[num_pipes] = plane;
>   	pipe_crtcs[num_pipes] = crtc;
> +	pipe_crtc_states[num_pipes] = crtc_state;
>   	old_pipe_states[num_pipes] = old_plane_state;
>   	new_pipe_states[num_pipes] = new_plane_state;
>   	num_pipes++;
> @@ -1032,6 +1034,7 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
>   
>   		pipe_planes[num_pipes] = pipe_plane;
>   		pipe_crtcs[num_pipes] = pipe_crtc;
> +		pipe_crtc_states[num_pipes] = pipe_crtc_state;
>   		old_pipe_states[num_pipes] = old_pipe_plane_state;
>   		new_pipe_states[num_pipes] = new_pipe_plane_state;
>   		num_pipes++;
> @@ -1087,11 +1090,17 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
>   		local_irq_disable();
>   	}
>   
> -	if (new_plane_state->uapi.visible) {
> -		intel_plane_update_noarm(NULL, plane, crtc_state, new_plane_state);
> -		intel_plane_update_arm(NULL, plane, crtc_state, new_plane_state);
> -	} else {
> -		intel_plane_disable_arm(NULL, plane, crtc_state);
> +	for (int i = 0; i < num_pipes; i++) {
> +		if (new_pipe_states[i]->uapi.visible) {
> +			intel_plane_update_noarm(NULL, pipe_planes[i],
> +						 pipe_crtc_states[i],
> +						 new_pipe_states[i]);
> +			intel_plane_update_arm(NULL, pipe_planes[i],
> +					       pipe_crtc_states[i],
> +					       new_pipe_states[i]);
> +		} else {
> +			intel_plane_disable_arm(NULL, pipe_planes[i], pipe_crtc_states[i]);
> +		}

All secondaries are now armed inside the single primary vblank-evade. 
The atomic sync path evades every pipe individually but that might be an 
over-kill for cursor updates. I wonder if we can add some debug logs to 
warn us of vblank straddles if any.

==
Chaitanya

>   	}
>   
>   	local_irq_enable();