Skip to content

Commit 2a2a865

Browse files
leo-sunli1alexdeucher
authored andcommitted
drm/amd/display: Add all planes on CRTC to state for overlay cursor
[Why] DC has a special commit path for native cursor, which use the built-in cursor pipe within DCN planes. This update path does not require all enabled planes to be added to the list of surface updates sent to DC. This is not the case for overlay cursor; it uses the same path as MPO commits. This update path requires all enabled planes to be added to the list of surface updates sent to DC. Otherwise, DC will disable planes not inside the list. [How] If overlay cursor is needed, add all planes on the same CRTC as this cursor to the atomic state. This is already done for non-cursor planes (MPO), just before the added lines. Fixes: 1b04dcc ("drm/amd/display: Introduce overlay cursor mode") Closes: https://lore.kernel.org/lkml/f68020a3-c413-482d-beb2-5432d98a1d3e@amd.com Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Leo Li <sunpeng.li@amd.com> Tested-by: Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 0c8c5bd)
1 parent 17ea438 commit 2a2a865

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11419,6 +11419,17 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
1141911419
drm_dbg(dev, "Failed to determine cursor mode\n");
1142011420
goto fail;
1142111421
}
11422+
11423+
/*
11424+
* If overlay cursor is needed, DC cannot go through the
11425+
* native cursor update path. All enabled planes on the CRTC
11426+
* need to be added for DC to not disable a plane by mistake
11427+
*/
11428+
if (dm_new_crtc_state->cursor_mode == DM_CURSOR_OVERLAY_MODE) {
11429+
ret = drm_atomic_add_affected_planes(state, crtc);
11430+
if (ret)
11431+
goto fail;
11432+
}
1142211433
}
1142311434

1142411435
/* Remove exiting planes if they are modified */

0 commit comments

Comments
 (0)