[Public] > -----Original Message----- > From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Sent: Tuesday, September 12, 2023 11:39 AM > To: Pillai, Aurabindo <Aurabindo.Pillai@xxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx; Michel Dänzer <michel@xxxxxxxxxxx>; > patches@xxxxxxxxxxxxxxx; Deucher, Alexander <Alexander.Deucher@xxxxxxx>; > Michel Dänzer <mdaenzer@xxxxxxxxxx>; Mahfooz, Hamza > <Hamza.Mahfooz@xxxxxxx> > 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: > > > > > > 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? https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=613a7956deb3b1ffa2810c6d4c90ee9c3d743dbb https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=09c8cbedba5fa85f15ac91ed74848aceff69f8e5 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3b6df06f01cdbff3b610b492ad4879691afdc70d Thanks, Alex > > thanks, > > greg k-h