mbox series

[PULL] drm-misc-fixes

Message ID b4ffqzigtfh6cgzdpwuk6jlrv3dnk4hu6etiizgvibysqgtl2p@42n2gdfdd5eu (mailing list archive)
State New, archived
Headers show
Series [PULL] drm-misc-fixes | expand

Pull-request

git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2024-02-15

Message

Maxime Ripard Feb. 15, 2024, 8:49 a.m. UTC
Hi,

Here's this week drm-misc-fixes PR

Maxime

drm-misc-fixes-2024-02-15:
A suspend/resume error fix for ivpu, a couple of scheduler fixes for
nouveau, a patch to support large page arrays in prime, a uninitialized
variable fix in crtc, a locking fix in rockchip/vop2 and a buddy
allocator error reporting fix.
The following changes since commit 5f8408aca66772d3aa9b4831577b2ac5ec41bcd9:

  accel/ivpu: Add job status for jobs aborted by the driver (2024-02-06 13:37:34 +0100)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2024-02-15

for you to fetch changes up to a64056bb5a3215bd31c8ce17d609ba0f4d5c55ea:

  drm/tests/drm_buddy: add alloc_contiguous test (2024-02-14 15:22:21 +0100)

----------------------------------------------------------------
A suspend/resume error fix for ivpu, a couple of scheduler fixes for
nouveau, a patch to support large page arrays in prime, a uninitialized
variable fix in crtc, a locking fix in rockchip/vop2 and a buddy
allocator error reporting fix.

----------------------------------------------------------------
Arnd Bergmann (1):
      nouveau/svm: fix kvcalloc() argument order

Arunpravin Paneer Selvam (1):
      drm/buddy: Fix alloc_range() error handling code

Danilo Krummrich (2):
      drm/nouveau: don't fini scheduler if not initialized
      drm/nouveau: omit to create schedulers using the legacy uAPI

Harshit Mogalapalli (1):
      drm/rockchip: vop2: add a missing unlock in vop2_crtc_atomic_enable()

Jacek Lawrynowicz (1):
      accel/ivpu: Fix DevTLB errors on suspend/resume and recovery

Matthew Auld (1):
      drm/tests/drm_buddy: add alloc_contiguous test

Philip Yang (1):
      drm/prime: Support page array >= 4GB

Rob Clark (1):
      drm/crtc: fix uninitialized variable use even harder

 drivers/accel/ivpu/ivpu_hw_37xx.c            | 44 ++++++++++----
 drivers/accel/ivpu/ivpu_pm.c                 | 39 ++++++------
 drivers/gpu/drm/drm_buddy.c                  |  6 ++
 drivers/gpu/drm/drm_crtc.c                   |  1 +
 drivers/gpu/drm/drm_prime.c                  |  2 +-
 drivers/gpu/drm/nouveau/nouveau_abi16.c      | 20 +++++--
 drivers/gpu/drm/nouveau/nouveau_abi16.h      |  2 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c        |  7 ++-
 drivers/gpu/drm/nouveau/nouveau_drv.h        |  2 +-
 drivers/gpu/drm/nouveau/nouveau_exec.c       |  2 +-
 drivers/gpu/drm/nouveau/nouveau_sched.c      | 38 +++++++++++-
 drivers/gpu/drm/nouveau/nouveau_sched.h      |  6 +-
 drivers/gpu/drm/nouveau/nouveau_svm.c        |  2 +-
 drivers/gpu/drm/nouveau/nouveau_uvmm.c       |  2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c |  4 +-
 drivers/gpu/drm/tests/drm_buddy_test.c       | 89 ++++++++++++++++++++++++++++
 16 files changed, 216 insertions(+), 50 deletions(-)

Comments

Geert Uytterhoeven Feb. 15, 2024, 12:41 p.m. UTC | #1
Hi Maxime,

