github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 18:43:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/amd/display: fix incorrect odm change detection logic

Browse Source 
[why]
The current ODM change detection only compares first two ODM slices.
If there are 4 ODM slices and the change is within the last two slices, the
logic fails to detect ODM change and cause us to skip ODM programming
unexpectedly.

[how]
Add a is ODM topology changed resource interface to check any ODM
topology changes with a more generic method.

Reviewed-by: Dillon Varone <dillon.varone@amd.com>
Acked-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Wenjing Liu <wenjing.liu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Wenjing Liu 2023-09-14 12:42:50 -04:00 committed by Alex Deucher
parent df475cced6
commit d849434977
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
View File

@ -1927,6 +1927,29 @@ bool resource_is_pipe_topology_changed(const struct dc_state *state_a,
return false;
}
bool resource_is_odm_topology_changed(const struct pipe_ctx *otg_master_a,
const struct pipe_ctx *otg_master_b)
{
const struct pipe_ctx *opp_head_a = otg_master_a;
const struct pipe_ctx *opp_head_b = otg_master_b;
if (!resource_is_pipe_type(otg_master_a, OTG_MASTER) ||
!resource_is_pipe_type(otg_master_b, OTG_MASTER))
return true;
while (opp_head_a && opp_head_b) {
if (opp_head_a->stream_res.opp != opp_head_b->stream_res.opp)
return true;
if ((opp_head_a->next_odm_pipe && !opp_head_b->next_odm_pipe) ||
(!opp_head_a->next_odm_pipe && opp_head_b->next_odm_pipe))
return true;
opp_head_a = opp_head_a->next_odm_pipe;
opp_head_b = opp_head_b->next_odm_pipe;
}
return false;
}
/*
* Sample log:
* pipe topology update

8
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
View File

@ -1433,13 +1433,9 @@ static void dcn20_detect_pipe_changes(struct pipe_ctx *old_pipe, struct pipe_ctx
}
/* Detect top pipe only changes */
if (!new_pipe->top_pipe && !new_pipe->prev_odm_pipe) {
if (resource_is_pipe_type(new_pipe, OTG_MASTER)) {
/* Detect odm changes */
if ((old_pipe->next_odm_pipe && new_pipe->next_odm_pipe
&& old_pipe->next_odm_pipe->pipe_idx != new_pipe->next_odm_pipe->pipe_idx)
|| (!old_pipe->next_odm_pipe && new_pipe->next_odm_pipe)
|| (old_pipe->next_odm_pipe && !new_pipe->next_odm_pipe)
|| old_pipe->stream_res.opp != new_pipe->stream_res.opp)
if (resource_is_odm_topology_changed(new_pipe, old_pipe))
new_pipe->update_flags.bits.odm = 1;
/* Detect global sync changes */

10
drivers/gpu/drm/amd/display/dc/inc/resource.h
View File

@ -447,6 +447,16 @@ int resource_get_odm_slice_index(const struct pipe_ctx *opp_head);
bool resource_is_pipe_topology_changed(const struct dc_state *state_a,
const struct dc_state *state_b);
/*
* determine if the two OTG master pipes have the same ODM topology
* return
* false - if pipes passed in are not OTG masters or ODM topology is
* changed.
* true - otherwise
*/
bool resource_is_odm_topology_changed(const struct pipe_ctx *otg_master_a,
const struct pipe_ctx *otg_master_b);
/* log the pipe topology update in state */
void resource_log_pipe_topology_update(struct dc *dc, struct dc_state *state);