AMD drm patch workflow is broken for stable trees

Greg KH gregkh at linuxfoundation.org
Thu Aug 15 05:12:41 UTC 2024


On Wed, Aug 14, 2024 at 04:39:29PM -0400, Felix Kuehling wrote:
> On 2024-08-12 11:00, Greg KH wrote:
> > Hi all,
> > 
> > As some of you have noticed, there's a TON of failure messages being
> > sent out for AMD gpu driver commits that are tagged for stable
> > backports.  In short, you all are doing something really wrong with how
> > you are tagging these.
> Hi Greg,
> 
> I got notifications about one KFD patch failing to apply on six branches
> (6.10, 6.6, 6.1, 5.15, 5.10 and 5.4). The funny thing is, that you already
> applied this patch on two branches back in May. The emails had a suspicious
> looking date in the header (Sep 17, 2001). I wonder if there was some date
> glitch that caused a whole bunch of patches to be re-sent to stable somehow:
> 
>    ------------------ original commit in Linus's tree
>    ------------------ From 24e82654e98e96cece5d8b919c522054456eeec6 Mon
>    Sep 17 00:00:00 2001 From: Alex Deucher
>    <alexander.deucher at amd.com>Date: Sun, 14 Apr 2024 13:06:39 -0400

That's the real date, ignore the 2001 thing, that's from git.


>    Subject: [PATCH] drm/amdkfd: don't allow mapping the MMIO HDP page
>    with large pages ...
> 
> On 6.1 and 6.6, the patch was already applied by you in May:
> 
>    $ git log --pretty=fuller stable/linux-6.6.y --grep "drm/amdkfd: don't allow mapping the MMIO HDP page with large pages"
>    commit 4b4cff994a27ebf7bd3fb9a798a1cdfa8d01b724
>    Author:     Alex Deucher <alexander.deucher at amd.com>
>    AuthorDate: Sun Apr 14 13:06:39 2024 -0400
>    Commit:     Greg Kroah-Hartman <gregkh at linuxfoundation.org>
>    CommitDate: Fri May 17 12:02:34 2024 +0200
> 
>         drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
>    ...
> 
> On 6.10 it was already upstream.

Then why did we have it in the tree again with different commit ids?
That's the issue here, and the major confusion as there is no way for us
to determine if this is a commit that has been in the tree already or if
it's just a normal failure.

> On 5.4-5.15 it doesn't apply because of conflicts. I can resolve those and
> send the fixed patches out for you.

If it is needed in those branches, please do so.

thanks,

greg k-h


More information about the amd-gfx mailing list