| Message ID | 1357688461-5261-1-git-send-email-j.glisse@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jan 8, 2013 at 6:41 PM, <j.glisse@gmail.com> wrote: > From: Jerome Glisse <jglisse@redhat.com> > > 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> Seems reasonable to me. Added to my -fixes queue. Alex > --- > drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c > index f5ba224..62cd512 100644 > --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c > +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c > @@ -640,6 +640,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); > -- > 1.7.11.7 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c index f5ba224..62cd512 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c @@ -640,6 +640,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);