diff mbox

[Quantal,SRU,1/1] radeon/kms: force rn50 chip to always report connected on analog output

Message ID 1d43a33694b026c9245c56bc8cc496cc75792179.1358915767.git.leann.ogasawara@canonical.com
State New
Headers show

Commit Message

Leann Ogasawara Jan. 23, 2013, 4:47 a.m. UTC 
From: Jerome Glisse <jglisse@redhat.com>

BugLink: http://bugs.launchpad.net/bugs/1103320

Those rn50 chip are often connected to console remoting hw and load
detection often fails with those. Just don't try to load detect and
report connect.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
(cherry picked from commit 51861d4eebc2ddc25c77084343d060fa79f6e291)

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 drivers/gpu/drm/radeon/radeon_legacy_encoders.c |    8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Seth Forshee Jan. 23, 2013, 2:40 p.m. UTC | #1
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index 8148cf8..e03f90e 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -618,6 +618,14 @@  static enum drm_connector_status radeon_legacy_primary_dac_detect(struct drm_enc
 	enum drm_connector_status found = connector_status_disconnected;
 	bool color = true;
 
+	/* just don't bother on RN50 those chip are often connected to remoting
+	 * console hw and often we get failure to load detect those. So to make
+	 * everyone happy report the encoder as always connected.
+	 */
+	if (ASIC_IS_RN50(rdev)) {
+		return connector_status_connected;
+	}
+
 	/* save the regs we need */
 	vclk_ecp_cntl = RREG32_PLL(RADEON_VCLK_ECP_CNTL);
 	crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL);