drm/amd/display: kunit: move dc_link objects off stack
Subsystems (3)
PATCH 1/1 drm/amd/display: kunit: move dc_link objects off stack
From: Arnd Bergmann <[email protected]>
'struct dc_link' is too large to be on the kernel stack, with every instance causing a build time warning in some configurations:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/tests/amdgpu_dm_connector_test.c: In function 'dm_test_subconnector_type_none':drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/tests/amdgpu_dm_connector_test.c:36:1: error: the frame size of 1608 bytes is larger than 1280 bytes [-Werror=frame-larger-than=]
36 | }drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c: In function 'dm_mst_test_needs_dsc_aux_workaround_zero_sink_count':drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c:156:1: error: the frame size of 1584 bytes is larger than 1280 bytes [-Werror=frame-larger-than=]
156 | }
Since the tests do not need to run concurrently, just make it a per-file static object that gets reinitialized for each test case.
---
The patches causing this seem to have appeared were not in linux-next during the first half of the merge window, not sure why they are there, but in case these are intended for 7.2, it still needs to get fixed.
--- .../amdgpu_dm/tests/amdgpu_dm_connector_test.c | 17 +++++++++-------- .../amdgpu_dm/tests/amdgpu_dm_mst_types_test.c | 14 ++++++++------ 2 files changed, 17 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +9 -8
@@ -22,6 +22,7 @@#include "include/grph_object_id.h" /* Tests for get_subconnector_type() */ +static struct dc_link link;/** * dm_test_subconnector_type_none - Test Subconnector type none
@@ -29,7 +30,7 @@*/ static void dm_test_subconnector_type_none (struct kunit *test) { -struct dc_link link = {}; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.dongle_type =DISPLAY_DONGLE_NONE ;KUNIT_EXPECT_EQ (test, (int )get_subconnector_type (&link), (int )DRM_MODE_SUBCONNECTOR_Native);
@@ -41,7 +42,7 @@ static void dm_test_subconnector_type_none(struct kunit *test)*/ static void dm_test_subconnector_type_vga (struct kunit *test) { -struct dc_link link = {}; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.dongle_type =DISPLAY_DONGLE_DP_VGA_CONVERTER ;KUNIT_EXPECT_EQ (test, (int )get_subconnector_type (&link), (int )DRM_MODE_SUBCONNECTOR_VGA );
@@ -53,7 +54,7 @@ static void dm_test_subconnector_type_vga(struct kunit *test)*/ static void dm_test_subconnector_type_dvi_converter (struct kunit *test) { -struct dc_link link = {}; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.dongle_type =DISPLAY_DONGLE_DP_DVI_CONVERTER ;KUNIT_EXPECT_EQ (test, (int )get_subconnector_type (&link), (int )DRM_MODE_SUBCONNECTOR_DVID );
@@ -65,7 +66,7 @@ static void dm_test_subconnector_type_dvi_converter(struct kunit *test)*/ static void dm_test_subconnector_type_dvi_dongle (struct kunit *test) { -struct dc_link link = {}; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.dongle_type =DISPLAY_DONGLE_DP_DVI_DONGLE ;KUNIT_EXPECT_EQ (test, (int )get_subconnector_type (&link), (int )DRM_MODE_SUBCONNECTOR_DVID );
@@ -77,7 +78,7 @@ static void dm_test_subconnector_type_dvi_dongle(struct kunit *test)*/ static void dm_test_subconnector_type_hdmi_converter (struct kunit *test) { -struct dc_link link = {}; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.dongle_type =DISPLAY_DONGLE_DP_HDMI_CONVERTER ;KUNIT_EXPECT_EQ (test, (int )get_subconnector_type (&link), (int )DRM_MODE_SUBCONNECTOR_HDMIA );
@@ -89,7 +90,7 @@ static void dm_test_subconnector_type_hdmi_converter(struct kunit *test)*/ static void dm_test_subconnector_type_hdmi_dongle (struct kunit *test) { -struct dc_link link = {}; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.dongle_type =DISPLAY_DONGLE_DP_HDMI_DONGLE ;KUNIT_EXPECT_EQ (test, (int )get_subconnector_type (&link), (int )DRM_MODE_SUBCONNECTOR_HDMIA );
@@ -101,7 +102,7 @@ static void dm_test_subconnector_type_hdmi_dongle(struct kunit *test)*/ static void dm_test_subconnector_type_mismatched (struct kunit *test) { -struct dc_link link = {}; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.dongle_type =DISPLAY_DONGLE_DP_HDMI_MISMATCHED_DONGLE ;KUNIT_EXPECT_EQ (test, (int )get_subconnector_type (&link), (int )DRM_MODE_SUBCONNECTOR_Unknown);
@@ -113,7 +114,7 @@ static void dm_test_subconnector_type_mismatched(struct kunit *test)*/ static void dm_test_subconnector_type_default_unknown (struct kunit *test) { -struct dc_link link = {}; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.dongle_type = (typeof(link.dpcd_caps.dongle_type))0x7f;KUNIT_EXPECT_EQ (test, (int )get_subconnector_type (&link), (int )DRM_MODE_SUBCONNECTOR_Unknown);
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c +8 -6
@@ -45,6 +45,8 @@ static ssize_t dm_mst_test_aux_transfer(struct drm_dp_aux *aux, } } +static struct dc_link link; +/* Tests for needs_dsc_aux_workaround */ /**
@@ -56,7 +58,7 @@ static ssize_t dm_mst_test_aux_transfer(struct drm_dp_aux *aux,*/ static void dm_mst_test_needs_dsc_aux_workaround_match (struct kunit *test) { -struct dc_link link = {0 }; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.branch_dev_id =DP_BRANCH_DEVICE_ID_90CC24 ; link.dpcd_caps.dpcd_rev.raw =DPCD_REV_14 ;
@@ -74,7 +76,7 @@ static void dm_mst_test_needs_dsc_aux_workaround_match(struct kunit *test)*/ static void dm_mst_test_needs_dsc_aux_workaround_rev12 (struct kunit *test) { -struct dc_link link = {0 }; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.branch_dev_id =DP_BRANCH_DEVICE_ID_90CC24 ; link.dpcd_caps.dpcd_rev.raw =DPCD_REV_12 ;
@@ -92,7 +94,7 @@ static void dm_mst_test_needs_dsc_aux_workaround_rev12(struct kunit *test)*/ static void dm_mst_test_needs_dsc_aux_workaround_wrong_dev_id (struct kunit *test) { -struct dc_link link = {0 }; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.branch_dev_id =0x123456 ; link.dpcd_caps.dpcd_rev.raw =DPCD_REV_14 ;
@@ -110,7 +112,7 @@ static void dm_mst_test_needs_dsc_aux_workaround_wrong_dev_id(struct kunit *test*/ static void dm_mst_test_needs_dsc_aux_workaround_wrong_rev (struct kunit *test) { -struct dc_link link = {0 }; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.branch_dev_id =DP_BRANCH_DEVICE_ID_90CC24 ; link.dpcd_caps.dpcd_rev.raw =0x11 ;/* DPCD 1.1 */
@@ -128,7 +130,7 @@ static void dm_mst_test_needs_dsc_aux_workaround_wrong_rev(struct kunit *test)*/ static void dm_mst_test_needs_dsc_aux_workaround_low_sink_count (struct kunit *test) { -struct dc_link link = {0 }; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.branch_dev_id =DP_BRANCH_DEVICE_ID_90CC24 ; link.dpcd_caps.dpcd_rev.raw =DPCD_REV_14 ;
@@ -146,7 +148,7 @@ static void dm_mst_test_needs_dsc_aux_workaround_low_sink_count(struct kunit *te*/ static void dm_mst_test_needs_dsc_aux_workaround_zero_sink_count (struct kunit *test) { -struct dc_link link = {0 }; +memset (&link,0 ,sizeof (link)); link.dpcd_caps.branch_dev_id =DP_BRANCH_DEVICE_ID_90CC24 ; link.dpcd_caps.dpcd_rev.raw =DPCD_REV_14 ;
Signature · 1 line
2.39.5