aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarry Wentland <[email protected]>2017-10-12 14:15:26 -0400
committerAlex Deucher <[email protected]>2017-10-21 16:52:02 -0400
commitbb16bee4b394bafd6168c7719b7b07e19d1f0ce1 (patch)
tree7a3dbd825612a4d43e9b6c99019004fd38cfbce9
parent1bed4d09a4cc5a7d4449da86832d9bd816ae44ff (diff)
drm/amd/display: Reduce stack size of commit_planes_to_stream
This function likes to blow 1024 stack size when something is added to the addr struct. For now just dynamically allocate. Signed-off-by: Harry Wentland <[email protected]> Reviewed-by: Tony Cheng <[email protected]> Acked-by: Harry Wentland <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index ff6bd384aece..7a0593d4ca62 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -926,9 +926,9 @@ bool dc_commit_planes_to_stream(
struct dc_state *state)
{
struct dc_surface_update updates[MAX_SURFACES];
- struct dc_flip_addrs flip_addr[MAX_SURFACES];
- struct dc_plane_info plane_info[MAX_SURFACES];
- struct dc_scaling_info scaling_info[MAX_SURFACES];
+ struct dc_flip_addrs *flip_addr;
+ struct dc_plane_info *plane_info;
+ struct dc_scaling_info *scaling_info;
int i;
struct dc_stream_update *stream_update =
kzalloc(sizeof(struct dc_stream_update), GFP_KERNEL);
@@ -938,10 +938,14 @@ bool dc_commit_planes_to_stream(
return false;
}
+ flip_addr = kcalloc(MAX_SURFACES, sizeof(struct dc_flip_addrs),
+ GFP_KERNEL);
+ plane_info = kcalloc(MAX_SURFACES, sizeof(struct dc_plane_info),
+ GFP_KERNEL);
+ scaling_info = kcalloc(MAX_SURFACES, sizeof(struct dc_scaling_info),
+ GFP_KERNEL);
+
memset(updates, 0, sizeof(updates));
- memset(flip_addr, 0, sizeof(flip_addr));
- memset(plane_info, 0, sizeof(plane_info));
- memset(scaling_info, 0, sizeof(scaling_info));
stream_update->src = dc_stream->src;
stream_update->dst = dc_stream->dst;
@@ -980,6 +984,9 @@ bool dc_commit_planes_to_stream(
new_plane_count,
dc_stream, stream_update, plane_states, state);
+ kfree(flip_addr);
+ kfree(plane_info);
+ kfree(scaling_info);
kfree(stream_update);
return true;
}