On Tue, Sep 12, 2023 at 03:31:16PM +0000, Pillai, Aurabindo wrote:
[AMD Official Use Only - General]
Hi Greg,
It was reverted but has been re-applied.
Here is a chronological summary of what happened:
- Michel bisected some major issues to "drm/amd/display: Do not set drr on pipe commit" and was revered in upstream. ". Along with that patch, "drm/amd/display: Block optimize on consecutive FAMS enables" was also reverted due to dependency.
- We found that reverting these patches caused some multi monitor configurations to hang on RDNA3.
- We debugged Michel's issue and merged a workaround (https://gitlab.freedesktop.org/agd5f/linux/-/commit/cc225c8af276396c3379885b...
- Subsequently, the two patches were reapplied (https://gitlab.freedesktop.org/agd5f/linux/-/commit/bfe1b43c1acee1251ddb0915... and https://gitlab.freedesktop.org/agd5f/linux/-/commit/f3c2a89c5103b4ffdd88f09c...)
Hence, the stable kernel should have all 3 patches - the workaround and 2 others. Hope that clarifies the situation.
Great, what are the ids of those in Linus's tree?
thanks,
greg k-h
On 9/12/2023 11:39 AM, Greg Kroah-Hartman wrote:
On Tue, Sep 12, 2023 at 03:31:16PM +0000, Pillai, Aurabindo wrote:
[AMD Official Use Only - General]
Hi Greg,
It was reverted but has been re-applied.
Here is a chronological summary of what happened:
- Michel bisected some major issues to "drm/amd/display: Do not set drr on pipe commit" and was revered in upstream. ". Along with that patch, "drm/amd/display: Block optimize on consecutive FAMS enables" was also reverted due to dependency.
- We found that reverting these patches caused some multi monitor configurations to hang on RDNA3.
- We debugged Michel's issue and merged a workaround (https://gitlab.freedesktop.org/agd5f/linux/-/commit/cc225c8af276396c3379885b...
- Subsequently, the two patches were reapplied (https://gitlab.freedesktop.org/agd5f/linux/-/commit/bfe1b43c1acee1251ddb0915... and https://gitlab.freedesktop.org/agd5f/linux/-/commit/f3c2a89c5103b4ffdd88f09c...)
Hence, the stable kernel should have all 3 patches - the workaround and 2 others. Hope that clarifies the situation.
Great, what are the ids of those in Linus's tree?
3b6df06f01cd drm/amd/display: Block optimize on consecutive FAMS enables 09c8cbedba5f drm/amd/display: Do not set drr on pipe commit 613a7956deb3 drm/amd/display: Add monitor specific edid quirk
From https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
thanks,
greg k-h
On Tue, Sep 12, 2023 at 12:04:20PM -0400, Aurabindo Pillai wrote:
On 9/12/2023 11:39 AM, Greg Kroah-Hartman wrote:
On Tue, Sep 12, 2023 at 03:31:16PM +0000, Pillai, Aurabindo wrote:
[AMD Official Use Only - General]
Hi Greg,
It was reverted but has been re-applied.
Here is a chronological summary of what happened:
- Michel bisected some major issues to "drm/amd/display: Do not set drr on pipe commit" and was revered in upstream. ". Along with that patch, "drm/amd/display: Block optimize on consecutive FAMS enables" was also reverted due to dependency.
- We found that reverting these patches caused some multi monitor configurations to hang on RDNA3.
- We debugged Michel's issue and merged a workaround (https://gitlab.freedesktop.org/agd5f/linux/-/commit/cc225c8af276396c3379885b...
- Subsequently, the two patches were reapplied (https://gitlab.freedesktop.org/agd5f/linux/-/commit/bfe1b43c1acee1251ddb0915... and https://gitlab.freedesktop.org/agd5f/linux/-/commit/f3c2a89c5103b4ffdd88f09c...)
Hence, the stable kernel should have all 3 patches - the workaround and 2 others. Hope that clarifies the situation.
Great, what are the ids of those in Linus's tree?
3b6df06f01cd drm/amd/display: Block optimize on consecutive FAMS enables
Ok, I'll add this one.
09c8cbedba5f drm/amd/display: Do not set drr on pipe commit
This is already in the 6.5-rc queue
613a7956deb3 drm/amd/display: Add monitor specific edid quirk
This is already in the 6.5 release.
So all that was needed was the one additional one? I'll go queue that up now, thanks.
greg k-h
[Public]
-----Original Message----- From: Greg Kroah-Hartman gregkh@linuxfoundation.org Sent: Tuesday, September 12, 2023 11:39 AM To: Pillai, Aurabindo Aurabindo.Pillai@amd.com Cc: stable@vger.kernel.org; Michel Dänzer michel@daenzer.net; patches@lists.linux.dev; Deucher, Alexander Alexander.Deucher@amd.com; Michel Dänzer mdaenzer@redhat.com; Mahfooz, Hamza Hamza.Mahfooz@amd.com Subject: Re: [PATCH 6.4 737/737] Revert "drm/amd/display: Do not set drr on pipe commit"
On Tue, Sep 12, 2023 at 03:31:16PM +0000, Pillai, Aurabindo wrote:
[AMD Official Use Only - General]
Hi Greg,
It was reverted but has been re-applied.
Here is a chronological summary of what happened:
- Michel bisected some major issues to "drm/amd/display: Do not set drr
on pipe commit" and was revered in upstream. ". Along with that patch, "drm/amd/display: Block optimize on consecutive FAMS enables" was also reverted due to dependency.
- We found that reverting these patches caused some multi monitor
configurations to hang on RDNA3.
- We debugged Michel's issue and merged a workaround
(https://gitlab.freedesktop.org/agd5f/linux/- /commit/cc225c8af276396c3379885b38d2a9e28af19aa9
- Subsequently, the two patches were reapplied
(https://gitlab.freedesktop.org/agd5f/linux/- /commit/bfe1b43c1acee1251ddb09159442b9d782800aef and https://gitlab.freedesktop.org/agd5f/linux/- /commit/f3c2a89c5103b4ffdd88f09caa36488e0d0cf79d)
Hence, the stable kernel should have all 3 patches - the workaround and 2
others. Hope that clarifies the situation.
Great, what are the ids of those in Linus's tree?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i... https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i... https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
Thanks,
Alex
thanks,
greg k-h
linux-stable-mirror@lists.linaro.org