drm/amd/display: dynamically allocate dml2_configuration_options structures

This structure is too large to fit on a stack, as shown by the
newly introduced warnings from a recent code change:

drivers/gpu/drm/amd/amdgpu/../display/dc/resource/dcn32/dcn32_resource.c: In function 'dcn32_update_bw_bounding_box':
drivers/gpu/drm/amd/amdgpu/../display/dc/resource/dcn32/dcn32_resource.c:2019:1: error: the frame size of 1180 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
drivers/gpu/drm/amd/amdgpu/../display/dc/resource/dcn321/dcn321_resource.c: In function 'dcn321_update_bw_bounding_box':
drivers/gpu/drm/amd/amdgpu/../display/dc/resource/dcn321/dcn321_resource.c:1597:1: error: the frame size of 1180 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_state.c: In function 'dc_state_create':
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_state.c:219:1: error: the frame size of 1184 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]

Instead of open-coding the assignment of a large structure to a stack
variable, use an explicit kmemdup() in each case to move it off the stack.

Fixes: e779f4587f61 ("drm/amd/display: Add handling for DC power mode")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
index 022d320be1d553424f2e751e1fb2f1b106f9cb2d..0f11d7c8791c07613fc4ca1af84d5d9fb7516845 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
@@ -2007,21 +2007,27 @@ void dcn32_calculate_wm_and_dlg(struct dc *dc, struct dc_state *context,
 
 static void dcn32_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)
 {
-       struct dml2_configuration_options dml2_opt = dc->dml2_options;
+       struct dml2_configuration_options *dml2_opt;
+
+       dml2_opt = kmemdup(&dc->dml2_options, sizeof(dc->dml2_options), GFP_KERNEL);
+       if (!dml2_opt)
+               return;
 
        DC_FP_START();
 
        dcn32_update_bw_bounding_box_fpu(dc, bw_params);
 
-       dml2_opt.use_clock_dc_limits = false;
+       dml2_opt->use_clock_dc_limits = false;
        if (dc->debug.using_dml2 && dc->current_state && dc->current_state->bw_ctx.dml2)
-               dml2_reinit(dc, &dml2_opt, &dc->current_state->bw_ctx.dml2);
+               dml2_reinit(dc, dml2_opt, &dc->current_state->bw_ctx.dml2);
 
-       dml2_opt.use_clock_dc_limits = true;
+       dml2_opt->use_clock_dc_limits = true;
        if (dc->debug.using_dml2 && dc->current_state && dc->current_state->bw_ctx.dml2_dc_power_source)
-               dml2_reinit(dc, &dml2_opt, &dc->current_state->bw_ctx.dml2_dc_power_source);
+               dml2_reinit(dc, dml2_opt, &dc->current_state->bw_ctx.dml2_dc_power_source);
 
        DC_FP_END();
+
+       kfree(dml2_opt);
 }
 
 static struct resource_funcs dcn32_res_pool_funcs = {

diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
index e4b360d89b3be70a2d78a8d899fe7b329d50cef1..07ca6f58447d6f8926daa1e6195780eef5ccc59d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
@@ -1581,21 +1581,27 @@ static struct dc_cap_funcs cap_funcs = {
 
 static void dcn321_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)
 {
-       struct dml2_configuration_options dml2_opt = dc->dml2_options;
+       struct dml2_configuration_options *dml2_opt;
+
+       dml2_opt = kmemdup(&dc->dml2_options, sizeof(dc->dml2_options), GFP_KERNEL);
+       if (!dml2_opt)
+               return;
 
        DC_FP_START();
 
        dcn321_update_bw_bounding_box_fpu(dc, bw_params);
 
-       dml2_opt.use_clock_dc_limits = false;
+       dml2_opt->use_clock_dc_limits = false;
        if (dc->debug.using_dml2 && dc->current_state && dc->current_state->bw_ctx.dml2)
-               dml2_reinit(dc, &dml2_opt, &dc->current_state->bw_ctx.dml2);
+               dml2_reinit(dc, dml2_opt, &dc->current_state->bw_ctx.dml2);
 
-       dml2_opt.use_clock_dc_limits = true;
+       dml2_opt->use_clock_dc_limits = true;
        if (dc->debug.using_dml2 && dc->current_state && dc->current_state->bw_ctx.dml2_dc_power_source)
-               dml2_reinit(dc, &dml2_opt, &dc->current_state->bw_ctx.dml2_dc_power_source);
+               dml2_reinit(dc, dml2_opt, &dc->current_state->bw_ctx.dml2_dc_power_source);
 
        DC_FP_END();
+
+       kfree(dml2_opt);
 }
 
 static struct resource_funcs dcn321_res_pool_funcs = {