From 8e75e90d3a402cd7c7d3506d9e5407a8bc92481e Mon Sep 17 00:00:00 2001 From: Venkat Rao Bagalkote Date: Sat, 11 Jul 2026 08:59:56 +0530 Subject: [PATCH] drm/amd/display: Shorten KUnit exported symbol names The KUnit exported helpers amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers() amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers() exceed MODULE_NAME_LEN and cause modpost to fail with: ERROR: modpost: too long symbol "amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers" Shorten the helper names while preserving their functionality. Reported-by: Venkat Rao Bagalkote Link: https://lore.kernel.org/all/fde3656e-9e22-4e4c-937f-7e8cb918da6b@linux.ibm.com/ Signed-off-by: Venkat Rao Bagalkote Signed-off-by: Alex Deucher --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 12 ++++++------ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 4 ++-- .../display/amdgpu_dm/tests/amdgpu_dm_plane_test.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c index 9a34e0014084..26f35434a92f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c @@ -328,7 +328,7 @@ STATIC_IFN_KUNIT int amdgpu_dm_plane_validate_dcc(struct amdgpu_device *adev, } EXPORT_IF_KUNIT(amdgpu_dm_plane_validate_dcc); -STATIC_IFN_KUNIT int amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers(struct amdgpu_device *adev, +STATIC_IFN_KUNIT int amdgpu_dm_plane_fill_gfx9_attrs_from_modifiers(struct amdgpu_device *adev, const struct amdgpu_framebuffer *afb, const enum surface_pixel_format format, const enum dc_rotation_angle rotation, @@ -378,9 +378,9 @@ STATIC_IFN_KUNIT int amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers(s return ret; } -EXPORT_IF_KUNIT(amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers); +EXPORT_IF_KUNIT(amdgpu_dm_plane_fill_gfx9_attrs_from_modifiers); -STATIC_IFN_KUNIT int amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers(struct amdgpu_device *adev, +STATIC_IFN_KUNIT int amdgpu_dm_plane_fill_gfx12_attrs_from_modifiers(struct amdgpu_device *adev, const struct amdgpu_framebuffer *afb, const enum surface_pixel_format format, const enum dc_rotation_angle rotation, @@ -419,7 +419,7 @@ STATIC_IFN_KUNIT int amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers( return ret; } -EXPORT_IF_KUNIT(amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers); +EXPORT_IF_KUNIT(amdgpu_dm_plane_fill_gfx12_attrs_from_modifiers); static void amdgpu_dm_plane_add_gfx10_1_modifiers(const struct amdgpu_device *adev, uint64_t **mods, @@ -927,14 +927,14 @@ int amdgpu_dm_plane_fill_plane_buffer_attributes(struct amdgpu_device *adev, } if (adev->family == AMDGPU_FAMILY_GC_12_0_0) { - ret = amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers(adev, afb, format, + ret = amdgpu_dm_plane_fill_gfx12_attrs_from_modifiers(adev, afb, format, rotation, plane_size, tiling_info, dcc, address); if (ret) return ret; } else if (adev->family >= AMDGPU_FAMILY_AI) { - ret = amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers(adev, afb, format, + ret = amdgpu_dm_plane_fill_gfx9_attrs_from_modifiers(adev, afb, format, rotation, plane_size, tiling_info, dcc, address); diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h index ad22324a5d2e..365e306a52e7 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h @@ -92,7 +92,7 @@ int amdgpu_dm_plane_get_plane_modifiers(struct amdgpu_device *adev, int amdgpu_dm_plane_get_plane_formats(const struct drm_plane *plane, const struct dc_plane_cap *plane_cap, uint32_t *formats, int max_formats); -int amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers(struct amdgpu_device *adev, +int amdgpu_dm_plane_fill_gfx9_attrs_from_modifiers(struct amdgpu_device *adev, const struct amdgpu_framebuffer *afb, const enum surface_pixel_format format, const enum dc_rotation_angle rotation, @@ -100,7 +100,7 @@ int amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers(struct amdgpu_devi struct dc_tiling_info *tiling_info, struct dc_plane_dcc_param *dcc, struct dc_plane_address *address); -int amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers(struct amdgpu_device *adev, +int amdgpu_dm_plane_fill_gfx12_attrs_from_modifiers(struct amdgpu_device *adev, const struct amdgpu_framebuffer *afb, const enum surface_pixel_format format, const enum dc_rotation_angle rotation, diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c index df69e2235e24..a751e67cadf1 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c @@ -615,7 +615,7 @@ static void dm_test_fill_gfx12_plane_attributes_from_modifiers(struct kunit *tes plane_size.surface_size.height = 1080; KUNIT_EXPECT_EQ(test, - amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers( + amdgpu_dm_plane_fill_gfx12_attrs_from_modifiers( adev, afb, SURFACE_PIXEL_FORMAT_GRPH_ARGB8888, ROTATION_ANGLE_0, &plane_size, &tiling_info, &dcc, &address), 0); @@ -659,7 +659,7 @@ static void dm_test_fill_gfx9_plane_attributes_from_modifiers(struct kunit *test afb->base.modifier = DRM_FORMAT_MOD_LINEAR; KUNIT_EXPECT_EQ(test, - amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers( + amdgpu_dm_plane_fill_gfx9_attrs_from_modifiers( adev, afb, SURFACE_PIXEL_FORMAT_GRPH_ARGB8888, ROTATION_ANGLE_0, &plane_size, &tiling_info, &dcc, &address), 0); @@ -1379,7 +1379,7 @@ static int dm_test_gfx9_attrs(struct amdgpu_device *adev, struct dc_plane_dcc_param *dcc, struct dc_plane_address *address) { - return amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers(adev, + return amdgpu_dm_plane_fill_gfx9_attrs_from_modifiers(adev, afb, SURFACE_PIXEL_FORMAT_GRPH_ARGB8888, ROTATION_ANGLE_0, plane_size, tiling_info, dcc, address); } @@ -1391,7 +1391,7 @@ static int dm_test_gfx12_attrs(struct amdgpu_device *adev, struct dc_plane_dcc_param *dcc, struct dc_plane_address *address) { - return amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers(adev, + return amdgpu_dm_plane_fill_gfx12_attrs_from_modifiers(adev, afb, SURFACE_PIXEL_FORMAT_GRPH_ARGB8888, ROTATION_ANGLE_0, plane_size, tiling_info, dcc, address); } @@ -3210,12 +3210,12 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = { /* amdgpu_dm_plane_format_mod_supported() */ KUNIT_CASE(dm_test_format_mod_supported), KUNIT_CASE(dm_test_format_mod_supported_d_swizzle_reject), - /* amdgpu_dm_plane_fill_gfx12_plane_attributes_from_modifiers() */ + /* amdgpu_dm_plane_fill_gfx12_attrs_from_modifiers() */ KUNIT_CASE(dm_test_fill_gfx12_plane_attributes_from_modifiers), KUNIT_CASE(dm_test_fill_gfx12_plane_attributes_block0), KUNIT_CASE(dm_test_fill_gfx12_plane_attributes_block_unconstrained), KUNIT_CASE(dm_test_fill_gfx12_plane_attributes_validate_fails), - /* amdgpu_dm_plane_fill_gfx9_plane_attributes_from_modifiers() */ + /* amdgpu_dm_plane_fill_gfx9_attrs_from_modifiers() */ KUNIT_CASE(dm_test_fill_gfx9_plane_attributes_from_modifiers), KUNIT_CASE(dm_test_fill_gfx9_plane_attributes_dcc), KUNIT_CASE(dm_test_fill_gfx9_plane_attributes_validate_fails),