drm/amd/display: Fix gpu reset in multidisplay config

commit 7eb287beeb60be1e4437be2b4e4e9f0da89aab97 upstream.

[Why]
The indexing of stream_status in dm_gpureset_commit_state() is incorrect.
That leads to asserts in multi-display configuration after gpu reset.

[How]
Adjust the indexing logic to align stream_status with surface_updates.

Fixes: cdaae8371aa9 ("drm/amd/display: Handle GPU reset for DC block")
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3808
Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Roman Li <Roman.Li@amd.com>
Signed-off-by: Zaeem Mohamed <zaeem.mohamed@amd.com>
Tested-by: Mark Broadworth <mark.broadworth@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit d91bc901398741d317d9b55c59ca949d4bc7394b)
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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 28f2b4022d34e3cd6ede15e0fd6dcdb20dd9c7d3..56cc670a0022f53412e6c119300a0c99a4d45b70 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2789,16 +2789,16 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state,
        for (k = 0; k < dc_state->stream_count; k++) {
                bundle->stream_update.stream = dc_state->streams[k];
 
-               for (m = 0; m < dc_state->stream_status->plane_count; m++) {
+               for (m = 0; m < dc_state->stream_status[k].plane_count; m++) {
                        bundle->surface_updates[m].surface =
-                               dc_state->stream_status->plane_states[m];
+                               dc_state->stream_status[k].plane_states[m];
                        bundle->surface_updates[m].surface->force_full_update =
                                true;
                }
 
                update_planes_and_stream_adapter(dm->dc,
                                         UPDATE_TYPE_FULL,
-                                        dc_state->stream_status->plane_count,
+                                        dc_state->stream_status[k].plane_count,
                                         dc_state->streams[k],
                                         &bundle->stream_update,
                                         bundle->surface_updates);