On Thu, 15 Feb 2024, Maxime Ripard wrote:
> Here's this week drm-misc-fixes PR
>
> Maxime
>
> drm-misc-fixes-2024-02-15:
> A suspend/resume error fix for ivpu, a couple of scheduler fixes for
> nouveau, a patch to support large page arrays in prime, a uninitialized
> variable fix in crtc, a locking fix in rockchip/vop2 and a buddy
> allocator error reporting fix.
> The following changes since commit 5f8408aca66772d3aa9b4831577b2ac5ec41bcd9:
>
>  accel/ivpu: Add job status for jobs aborted by the driver (2024-02-06 13:37:34 +0100)
>
> are available in the Git repository at:
>
>  git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2024-02-15
>
> for you to fetch changes up to a64056bb5a3215bd31c8ce17d609ba0f4d5c55ea:
>
>  drm/tests/drm_buddy: add alloc_contiguous test (2024-02-14 15:22:21 +0100)
>
> ----------------------------------------------------------------
> A suspend/resume error fix for ivpu, a couple of scheduler fixes for
> nouveau, a patch to support large page arrays in prime, a uninitialized
> variable fix in crtc, a locking fix in rockchip/vop2 and a buddy
> allocator error reporting fix.

> Matthew Auld (1):
>      drm/tests/drm_buddy: add alloc_contiguous test

Please drop this one.

noreply@ellerman.id.au reported a build failure on m68k (and presumably
other 32-bit platforms) in next-20240215:

ERROR: modpost: "__umoddi3" [drivers/gpu/drm/tests/drm_buddy_test.ko] undefined!
ERROR: modpost: "__moddi3" [drivers/gpu/drm/tests/drm_buddy_test.ko] undefined!

