drm/amd/display: Cache streams targeting link when performing LT automation

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

[WHY]
Last LT automation update can cause crash by referencing current_state and
calling into dc_update_planes_and_stream which may clobber current_state.

[HOW]
Cache relevant stream pointers and iterate through them instead of relying
on the current_state.

Reviewed-by: Wenjing Liu <wenjing.liu@amd.com>
Signed-off-by: Michael Strauss <michael.strauss@amd.com>
Signed-off-by: Ivan Lipski <ivan.lipski@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Michael Strauss and committed by

Alex Deucher 10 months ago f5b69101 327aba7f

+14 -4

1 changed file

expand all

drivers

gpu

drm

amd

display

link

accessories

link_dp_cts.c

+14 -4

drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c

··· 76 76 uint8_t count; 77 77 int i; 78 78 79 + struct dc_stream_state *streams_on_link[MAX_PIPES]; 80 + int num_streams_on_link = 0; 81 + 79 82 needs_divider_update = (link->dc->link_srv->dp_get_encoding_format(link_setting) != 80 83 link->dc->link_srv->dp_get_encoding_format((const struct dc_link_settings *) &link->cur_link_settings)); 81 84 ··· 141 138 pipes[i]->stream_res.tg->funcs->enable_crtc(pipes[i]->stream_res.tg); 142 139 143 140 // Set DPMS on with stream update 144 - for (i = 0; i < state->stream_count; i++) 145 - if (state->streams[i] && state->streams[i]->link && state->streams[i]->link == link) { 146 - stream_update.stream = state->streams[i]; 141 + // Cache all streams on current link since dc_update_planes_and_stream might kill current_state 142 + for (i = 0; i < MAX_PIPES; i++) { 143 + if (state->streams[i] && state->streams[i]->link && state->streams[i]->link == link) 144 + streams_on_link[num_streams_on_link++] = state->streams[i]; 145 + } 146 + 147 + for (i = 0; i < num_streams_on_link; i++) { 148 + if (streams_on_link[i] && streams_on_link[i]->link && streams_on_link[i]->link == link) { 149 + stream_update.stream = streams_on_link[i]; 147 150 stream_update.dpms_off = &dpms_off; 148 - dc_update_planes_and_stream(state->clk_mgr->ctx->dc, NULL, 0, state->streams[i], &stream_update); 151 + dc_update_planes_and_stream(state->clk_mgr->ctx->dc, NULL, 0, streams_on_link[i], &stream_update); 149 152 } 153 + } 150 154 } 151 155 152 156 static void dp_test_send_link_training(struct dc_link *link)

Configure Feed

Configure Feed