From: jsg <jsg@openbsd.org>
Date: Thu, 4 Apr 2024 08:13:21 +0000 (+0000)
Subject: drm/amd/display: Clear OPTC mem select on disable
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c1e139cf68f071b9fd5afbdb432802ce4289a729;p=openbsd

drm/amd/display: Clear OPTC mem select on disable

From Ilya Bakoulin
2ceddecdd0ef6fe7cdb31ec14ff2e26ed938fa4b in linux-6.6.y/6.6.24
b4e05bb1dec53fe28c3c88425aded824498666e5 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_optc.c b/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_optc.c
index 93592e8051f..e817fa4efee 100644
--- a/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_optc.c
+++ b/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_optc.c
@@ -149,6 +149,9 @@ static bool optc32_disable_crtc(struct timing_generator *optc)
 			OPTC_SEG3_SRC_SEL, 0xf,
 			OPTC_NUM_OF_INPUT_SEGMENT, 0);
 
+	REG_UPDATE(OPTC_MEMORY_CONFIG,
+			OPTC_MEM_SEL, 0);
+
 	/* disable otg request until end of the first line
 	 * in the vertical blank region
 	 */