Reverting commit a64056bb5a3215bd ("drm/tests/drm_buddy: add
alloc_contiguous test") fixes the issue.

Gr{oetje,eeting}s,

 						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
 							    -- Linus Torvalds
Maxime Ripard Feb. 15, 2024, 4:09 p.m. UTC | #2
Hi,

On Thu, Feb 15, 2024 at 01:41:24PM +0100, Geert Uytterhoeven wrote:
> 	Hi Maxime,
> 
> On Thu, 15 Feb 2024, Maxime Ripard wrote:
> > Here's this week drm-misc-fixes PR
> > 
> > Maxime
> > 
> > drm-misc-fixes-2024-02-15:
> > A suspend/resume error fix for ivpu, a couple of scheduler fixes for
> > nouveau, a patch to support large page arrays in prime, a uninitialized
> > variable fix in crtc, a locking fix in rockchip/vop2 and a buddy
> > allocator error reporting fix.
> > The following changes since commit 5f8408aca66772d3aa9b4831577b2ac5ec41bcd9:
> > 
> >  accel/ivpu: Add job status for jobs aborted by the driver (2024-02-06 13:37:34 +0100)
> > 
> > are available in the Git repository at:
> > 
> >  git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2024-02-15
> > 
> > for you to fetch changes up to a64056bb5a3215bd31c8ce17d609ba0f4d5c55ea:
> > 
> >  drm/tests/drm_buddy: add alloc_contiguous test (2024-02-14 15:22:21 +0100)
> > 
> > ----------------------------------------------------------------
> > A suspend/resume error fix for ivpu, a couple of scheduler fixes for
> > nouveau, a patch to support large page arrays in prime, a uninitialized
> > variable fix in crtc, a locking fix in rockchip/vop2 and a buddy
> > allocator error reporting fix.
> 
> > Matthew Auld (1):
> >      drm/tests/drm_buddy: add alloc_contiguous test
> 
> Please drop this one.
> 
> noreply@ellerman.id.au reported a build failure on m68k (and presumably
> other 32-bit platforms) in next-20240215:
> 
> ERROR: modpost: "__umoddi3" [drivers/gpu/drm/tests/drm_buddy_test.ko] undefined!
> ERROR: modpost: "__moddi3" [drivers/gpu/drm/tests/drm_buddy_test.ko] undefined!
> 
> Reverting commit a64056bb5a3215bd ("drm/tests/drm_buddy: add
> alloc_contiguous test") fixes the issue.

From a quick cross-compile test with arm(32), it seems to work there
interestingly:

./tools/testing/kunit/kunit.py run \
	--kunitconfig=drivers/gpu/drm//tests \
	--cross_compile arm-linux-gnu- --arch arm

But I agree, with should wait for a fix or a revert before merging this.

Maxime
Geert Uytterhoeven Feb. 15, 2024, 4:45 p.m. UTC | #3
Hi Maxime,

On Thu, Feb 15, 2024 at 5:09 PM Maxime Ripard <mripard@redhat.com> wrote:
 On Thu, Feb 15, 2024 at 01:41:24PM +0100, Geert Uytterhoeven wrote:
> > On Thu, 15 Feb 2024, Maxime Ripard wrote:
> > > Matthew Auld (1):
> > >      drm/tests/drm_buddy: add alloc_contiguous test
> >
> > Please drop this one.
> >
> > noreply@ellerman.id.au reported a build failure on m68k (and presumably
> > other 32-bit platforms) in next-20240215:
> >
> > ERROR: modpost: "__umoddi3" [drivers/gpu/drm/tests/drm_buddy_test.ko] undefined!
> > ERROR: modpost: "__moddi3" [drivers/gpu/drm/tests/drm_buddy_test.ko] undefined!
> >
> > Reverting commit a64056bb5a3215bd ("drm/tests/drm_buddy: add
> > alloc_contiguous test") fixes the issue.
>
> From a quick cross-compile test with arm(32), it seems to work there
> interestingly:
>
> ./tools/testing/kunit/kunit.py run \
>         --kunitconfig=drivers/gpu/drm//tests \
>         --cross_compile arm-linux-gnu- --arch arm

shmobile_defconfig + CONFIG_DRM_KUNIT_TEST=y + CONFIG_KUNIT=y:

arm-linux-gnueabihf-ld: drivers/gpu/drm/tests/drm_buddy_test.o: in
function `drm_test_buddy_alloc_contiguous':
drm_buddy_test.c:(.text+0xe0): undefined reference to `__aeabi_uldivmod'

> But I agree, with should wait for a fix or a revert before merging this.

Great, thanks!

Gr{oetje,eeting}s,

                        Geert
Geert Uytterhoeven Feb. 16, 2024, 10:02 p.m. UTC | #4
Hi Maxime, Dave,

On Thu, Feb 15, 2024 at 5:45 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> On Thu, Feb 15, 2024 at 5:09 PM Maxime Ripard <mripard@redhat.com> wrote:
>  On Thu, Feb 15, 2024 at 01:41:24PM +0100, Geert Uytterhoeven wrote:
> > > On Thu, 15 Feb 2024, Maxime Ripard wrote:
> > > > Matthew Auld (1):
> > > >      drm/tests/drm_buddy: add alloc_contiguous test
> > >
> > > Please drop this one.
> > >
> > > noreply@ellerman.id.au reported a build failure on m68k (and presumably
> > > other 32-bit platforms) in next-20240215:
> > >
> > > ERROR: modpost: "__umoddi3" [drivers/gpu/drm/tests/drm_buddy_test.ko] undefined!
> > > ERROR: modpost: "__moddi3" [drivers/gpu/drm/tests/drm_buddy_test.ko] undefined!
> > >
> > > Reverting commit a64056bb5a3215bd ("drm/tests/drm_buddy: add
> > > alloc_contiguous test") fixes the issue.
> >
> > From a quick cross-compile test with arm(32), it seems to work there
> > interestingly:
> >
> > ./tools/testing/kunit/kunit.py run \
> >         --kunitconfig=drivers/gpu/drm//tests \
> >         --cross_compile arm-linux-gnu- --arch arm
>
> shmobile_defconfig + CONFIG_DRM_KUNIT_TEST=y + CONFIG_KUNIT=y:
>
> arm-linux-gnueabihf-ld: drivers/gpu/drm/tests/drm_buddy_test.o: in
> function `drm_test_buddy_alloc_contiguous':
> drm_buddy_test.c:(.text+0xe0): undefined reference to `__aeabi_uldivmod'
>
> > But I agree, with should wait for a fix or a revert before merging this.
>
> Great, thanks!

Unfortunately the breakage still made it upstream.

Gr{oetje,eeting}s,

                        Geert