Commit 3a4b1cc2 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/display: disable prefer_shadow for generic fb helpers 

Seems to break hibernation.  Disable for now until we can root
cause it.

Fixes: 087451f3 ("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: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f9a89117

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

+2 −1
Original line number Diff line number Diff line
@@ -496,7 +496,8 @@ static int amdgpu_vkms_sw_init(void *handle) 
	adev_to_drm(adev)->mode_config.max_height = YRES_MAX;



	adev_to_drm(adev)->mode_config.preferred_depth = 24;

	adev_to_drm(adev)->mode_config.prefer_shadow = 1;

	/* disable prefer shadow for now due to hibernation issues */

	adev_to_drm(adev)->mode_config.prefer_shadow = 0;



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

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

+2 −1
Original line number Diff line number Diff line
@@ -2796,7 +2796,8 @@ static int dce_v10_0_sw_init(void *handle) 
	adev_to_drm(adev)->mode_config.max_height = 16384;



	adev_to_drm(adev)->mode_config.preferred_depth = 24;

	adev_to_drm(adev)->mode_config.prefer_shadow = 1;

	/* disable prefer shadow for now due to hibernation issues */

	adev_to_drm(adev)->mode_config.prefer_shadow = 0;



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

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

+2 −1
Original line number Diff line number Diff line
@@ -2914,7 +2914,8 @@ static int dce_v11_0_sw_init(void *handle) 
	adev_to_drm(adev)->mode_config.max_height = 16384;



	adev_to_drm(adev)->mode_config.preferred_depth = 24;

	adev_to_drm(adev)->mode_config.prefer_shadow = 1;

	/* disable prefer shadow for now due to hibernation issues */

	adev_to_drm(adev)->mode_config.prefer_shadow = 0;



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

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

+2 −1
Original line number Diff line number Diff line
@@ -2673,7 +2673,8 @@ static int dce_v6_0_sw_init(void *handle) 
	adev_to_drm(adev)->mode_config.max_width = 16384;

	adev_to_drm(adev)->mode_config.max_height = 16384;

	adev_to_drm(adev)->mode_config.preferred_depth = 24;

	adev_to_drm(adev)->mode_config.prefer_shadow = 1;

	/* disable prefer shadow for now due to hibernation issues */

	adev_to_drm(adev)->mode_config.prefer_shadow = 0;

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

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

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

+2 −1
Original line number Diff line number Diff line
@@ -2693,7 +2693,8 @@ static int dce_v8_0_sw_init(void *handle) 
	adev_to_drm(adev)->mode_config.max_height = 16384;



	adev_to_drm(adev)->mode_config.preferred_depth = 24;

	adev_to_drm(adev)->mode_config.prefer_shadow = 1;

	/* disable prefer shadow for now due to hibernation issues */

	adev_to_drm(adev)->mode_config.prefer_shadow = 0;



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