summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorjimqu <Jim.Qu@amd.com>2016-11-28 08:05:46 +0800
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 17:02:02 -0400
commitead964f24e111aa5ba6ec4c2ee15ae20f11a121a (patch)
tree24aab4f926cac5d31b52d579a02286704e71ca1e /drivers
parent8e545104aa05b5e0720fd2042e2f9729f9c13744 (diff)
drm/amd/display: Fix memory corruption issue.
temp_flip_context is always same as current_context, and the current_context will be freed in dc_commit_targets(), but temp_flip_context will be used in dc_update_surfaces_for_target(). Signed-off-by: JimQu <Jim.Qu@amd.com> Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index f7638f84421b..424a7d4b8731 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1096,8 +1096,12 @@ bool dc_commit_targets(
resource_validate_ctx_destruct(core_dc->current_context);
- dm_free(core_dc->current_context);
+ if (core_dc->temp_flip_context != core_dc->current_context) {
+ dm_free(core_dc->temp_flip_context);
+ core_dc->temp_flip_context = core_dc->current_context;
+ }
core_dc->current_context = context;
+ memset(core_dc->temp_flip_context, 0, sizeof(*core_dc->temp_flip_context));
return (result == DC_OK);