summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Kazlauskas <nicholas.kazlauskas@amd.com>2019-01-10 11:52:11 -0500
committerAlex Deucher <alexander.deucher@amd.com>2019-02-05 21:16:22 -0500
commitc448a53aaf9ef69942a8a4d6a9b7b191839d90c1 (patch)
tree1cc71fe8a69e4ccbbc4a8bbfa48c223e93261780
parentc744e974a22b0cf78ba581afb8244af1618f2649 (diff)
downloadtalos-op-linux-c448a53aaf9ef69942a8a4d6a9b7b191839d90c1.tar.gz
talos-op-linux-c448a53aaf9ef69942a8a4d6a9b7b191839d90c1.zip
drm/amd/display: Initialize stream_update to zero
[Why] The stream_update struct is left unitialized but DC will access its fields. This usually results in global state validation occur during any atomic commit with state->allow_modeset = true. [How] Initialize the struct to zero for every stream we check. Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Reviewed-by: David Francis <David.Francis@amd.com> Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 387f1ba39de4..824e177fba9b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5773,7 +5773,6 @@ dm_determine_update_type_for_commit(struct dc *dc,
struct dc_surface_update *updates;
struct dc_plane_state *surface;
- struct dc_stream_update stream_update;
enum surface_update_type update_type = UPDATE_TYPE_FAST;
updates = kcalloc(MAX_SURFACES, sizeof(*updates), GFP_KERNEL);
@@ -5787,6 +5786,8 @@ dm_determine_update_type_for_commit(struct dc *dc,
}
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
+ struct dc_stream_update stream_update = { 0 };
+
new_dm_crtc_state = to_dm_crtc_state(new_crtc_state);
old_dm_crtc_state = to_dm_crtc_state(old_crtc_state);
num_plane = 0;
OpenPOWER on IntegriCloud