From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA389182A3 for ; Wed, 13 Sep 2023 07:30:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CBC2C433C8; Wed, 13 Sep 2023 07:30:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694590223; bh=YQhbnNEy+5tfRNoqjZFdQ0pDZvX5MXx4/xET608ITls=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=t8oJp6GM/HC2Y/SSflPHhg1mHEGyH94YL7SkDd/QdTeqfnnk/0qRNsrdl1T5GLsH4 LL1dKgKgOZ1YJ7t2Vx8RpJNjm2EJoL/odPeWp7tn7JfEwJkQhzsn7wlyE6Iz4L1B7H NP7yk2BNGLruFJU0e9F8AyF+V0/f0FI2ljJNCLAI= Date: Wed, 13 Sep 2023 09:30:19 +0200 From: Greg Kroah-Hartman To: Aurabindo Pillai Cc: "stable@vger.kernel.org" , Michel =?iso-8859-1?Q?D=E4nzer?= , "patches@lists.linux.dev" , "Deucher, Alexander" , Michel =?iso-8859-1?Q?D=E4nzer?= , "Mahfooz, Hamza" Subject: Re: [PATCH 6.4 737/737] Revert "drm/amd/display: Do not set drr on pipe commit" Message-ID: <2023091327-unaligned-nastiness-3bfa@gregkh> References: <20230911134650.286315610@linuxfoundation.org> <20230911134711.107793802@linuxfoundation.org> <2023091212-simplify-underfoot-a4d6@gregkh> <2023091211-contact-limping-4fe0@gregkh> <6cbf86ee-14ea-7a46-2aa0-5434e3c3443b@amd.com> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6cbf86ee-14ea-7a46-2aa0-5434e3c3443b@amd.com> 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