From 21431f70f6014f81b0d118ff4fcee12b00b9dd70 Mon Sep 17 00:00:00 2001

From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>

Date: Tue, 9 Nov 2021 11:24:10 -0500

Subject: drm/amd/display: Set plane update flags for all planes in reset

Git-commit: 21431f70f6014f81b0d118ff4fcee12b00b9dd70

Patch-mainline: v5.16-rc3

References: git-fixes

Alt-commit: 6984fa418b8efde7662af151bae4b8dc66e65fcf

[Why]

We're only setting the flags on stream[0]'s planes so this logic fails

if we have more than one stream in the state.

This can cause a page flip timeout with multiple displays in the

configuration.

[How]

Index into the stream_status array using the stream index - it's a 1:1

mapping.

Fixes: cdaae8371aa9 ("drm/amd/display: Handle GPU reset for DC block")

Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>

Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>

Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Signed-off-by: Patrik Jakobsson <pjakobsson@suse.de>

---

 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--

 1 file changed, 2 insertions(+), 2 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 1dee25326e2b..b3210928b9cb 100644

--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

@@ -2574,8 +2574,8 @@ static int dm_resume(void *handle)

 		for (i = 0; i < dc_state->stream_count; i++) {

 			dc_state->streams[i]->mode_changed = true;

-			for (j = 0; j < dc_state->stream_status->plane_count; j++) {

-				dc_state->stream_status->plane_states[j]->update_flags.raw

+			for (j = 0; j < dc_state->stream_status[i].plane_count; j++) {

+				dc_state->stream_status[i].plane_states[j]->update_flags.raw

 					= 0xffffffff;

 			}

 		}

-- 

2.33.1