From: Aurabindo Pillai <aurabindo.pillai@xxxxxxx> commit f510dd5c210bf8cc22e4be48cbbda3cb754219f5 upstream. [WHY & HOW] When underscan is set through xrandr, it causes the stream destination rect to change in a way it becomes complicated to handle the calculations for subvp. Since this is a corner case, disable subvp when underscan is set. Fix the existing check that is supposed to catch this corner case by adding a check based on the parameters in the stream Cc: Mario Limonciello <mario.limonciello@xxxxxxx> Cc: Alex Deucher <alexander.deucher@xxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Reviewed-by: Dillon Varone <dillon.varone@xxxxxxx> Reviewed-by: Rodrigo Siqueira <rodrigo.siqueira@xxxxxxx> Signed-off-by: Aurabindo Pillai <aurabindo.pillai@xxxxxxx> Signed-off-by: Alex Hung <alex.hung@xxxxxxx> Tested-by: Daniel Wheeler <daniel.wheeler@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c +++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c @@ -859,7 +859,9 @@ static void populate_dml21_plane_config_ plane->immediate_flip = plane_state->flip_immediate; - plane->composition.rect_out_height_spans_vactive = plane_state->dst_rect.height >= stream->timing.v_addressable; + plane->composition.rect_out_height_spans_vactive = + plane_state->dst_rect.height >= stream->timing.v_addressable && + stream->dst.height >= stream->timing.v_addressable; } //TODO : Could be possibly moved to a common helper layer. Patches currently in stable-queue which might be from aurabindo.pillai@xxxxxxx are queue-6.11/drm-amdgpu-display-fix-a-mistake-in-revert-commit.patch queue-6.11/drm-amd-display-fix-underflow-when-setting-underscan-on-dcn401.patch queue-6.11/drm-amd-display-free-bo-used-for-dmub-bounding-box.patch queue-6.11/drm-amd-display-check-link_res-hpo_dp_link_enc-before-using-it.patch queue-6.11/drm-amd-display-add-null-check-for-set_output_gamma-.patch
