[git pull] drm for 6.10-rc1

[Dave Airlie]

On Thu, 16 May 2024 at 06:29, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
>
> On Wed, 15 May 2024 at 13:24, Linus Torvalds
> <torvalds at linux-foundation.org> wrote:
> >
> > I have to revert both
> >
> >   a68c7eaa7a8f ("drm/amdgpu: Enable clear page functionality")
> >   e362b7c8f8c7 ("drm/amdgpu: Modify the contiguous flags behaviour")
> >
> > to make things build cleanly. Next step: see if it boots and fixes the
> > problem for me.
>
> Well, perhaps not surprisingly, the WARN_ON() no longer triggers with
> this, and everything looks fine.
>
> Let's see if the machine ends up being stable now. It took several
> hours for the "scary messages" state to turn into the "hung machine"
> state, so they *could* have been independent issues, but it seems a
> bit unlikely.

I think that should be fine to do for now.

I think it is also fine to do like I've attached, but I'm not sure if
I'd take that chance.

Two questions for Arunpravin (and Alex):

Is this fix correct, and can we get a good explanation of it?

Where did this error sneak in? Is the problem in the amdgpu tree, or
was it a drm-next only problem? If so perhaps we need to discuss
moving amdgpu more into drm-tip to catch this sort of problem.

Dave.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-drm-buddy-convert-WARN_ON-to-an-if-continue.patch
Type: text/x-patch
Size: 1102 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20240516/3689418c/attachment.bin>