[PATCH 2/2] drm/amdgpu/display: disable prefer_shadow for generic fb helpers

[Quan, Evan]

[AMD Official Use Only - General]

Thanks for the fixes! Series is acked-by: Evan Quan <evan.quan at amd.com>

Evan
> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex
> Deucher
> Sent: Wednesday, June 29, 2022 10:16 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
> Subject: [PATCH 2/2] drm/amdgpu/display: disable prefer_shadow for
> generic fb helpers
> 
> Seems to break hibernation.  Disable for now until we can root cause it.
> 
> Fixes: 087451f372bf ("drm/amdgpu: use generic fb helpers instead of setting
> up AMD own's.")
> Bug:
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugz
> illa.kernel.org%2Fshow_bug.cgi%3Fid%3D216119&data=05%7C01%7Cev
> an.quan%40amd.com%7C1f2762736c244dadb6ea08da59d9f0e6%7C3dd8961f
> e4884e608e11a82d994e183d%7C0%7C0%7C637921089829876781%7CUnknow
> n%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1ha
> WwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=WJLd3ZXE1URnAW
> n3CyX%2BaBdzVB4T66oun7lA7X9KPbw%3D&reserved=0
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c          | 3 ++-
>  drivers/gpu/drm/amd/amdgpu/dce_v10_0.c            | 3 ++-
>  drivers/gpu/drm/amd/amdgpu/dce_v11_0.c            | 3 ++-
>  drivers/gpu/drm/amd/amdgpu/dce_v6_0.c             | 3 ++-
>  drivers/gpu/drm/amd/amdgpu/dce_v8_0.c             | 3 ++-
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
>  6 files changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> index 576849e95296..108e8e8a1a36 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
> @@ -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;
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index 288fce7dc0ed..9c964cd3b5d4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -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;
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index cbe5250b31cb..e0ad9f27dc3f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -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;
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> index 982855e6cf52..3caf6f386042 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> @@ -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;
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> index 84440741c60b..7c75df5bffed 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> @@ -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;
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 9195d6a8a51f..fb1e983e0549 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -3818,7 +3818,8 @@ static int amdgpu_dm_mode_config_init(struct
> amdgpu_device *adev)
>  	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;
>  	/* indicates support for immediate flip */
>  	adev_to_drm(adev)->mode_config.async_page_flip = true;
> 
> --
> 2.35.3