Skip to content

Commit d91bc90

Browse files
Roman Lialexdeucher
authored andcommitted
drm/amd/display: Fix gpu reset in multidisplay config
[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: cdaae83 ("drm/amd/display: Handle GPU reset for DC block") Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3808 Reviewed-by: Aurabindo Pillai <[email protected]> Reviewed-by: Mario Limonciello <[email protected]> Signed-off-by: Roman Li <[email protected]> Signed-off-by: Zaeem Mohamed <[email protected]> Tested-by: Mark Broadworth <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 8fc3959 commit d91bc90

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3411,16 +3411,16 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state,
34113411
for (k = 0; k < dc_state->stream_count; k++) {
34123412
bundle->stream_update.stream = dc_state->streams[k];
34133413

3414-
for (m = 0; m < dc_state->stream_status->plane_count; m++) {
3414+
for (m = 0; m < dc_state->stream_status[k].plane_count; m++) {
34153415
bundle->surface_updates[m].surface =
3416-
dc_state->stream_status->plane_states[m];
3416+
dc_state->stream_status[k].plane_states[m];
34173417
bundle->surface_updates[m].surface->force_full_update =
34183418
true;
34193419
}
34203420

34213421
update_planes_and_stream_adapter(dm->dc,
34223422
UPDATE_TYPE_FULL,
3423-
dc_state->stream_status->plane_count,
3423+
dc_state->stream_status[k].plane_count,
34243424
dc_state->streams[k],
34253425
&bundle->stream_update,
34263426
bundle->surface_updates);

0 commit comments

Comments
 (0)