Skip to content

Commit b5a74b0

Browse files
leo-sunli1dumbbell
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: 1b04dcca4fb1 ("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 0c8c5bdd7eaf291b6f727e98506fb68acee3a4cc)
1 parent e7cc885 commit b5a74b0

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
@@ -11437,6 +11437,17 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
1143711437
drm_dbg(dev, "Failed to determine cursor mode\n");
1143811438
goto fail;
1143911439
}
11440+
11441+
/*
11442+
* If overlay cursor is needed, DC cannot go through the
11443+
* native cursor update path. All enabled planes on the CRTC
11444+
* need to be added for DC to not disable a plane by mistake
11445+
*/
11446+
if (dm_new_crtc_state->cursor_mode == DM_CURSOR_OVERLAY_MODE) {
11447+
ret = drm_atomic_add_affected_planes(state, crtc);
11448+
if (ret)
11449+
goto fail;
11450+
}
1144011451
}
1144111452

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

0 commit comments

Comments
 (0)