drm/radeon: fix hdmi mode enable on RS600/RS690/RS740

commit dcb852905772416e322536ced5cb3c796d176af5 upstream.

These chips were previously skipped since they are
pre-R600.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 95970ec47c45f674bc80b712faedd95caaf11e81..d89a1f83309f6b090b270be088e09121dec10465 100644 (file)
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -489,7 +489,7 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
        offset = dig->afmt->offset;
 
        /* Older chipsets require setting HDMI and routing manually */
-       if (rdev->family >= CHIP_R600 && !ASIC_IS_DCE3(rdev)) {
+       if (ASIC_IS_DCE2(rdev) && !ASIC_IS_DCE3(rdev)) {
                hdmi = HDMI0_ERROR_ACK | HDMI0_ENABLE;
                switch (radeon_encoder->encoder_id) {
                case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
@@ -557,7 +557,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
        radeon_irq_kms_disable_afmt(rdev, dig->afmt->id);
 
        /* Older chipsets not handled by AtomBIOS */
-       if (rdev->family >= CHIP_R600 && !ASIC_IS_DCE3(rdev)) {
+       if (ASIC_IS_DCE2(rdev) && !ASIC_IS_DCE3(rdev)) {
                switch (radeon_encoder->encoder_id) {
                case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
                        WREG32_P(AVIVO_TMDSA_CNTL, 0,