Fix regression on Stoney

Fix regression on Stoney

[Mario Limonciello]

Hi,

A regression [1] was reported on suspend for AMD Stoney on 6.3.10.
It bisected down to:

1ca399f127e0 ("drm/amd/display: Add wrapper to call planes and stream 
update")

This was requested by me to fix a PSR problem [2], which isn't used on 
Stoney.

This was also backported into 6.1.36 (as e538342002cb) and 5.15.119 (as 
3c1aa91b37f9).

It's fixed on 6.3.y by cherry-picking:

32953485c558 ("drm/amd/display: Do not update DRR while BW optimizations 
pending")

It's fixed in 6.1.y by cherry-picking:

3442f4e0e555 ("drm/amd/display: Remove optimization for VRR updates")
32953485c558 ("drm/amd/display: Do not update DRR while BW optimizations 
pending")

On 5.15.y it's not a reasonable backport to take the fix to stable 
because there is a lot of missing Freesync code.  Instead it's better to 
revert the patch series that introduced it to 5.15.y because PSR-SU 
isn't even introduced until later kernels anyway.

5a24be76af79 ("drm/amd/display: fix the system hang while disable PSR")
3c1aa91b37f9 ("drm/amd/display: Add wrapper to call planes and stream 
update")
eea850c025b5 ("drm/amd/display: Use dc_update_planes_and_stream")
97ca308925a5 ("drm/amd/display: Add minimal pipe split transition state")

[1] https://gitlab.freedesktop.org/drm/amd/-/issues/2670
[2] 
https://lore.kernel.org/stable/e2ae2999-2e39-31ad-198a-26ab3ae53ae7@amd.com/

Thanks,

Re: Fix regression on Stoney

[Greg KH]

On Sun, Jul 02, 2023 at 08:12:15AM -0500, Mario Limonciello wrote:
> Hi,
> 
> A regression [1] was reported on suspend for AMD Stoney on 6.3.10.
> It bisected down to:
> 
> 1ca399f127e0 ("drm/amd/display: Add wrapper to call planes and stream
> update")
> 
> This was requested by me to fix a PSR problem [2], which isn't used on
> Stoney.
> 
> This was also backported into 6.1.36 (as e538342002cb) and 5.15.119 (as
> 3c1aa91b37f9).
> 
> It's fixed on 6.3.y by cherry-picking:
> 
> 32953485c558 ("drm/amd/display: Do not update DRR while BW optimizations
> pending")
> 
> It's fixed in 6.1.y by cherry-picking:
> 
> 3442f4e0e555 ("drm/amd/display: Remove optimization for VRR updates")
> 32953485c558 ("drm/amd/display: Do not update DRR while BW optimizations
> pending")

All now queued up, thanks.

> On 5.15.y it's not a reasonable backport to take the fix to stable because
> there is a lot of missing Freesync code.  Instead it's better to revert the
> patch series that introduced it to 5.15.y because PSR-SU isn't even
> introduced until later kernels anyway.
> 
> 5a24be76af79 ("drm/amd/display: fix the system hang while disable PSR")
> 3c1aa91b37f9 ("drm/amd/display: Add wrapper to call planes and stream
> update")
> eea850c025b5 ("drm/amd/display: Use dc_update_planes_and_stream")
> 97ca308925a5 ("drm/amd/display: Add minimal pipe split transition state")

Can you please send these reverts with the discussion as to why they are
requried?

thanks,

greg k-h