From: Dave Airlie Date: Mon, 27 May 2024 03:46:37 +0000 (+1000) Subject: Merge tag 'drm-misc-fixes-2024-05-23' of https://gitlab.freedesktop.org/drm/misc... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3e049b6b8f32f25c6967f4cffd8eac6e1e5316f6;p=linux.git Merge tag 'drm-misc-fixes-2024-05-23' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes 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 From: Thomas Zimmermann Link: https://patchwork.freedesktop.org/patch/msgid/20240523184745.GA11363@localhost.localdomain --- 3e049b6b8f32f25c6967f4cffd8eac6e1e5316f6 diff --cc drivers/gpu/drm/tests/drm_buddy_test.c index b3be68b03610c,f2397696d2526..dd8fb9f8341a9 --- a/drivers/gpu/drm/tests/drm_buddy_test.c +++ b/drivers/gpu/drm/tests/drm_buddy_test.c @@@ -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); }