Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Dave Airlie
On Thu, 4 Aug 2022 at 15:25, Dave Airlie wrote: > > On Thu, 4 Aug 2022 at 14:46, Linus Torvalds > wrote: > > > > On Wed, Aug 3, 2022 at 9:27 PM Linus Torvalds > > wrote: > > > > > > I'll do a few more. It's close enough already that it should be just > > > four more reboots to pinpoint exactly

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Dave Airlie
On Thu, 4 Aug 2022 at 14:46, Linus Torvalds wrote: > > On Wed, Aug 3, 2022 at 9:27 PM Linus Torvalds > wrote: > > > > I'll do a few more. It's close enough already that it should be just > > four more reboots to pinpoint exactly which commit breaks. > > commit

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Linus Torvalds
On Wed, Aug 3, 2022 at 9:27 PM Linus Torvalds wrote: > > I'll do a few more. It's close enough already that it should be just > four more reboots to pinpoint exactly which commit breaks. commit 5d945cbcd4b16a29d6470a80dfb19738f9a4319f is the first bad commit. I think it's supposed to make no

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Linus Torvalds
On Wed, Aug 3, 2022 at 9:24 PM Dave Airlie wrote: > > I've reproduced it, I'll send you a revert pile when I confirm it is > the buddy allocator. I've bisected it to 86bd6706c404..074293dd9f61 and don't see "buddy" in any of those commits. I'll do a few more. It's close enough already that it

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Dave Airlie
On Thu, 4 Aug 2022 at 14:02, Linus Torvalds wrote: > > On Wed, Aug 3, 2022 at 8:53 PM Dave Airlie wrote: > > > > > It works on my intel laptop, so it's amdgpu somewhere. > > > > I'll spin my ryzen up to see if I can reproduce, and test against the > > drm-next pre-merge tree as well. > > So it's

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Linus Torvalds
On Wed, Aug 3, 2022 at 8:53 PM Dave Airlie wrote: > > > It works on my intel laptop, so it's amdgpu somewhere. > > I'll spin my ryzen up to see if I can reproduce, and test against the > drm-next pre-merge tree as well. So it's not my merge - I've had a bad result in the middle of the DRM

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Dave Airlie
On Thu, 4 Aug 2022 at 13:47, Linus Torvalds wrote: > > On Wed, Aug 3, 2022 at 8:37 PM Dave Airlie wrote: > > > > Actually I did miss that so that looks good. > > .. I wish it did, but I just actually test-booted my desktop with the > result, and it crashes the X server. This seems to be the

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Linus Torvalds
On Wed, Aug 3, 2022 at 8:37 PM Dave Airlie wrote: > > Actually I did miss that so that looks good. .. I wish it did, but I just actually test-booted my desktop with the result, and it crashes the X server. This seems to be the splat in Xorg.0.log: (II) Initializing extension DRI2 (II)

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Dave Airlie
On Thu, 4 Aug 2022 at 13:16, Linus Torvalds wrote: > > On Wed, Aug 3, 2022 at 7:46 PM Linus Torvalds > wrote: > > > > I think I have it resolved, am still doing a full build test, and will > > then compare against what your suggested merge is. > > Hmm. > > I end up with *almost* the same thing.

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread pr-tracker-bot
The pull request you sent on Wed, 3 Aug 2022 15:37:43 +1000: > git://anongit.freedesktop.org/drm/drm tags/drm-next-2022-08-03 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/b44f2fd87919b5ae6e1756d4c7ba2cbba22238e1 Thank you! -- Deet-doot-dot, I am a bot.

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Linus Torvalds
On Wed, Aug 3, 2022 at 7:46 PM Linus Torvalds wrote: > > I think I have it resolved, am still doing a full build test, and will > then compare against what your suggested merge is. Hmm. I end up with *almost* the same thing. Except I ended up with a select DRM_BUDDY for the

Re: [git pull] drm for 5.20/6.0

2022-08-03 Thread Linus Torvalds
On Tue, Aug 2, 2022 at 10:38 PM Dave Airlie wrote: > > This is a conflicty one. The late revert in 5.19 of the amdgpu buddy > allocator causes major conflict fallout. The buddy allocator code in > this one works, so the resolutions are usually just to take stuff from > this. It might actually be