Merge tag 'drm-misc-fixes-2024-05-23' of https://gitlab.freedesktop.org/drm/misc...
authorDave Airlie <airlied@redhat.com>
Mon, 27 May 2024 03:46:37 +0000 (13:46 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 27 May 2024 03:47:14 +0000 (13:47 +1000)
Short summary of fixes pull:

buddy:
- stop using PAGE_SIZE

shmem-helper:
- avoid kernel panic in mmap()

tests:
- buddy: fix PAGE_SIZE dependency

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240523184745.GA11363@localhost.localdomain
1  2 
drivers/gpu/drm/drm_buddy.c
drivers/gpu/drm/drm_gem_shmem_helper.c
drivers/gpu/drm/tests/drm_buddy_test.c
include/drm/drm_buddy.h

Simple merge
index b3be68b03610cf6b614ad8ada2f48ad5fb5ec5ef,f2397696d25267bbe0192c9e0780581eac17f5e3..dd8fb9f8341a990f63e2d67fc0a2c6f44fd023df
@@@ -734,12 -558,12 +734,12 @@@ static void drm_test_buddy_alloc_limit(
                                                drm_buddy_block_order(block), mm.max_order);
  
        KUNIT_EXPECT_EQ_MSG(test, drm_buddy_block_size(&mm, block),
-                           BIT_ULL(mm.max_order) * PAGE_SIZE,
+                           BIT_ULL(mm.max_order) * mm.chunk_size,
                                                "block size(%llu) != %llu\n",
                                                drm_buddy_block_size(&mm, block),
-                                               BIT_ULL(mm.max_order) * PAGE_SIZE);
+                                               BIT_ULL(mm.max_order) * mm.chunk_size);
  
 -      drm_buddy_free_list(&mm, &allocated);
 +      drm_buddy_free_list(&mm, &allocated, 0);
        drm_buddy_fini(&mm);
  }
  
Simple merge