drm/amd/display: Shorten KUnit exported symbol names
Subsystems (3)
PATCH 1/1 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.
--- .../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 | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +6 -6
@@ -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(sreturn 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);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h +2 -2
@@ -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_devistruct 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,
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +4 -4
@@ -579,7 +579,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 );
@@ -623,7 +623,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 );
@@ -1187,9 +1187,9 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_get_cursor_position),/* amdgpu_dm_plane_format_mod_supported() */ KUNIT_CASE (dm_test_format_mod_supported), -/* 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), -/* 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),/* amdgpu_dm_plane_helper_check_state() */ KUNIT_CASE(dm_test_helper_check_state_viewport_reject),
Signature · 1 line
2.45.2
Alex Deucher
AppliedApplied. Thanks!
Quoted 132 lines · Venkat Rao Bagalkote
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_LENand 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 <[email protected]>Signed-off-by Venkat Rao Bagalkote <[email protected]>--- .../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 | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +6
-6@@ -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(sreturn 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);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h +2
-2@@ -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_devistruct 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,drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c +4
-5@@ -579,7 +579,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 );@@ -623,7 +623,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 );@@ -1187,9 +1187,9 @@ static struct kunit_case amdgpu_dm_plane_test_cases[] = {KUNIT_CASE (dm_test_get_cursor_position),/* amdgpu_dm_plane_format_mod_supported() */ KUNIT_CASE (dm_test_format_mod_supported), -/* 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), -/* 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),/* amdgpu_dm_plane_helper_check_state() */ KUNIT_CASE(dm_test_helper_check_state_viewport_reject), --2.45.2