From: jsg <jsg@openbsd.org>
Date: Mon, 25 Sep 2023 03:08:12 +0000 (+0000)
Subject: drm/amd/display: Blocking invalid 420 modes on HDMI TMDS for DCN31
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=baa09d67bddfeb667867c2812d840e7809ab9424;p=openbsd

drm/amd/display: Blocking invalid 420 modes on HDMI TMDS for DCN31

From Leo Chen
2c0f5b6972ebfd6224065fd3c59d04f85a8af795 in linux-6.1.y/6.1.55
026a71babf48efb6b9884a3a66fa31aec9e1ea54 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c b/sys/dev/pci/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
index ebc04b72b28..9c84561ff3b 100644
--- a/sys/dev/pci/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
+++ b/sys/dev/pci/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
@@ -4133,7 +4133,9 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
 				}
 				if (v->OutputFormat[k] == dm_420 && v->HActive[k] > DCN31_MAX_FMT_420_BUFFER_WIDTH
 						&& v->ODMCombineEnablePerState[i][k] != dm_odm_combine_mode_4to1) {
-					if (v->HActive[k] / 2 > DCN31_MAX_FMT_420_BUFFER_WIDTH) {
+					if (v->Output[k] == dm_hdmi) {
+						FMTBufferExceeded = true;
+					} else if (v->HActive[k] / 2 > DCN31_MAX_FMT_420_BUFFER_WIDTH) {
 						v->ODMCombineEnablePerState[i][k] = dm_odm_combine_mode_4to1;
 						v->PlaneRequiredDISPCLK = v->PlaneRequiredDISPCLKWithODMCombine4To1;