From facf5d1ef883b0199f7ababe907696c030d83041 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Tue, 14 Aug 2012 07:11:49 -0500
Subject: [PATCH] radeon_hd: ensure we call CMD_SETUP on DCE6+ dpms

* We may not get a picture otherwise
---
 src/add-ons/accelerants/radeon_hd/encoder.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/add-ons/accelerants/radeon_hd/encoder.cpp b/src/add-ons/accelerants/radeon_hd/encoder.cpp
index bccae25cd3..e9a7fb5751 100644
--- a/src/add-ons/accelerants/radeon_hd/encoder.cpp
+++ b/src/add-ons/accelerants/radeon_hd/encoder.cpp
@@ -1702,6 +1702,12 @@ encoder_dpms_set_dig(uint8 crtcID, int mode)
 				|| info.chipsetID == RADEON_RV730
 				|| (info.chipsetFlags & CHIP_APU) != 0
 				|| info.dceMajor >= 5) {
+				if (info.dceMajor >= 6) {
+					/*	We need to call CMD_SETUP before reenabling the encoder,
+						otherwise we never get a picture */
+					transmitter_dig_setup(connectorIndex, pll->pixelClock, 0, 0,
+						ATOM_ENCODER_CMD_SETUP);
+				}
 				transmitter_dig_setup(connectorIndex, pll->pixelClock, 0, 0,
 					ATOM_TRANSMITTER_ACTION_ENABLE);
 			} else {