Commit a6250bdb authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: Only disable prefer_shadow on hawaii 

We changed it for all asics due to a hibernation regression
on hawaii, but the workaround breaks suspend on a polaris12.
Just disable it for hawaii.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=216119


Fixes: 3a4b1cc2 ("drm/amdgpu/display: disable prefer_shadow for generic fb helpers")
Reviewed-and-tested-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent acc96ae0

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

+1 −2
Original line number Diff line number Diff line
@@ -496,8 +496,7 @@ 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;

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

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

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



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

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

+1 −2
Original line number Diff line number Diff line
@@ -2796,8 +2796,7 @@ 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;

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

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

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



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

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

+1 −2
Original line number Diff line number Diff line
@@ -2914,8 +2914,7 @@ 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;

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

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

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



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

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

+1 −2
Original line number Diff line number Diff line
@@ -2673,8 +2673,7 @@ 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;

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

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

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

	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

+5 −2
Original line number Diff line number Diff line
@@ -2693,8 +2693,11 @@ 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;

	if (adev->asic_type == CHIP_HAWAII)

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

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

	else

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



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