Skip to content

Commit 3a4b1cc

Browse files
committed
drm/amdgpu/display: disable prefer_shadow for generic fb helpers
Seems to break hibernation. Disable for now until we can root cause it. Fixes: 087451f ("drm/amdgpu: use generic fb helpers instead of setting up AMD own's.") Bug: https://bugzilla.kernel.org/show_bug.cgi?id=216119 Acked-by: Evan Quan <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent f9a8911 commit 3a4b1cc

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,8 @@ static int amdgpu_vkms_sw_init(void *handle)
496496
adev_to_drm(adev)->mode_config.max_height = YRES_MAX;
497497

498498
adev_to_drm(adev)->mode_config.preferred_depth = 24;
499-
adev_to_drm(adev)->mode_config.prefer_shadow = 1;
499+
/* disable prefer shadow for now due to hibernation issues */
500+
adev_to_drm(adev)->mode_config.prefer_shadow = 0;
500501

501502
adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;
502503

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2796,7 +2796,8 @@ static int dce_v10_0_sw_init(void *handle)
27962796
adev_to_drm(adev)->mode_config.max_height = 16384;
27972797

27982798
adev_to_drm(adev)->mode_config.preferred_depth = 24;
2799-
adev_to_drm(adev)->mode_config.prefer_shadow = 1;
2799+
/* disable prefer shadow for now due to hibernation issues */
2800+
adev_to_drm(adev)->mode_config.prefer_shadow = 0;
28002801

28012802
adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
28022803

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2914,7 +2914,8 @@ static int dce_v11_0_sw_init(void *handle)
29142914
adev_to_drm(adev)->mode_config.max_height = 16384;
29152915

29162916
adev_to_drm(adev)->mode_config.preferred_depth = 24;
2917-
adev_to_drm(adev)->mode_config.prefer_shadow = 1;
2917+
/* disable prefer shadow for now due to hibernation issues */
2918+
adev_to_drm(adev)->mode_config.prefer_shadow = 0;
29182919

29192920
adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
29202921

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2673,7 +2673,8 @@ static int dce_v6_0_sw_init(void *handle)
26732673
adev_to_drm(adev)->mode_config.max_width = 16384;
26742674
adev_to_drm(adev)->mode_config.max_height = 16384;
26752675
adev_to_drm(adev)->mode_config.preferred_depth = 24;
2676-
adev_to_drm(adev)->mode_config.prefer_shadow = 1;
2676+
/* disable prefer shadow for now due to hibernation issues */
2677+
adev_to_drm(adev)->mode_config.prefer_shadow = 0;
26772678
adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
26782679
adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;
26792680

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2693,7 +2693,8 @@ static int dce_v8_0_sw_init(void *handle)
26932693
adev_to_drm(adev)->mode_config.max_height = 16384;
26942694

26952695
adev_to_drm(adev)->mode_config.preferred_depth = 24;
2696-
adev_to_drm(adev)->mode_config.prefer_shadow = 1;
2696+
/* disable prefer shadow for now due to hibernation issues */
2697+
adev_to_drm(adev)->mode_config.prefer_shadow = 0;
26972698

26982699
adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
26992700

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3822,7 +3822,8 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev)
38223822
adev_to_drm(adev)->mode_config.max_height = 16384;
38233823

38243824
adev_to_drm(adev)->mode_config.preferred_depth = 24;
3825-
adev_to_drm(adev)->mode_config.prefer_shadow = 1;
3825+
/* disable prefer shadow for now due to hibernation issues */
3826+
adev_to_drm(adev)->mode_config.prefer_shadow = 0;
38263827
/* indicates support for immediate flip */
38273828
adev_to_drm(adev)->mode_config.async_page_flip = true;
38283829

0 commit comments

Comments
 (0)