From: jsg <jsg@openbsd.org>
Date: Wed, 13 Sep 2023 12:46:32 +0000 (+0000)
Subject: drm/amd/display: Exit idle optimizations before attempt to access PHY
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f5853846d9ae6207bc9990c8a5001ce11dde26ae;p=openbsd

drm/amd/display: Exit idle optimizations before attempt to access PHY

From Leo Chen
ae1cb9656ef4c7aa366d1201d366866bc0989df7 in linux-6.1.y/6.1.53
de612738e9771bd66aeb20044486c457c512f684 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 2c29edd4f68..bee7efaa20c 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
@@ -1813,10 +1813,13 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)
 			hws->funcs.edp_backlight_control(edp_link_with_sink, false);
 		}
 		/*resume from S3, no vbios posting, no need to power down again*/
+		clk_mgr_exit_optimized_pwr_state(dc, dc->clk_mgr);
+
 		power_down_all_hw_blocks(dc);
 		disable_vga_and_power_gate_all_controllers(dc);
 		if (edp_link_with_sink && !keep_edp_vdd_on)
 			dc->hwss.edp_power_control(edp_link_with_sink, false);
+		clk_mgr_optimize_pwr_state(dc, dc->clk_mgr);
 	}
 	bios_set_scratch_acc_mode_change(dc->ctx->dc_bios, 1);
 }