From: jsg <jsg@openbsd.org>
Date: Mon, 9 Oct 2023 02:29:10 +0000 (+0000)
Subject: drm/amd/display: Don't check registers, if using AUX BL control
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=20b487d9d0eaab829d5950ee13f6eec03e6bae3c;p=openbsd

drm/amd/display: Don't check registers, if using AUX BL control

From Swapnil Patel
b9971393d4c9be5eec3c6b30d9e312ba88c865ac in linux-6.1.y/6.1.56
f5b2c10b57615828b531bb0ae56bd6325a41167e in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/sys/dev/pci/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index bee7efaa20c..e61d484dcb9 100644
--- a/sys/dev/pci/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/sys/dev/pci/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -973,7 +973,9 @@ void dce110_edp_backlight_control(
 		return;
 	}
 
-	if (link->panel_cntl) {
+	if (link->panel_cntl && !(link->dpcd_sink_ext_caps.bits.oled ||
+		link->dpcd_sink_ext_caps.bits.hdr_aux_backlight_control == 1 ||
+		link->dpcd_sink_ext_caps.bits.sdr_aux_backlight_control == 1)) {
 		bool is_backlight_on = link->panel_cntl->funcs->is_panel_backlight_on(link->panel_cntl);
 
 		if ((enable && is_backlight_on) || (!enable && !is_backlight_on)) {