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: > > > > > > > > > 1. 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. > > > 2. We found that reverting these patches caused some multi monitor configurations to hang on RDNA3. > > > 3. We debugged Michel's issue and merged a workaround (https://gitlab.freedesktop.org/agd5f/linux/-/commit/cc225c8af276396c3379885b38d2a9e28af19aa9 > > > 4. 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? > > > 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