summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorAlvin Lee <alvin.lee2@amd.com>2023-12-13 09:46:50 -0500
committerAlex Deucher <alexander.deucher@amd.com>2024-01-03 10:46:21 -0500
commit09b5bc456c63e3caeb854d492177bbfbe7b1cb22 (patch)
tree38229fff1f2577b1d8d819dcff7c0c4580c64dc0 /drivers/gpu/drm/amd
parentec9ba4821fa52b5efdbc4cdf0a77497990655231 (diff)
downloadlinux-stable-09b5bc456c63e3caeb854d492177bbfbe7b1cb22.tar.gz
linux-stable-09b5bc456c63e3caeb854d492177bbfbe7b1cb22.tar.bz2
linux-stable-09b5bc456c63e3caeb854d492177bbfbe7b1cb22.zip
drm/amd/display: Assign stream status for FPO + Vactive cases
A new check was added to ensure FPO is not enabled when the FPO pipe has 0 planes. This requires the stream status to check the plane count, but the stream status was not assigned for FPO + Vactive cases which leads to FPO not be enabled always. Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Reviewed-by: Relja Vojvodic <relja.vojvodic@amd.com> Acked-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com> Signed-off-by: Alvin Lee <alvin.lee2@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c
index cca6436ecdf5..f698a7e63291 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c
@@ -554,7 +554,8 @@ struct dc_stream_state *dcn32_can_support_mclk_switch_using_fw_based_vblank_stre
DC_FP_START();
dcn32_assign_fpo_vactive_candidate(dc, context, &fpo_candidate_stream);
DC_FP_END();
-
+ if (fpo_candidate_stream)
+ fpo_stream_status = dc_state_get_stream_status(context, fpo_candidate_stream);
DC_FP_START();
is_fpo_vactive = dcn32_find_vactive_pipe(dc, context, dc->debug.fpo_vactive_min_active_margin_us);
DC_FP_END();