On 2026-08-31 03:28, Yuling Li wrote:
> From: Yuling Li <[email protected]>
>
> [WHY]
> resource_can_pipe_disable_cursor() disables the hardware cursor on a
> pipe when a higher layer fully covers that pipe's recout, to avoid
> double-cursor and scaling artifacts.
>
> When merging pipe-split halves of the same overlay layer, the inner
> loop walks every pipe above the current one and looks for siblings
> sharing test_pipe's layer_index. Because test_pipe itself satisfies
> that condition, it can be treated as its own split partner. That
> incorrectly doubles r2.width and makes the covering check succeed even
> when the overlay does not fully contain the underlying pipe.
>
> On horizontally split or multi-quadrant layouts this causes the cursor
> to disappear over overlay regions while input/coordinate mapping remains
> correct.
>
> [HOW]
> Skip test_pipe when searching for a pipe-split sibling on the same
> layer, so only the other half of the split plane is merged into r2.
>
> Signed-off-by: Yuling Li <[email protected]>
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index ac558e715b72..7bbbe118e365 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -1801,7 +1801,10 @@ bool resource_can_pipe_disable_cursor(struct pipe_ctx
> *pipe_ctx)
> * pipe-split, merge together per same height.
> */
> for (split_pipe = pipe_ctx->top_pipe; split_pipe;
> - split_pipe = split_pipe->top_pipe)
> + split_pipe = split_pipe->top_pipe) {
Nit: add a newline here.
Otherwise, it makes sense to me:
Reviewed-by: Leo Li <[email protected]>
Curious, what was the specific use case where you saw the cursor disappearing?
Which compositor/app?
Thanks,
Leo
> + if (split_pipe == test_pipe)
> + continue;
> +
> if (split_pipe->plane_state->layer_index ==
> test_pipe->plane_state->layer_index) {
> struct rect r2_half;
>
> @@ -1813,6 +1816,7 @@ bool resource_can_pipe_disable_cursor(struct pipe_ctx
> *pipe_ctx)
> r2_bottom = min(r2_bottom, r2_half.y +
> r2_half.height);
> break;
> }
> + }
>
> if (r1.x >= r2.x && r1.y >= r2.y && r1_right <= r2_right &&
> r1_bottom <= r2_bottom)
> return true;
