summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Grishin <artem.grishin@amd.com>2023-06-01 18:52:16 +0200
committerAlex Deucher <alexander.deucher@amd.com>2023-06-15 16:44:41 +0200
commitec7282bd2688c6c741c79f8696a68c6c0403cf2d (patch)
tree2671de1b7f9fd66a805a26c7967a9d06ce91be04
parentdrm/amd/display: Block SubVP + DRR if the DRR is PSR capable (diff)
downloadlinux-ec7282bd2688c6c741c79f8696a68c6c0403cf2d.tar.xz
linux-ec7282bd2688c6c741c79f8696a68c6c0403cf2d.zip
drm/amd/display: Bug fix in dcn315_populate_dml_pipes_from_context
[Why] When iterating over all pipes in the loop, the CRB allocation algorithm may potentially skip some of the pipes. Previously, the current pipe index didn't get updated in this case, causing incorrect outcome. [How] Increment the pipe index when skipping over a pipe in the loop. Acked-by: Stylon Wang <stylon.wang@amd.com> Signed-off-by: Artem Grishin <artem.grishin@amd.com> Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
index 0cc853964781..f1153941907e 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
@@ -1742,6 +1742,7 @@ static int dcn315_populate_dml_pipes_from_context(
/* Do not use asymetric crb if not enough for pstate support */
if (remaining_det_segs < 0) {
pipes[pipe_cnt].pipe.src.det_size_override = 0;
+ pipe_cnt++;
continue;
}