Re: [PATCH 5/6] drm/i915/cursor: Schedule cursor unpin per joined pipe

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

On 8/21/2026 10:17 AM, Nemesa Garg wrote:
> Convert the primary-only vblank unpin block into a loop over the
> joined_pipe_state[] array so each pipe's old cursor framebuffer is scheduled for
> unpin (or unpinned inline when unchanged) independently. All unpin
> work is armed on the primary crtc's vblank (&crtc->base), consistent
> with the single primary vblank evasion used above.
> 
> v4: Split from the update_arm loop conversion. [Chaitanya]
> 

If it is possible to do so cleanly, I would prefer to squash this change 
with patch 3 for the sake of completion. Not a blocker though.

LGTM

Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>

> Assisted-by: Claude:claude-sonnet-4.6
> Signed-off-by: Nemesa Garg <nemesa.garg@intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_cursor.c | 26 ++++++++++-----------
>   1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
> index f5625dabc8f6..dedb6f87359c 100644
> --- a/drivers/gpu/drm/i915/display/intel_cursor.c
> +++ b/drivers/gpu/drm/i915/display/intel_cursor.c
> @@ -894,7 +894,6 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
>   	struct intel_display *display = to_intel_display(plane);
>   	struct intel_plane_state *old_plane_state =
>   		to_intel_plane_state(plane->base.state);
> -	struct intel_plane_state *new_plane_state = NULL;
>   	struct intel_crtc_state *crtc_state =
>   		to_intel_crtc_state(crtc->base.state);
>   	struct intel_vblank_evade_ctx evade;
> @@ -993,7 +992,6 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
>   		num_pipes++;
>   	}
>   
> -	new_plane_state = joined_pipe_state[0].new_plane_state;
>   	intel_frontbuffer_flush(to_intel_frontbuffer(joined_pipe_state[0].new_plane_state->hw.fb),
>   				ORIGIN_CURSOR_UPDATE);
>   
> @@ -1078,17 +1076,19 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
>   	 * Schedule or immediately unpin old framebuffers.
>   	 * Protect against concurrent access.
>   	 */
> -	if (old_plane_state->ggtt_vma != new_plane_state->ggtt_vma) {
> -		drm_vblank_work_init(&old_plane_state->unpin_work, &crtc->base,
> -				     intel_cursor_unpin_work);
> -
> -		drm_vblank_work_schedule(&old_plane_state->unpin_work,
> -					 drm_crtc_accurate_vblank_count(&crtc->base) + 1,
> -					 false);
> -
> -		joined_pipe_state[0].old_plane_state = NULL;
> -	} else {
> -		intel_plane_unpin_fb(old_plane_state);
> +	for (int i = 0; i < num_pipes; i++) {
> +		struct intel_plane_state *old = joined_pipe_state[i].old_plane_state;
> +
> +		if (old->ggtt_vma != joined_pipe_state[i].new_plane_state->ggtt_vma) {
> +			drm_vblank_work_init(&old->unpin_work, &crtc->base,
> +					     intel_cursor_unpin_work);
> +			drm_vblank_work_schedule(&old->unpin_work,
> +						 drm_crtc_accurate_vblank_count(&crtc->base) + 1,
> +						 false);
> +			joined_pipe_state[i].old_plane_state = NULL;
> +		} else {
> +			intel_plane_unpin_fb(old);
> +		}
>   	}
>   
>   out_free: