Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-12 04:07:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/amd/display: avoid large on-stack structures

Browse Source 
Putting excessively large objects on a function stack causes
a warning about possibly overflowing the 8KiB of kernel stack:

drivers/gpu/drm/amd/amdgpu/../display/dc/resource/dcn401/dcn401_resource.c: In function 'dcn401_update_bw_bounding_box':
drivers/gpu/drm/amd/amdgpu/../display/dc/resource/dcn401/dcn401_resource.c:1599:1: error: the frame size of 1196 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
 1599 | }
      | ^
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:221:1: error: the frame size of 1196 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
  221 | }
      | ^

Use dynamic allocation instead.

Fixes: e779f4587f ("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>
This commit is contained in:
Arnd Bergmann 2024-05-28 13:51:20 +02:00 committed by Alex Deucher
parent 6d438caaea
commit 669d6b078e
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/amd/display/dc/core/dc_state.c
View File

@ -193,7 +193,11 @@ static void init_state(struct dc *dc, struct dc_state *state)
struct dc_state *dc_state_create(struct dc *dc, struct dc_state_create_params *params) struct dc_state *dc_state_create(struct dc *dc, struct dc_state_create_params *params)
{ {
#ifdef CONFIG_DRM_AMD_DC_FP #ifdef CONFIG_DRM_AMD_DC_FP
struct dml2_configuration_options dml2_opt = dc->dml2_options; struct dml2_configuration_options *dml2_opt;
dml2_opt = kmemdup(&dc->dml2_options, sizeof(*dml2_opt), GFP_KERNEL);
if (!dml2_opt)
return NULL;
#endif #endif
struct dc_state *state = kvzalloc(sizeof(struct dc_state), struct dc_state *state = kvzalloc(sizeof(struct dc_state),
GFP_KERNEL); GFP_KERNEL);
@ -207,12 +211,14 @@ struct dc_state *dc_state_create(struct dc *dc, struct dc_state_create_params *p
#ifdef CONFIG_DRM_AMD_DC_FP #ifdef CONFIG_DRM_AMD_DC_FP
if (dc->debug.using_dml2) { if (dc->debug.using_dml2) {
dml2_opt.use_clock_dc_limits = false; dml2_opt->use_clock_dc_limits = false;
dml2_create(dc, &dml2_opt, &state->bw_ctx.dml2); dml2_create(dc, dml2_opt, &state->bw_ctx.dml2);
dml2_opt.use_clock_dc_limits = true; dml2_opt->use_clock_dc_limits = true;
dml2_create(dc, &dml2_opt, &state->bw_ctx.dml2_dc_power_source); dml2_create(dc, dml2_opt, &state->bw_ctx.dml2_dc_power_source);
} }
kfree(dml2_opt);
#endif #endif
kref_init(&state->refcount); kref_init(&state->refcount);

16
drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
View File

@ -1581,21 +1581,27 @@ static struct dc_cap_funcs cap_funcs = {
static void dcn401_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params) static void dcn401_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(*dml2_opt), GFP_KERNEL);
if (!dml2_opt)
return;
DC_FP_START(); DC_FP_START();
dcn401_update_bw_bounding_box_fpu(dc, bw_params); dcn401_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) 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) 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(); DC_FP_END();
kfree(dml2_opt);
} }
enum dc_status dcn401_patch_unknown_plane_state(struct dc_plane_state *plane_state) enum dc_status dcn401_patch_unknown_plane_state(struct dc_plane_state *plane_state)