drm/radeon/kms: keep HDMI state in separated variable

[linux-2.6-microblaze.git] / drivers / gpu / drm / radeon / r600_hdmi.c

diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 0b59206..ba3b65c 100644 (file)
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -275,7 +275,7 @@ int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder)
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
        int status, result;
 
-       if (!radeon_encoder->hdmi_offset)
+       if (!radeon_encoder->hdmi_enabled)
                return 0;
 
        status = r600_hdmi_is_audio_buffer_filled(encoder);
@@ -295,7 +295,7 @@ void r600_hdmi_audio_workaround(struct drm_encoder *encoder)
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
        uint32_t offset = radeon_encoder->hdmi_offset;
 
-       if (!offset)
+       if (!radeon_encoder->hdmi_enabled)
                return;
 
        if (!radeon_encoder->hdmi_audio_workaround ||
@@ -323,7 +323,7 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
        if (ASIC_IS_DCE5(rdev))
                return;
 
-       if (!offset)
+       if (!to_radeon_encoder(encoder)->hdmi_enabled)
                return;
 
        r600_audio_set_clock(encoder, mode->clock);
@@ -370,7 +370,7 @@ void r600_hdmi_update_audio_settings(struct drm_encoder *encoder)
 
        uint32_t iec;
 
-       if (!offset)
+       if (!to_radeon_encoder(encoder)->hdmi_enabled)
                return;
 
        DRM_DEBUG("%s with %d channels, %d Hz sampling rate, %d bits per sample,\n",
@@ -421,40 +421,6 @@ void r600_hdmi_update_audio_settings(struct drm_encoder *encoder)
        r600_hdmi_audio_workaround(encoder);
 }
 
-static int r600_hdmi_find_free_block(struct drm_device *dev)
-{
-       struct radeon_device *rdev = dev->dev_private;
-       struct drm_encoder *encoder;
-       struct radeon_encoder *radeon_encoder;
-       bool free_blocks[3] = { true, true, true };
-
-       list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-               radeon_encoder = to_radeon_encoder(encoder);
-               switch (radeon_encoder->hdmi_offset) {
-               case R600_HDMI_BLOCK1:
-                       free_blocks[0] = false;
-                       break;
-               case R600_HDMI_BLOCK2:
-                       free_blocks[1] = false;
-                       break;
-               case R600_HDMI_BLOCK3:
-                       free_blocks[2] = false;
-                       break;
-               }
-       }
-
-       if (rdev->family == CHIP_RS600 || rdev->family == CHIP_RS690 ||
-           rdev->family == CHIP_RS740) {
-               return free_blocks[0] ? R600_HDMI_BLOCK1 : 0;
-       } else if (rdev->family >= CHIP_R600) {
-               if (free_blocks[0])
-                       return R600_HDMI_BLOCK1;
-               else if (free_blocks[1])
-                       return R600_HDMI_BLOCK2;
-       }
-       return 0;
-}
-
 static void r600_hdmi_assign_block(struct drm_encoder *encoder)
 {
        struct drm_device *dev = encoder->dev;
@@ -485,18 +451,19 @@ static void r600_hdmi_assign_block(struct drm_encoder *encoder)
                }
                radeon_encoder->hdmi_offset = EVERGREEN_HDMI_BASE +
                                                eg_offsets[dig->dig_encoder];
-               radeon_encoder->hdmi_config_offset = radeon_encoder->hdmi_offset
-                                               + EVERGREEN_HDMI_CONFIG_OFFSET;
        } else if (ASIC_IS_DCE3(rdev)) {
                radeon_encoder->hdmi_offset = dig->dig_encoder ?
                        R600_HDMI_BLOCK3 : R600_HDMI_BLOCK1;
-               if (ASIC_IS_DCE32(rdev))
-                       radeon_encoder->hdmi_config_offset = dig->dig_encoder ?
-                               R600_HDMI_CONFIG2 : R600_HDMI_CONFIG1;
-       } else if (rdev->family >= CHIP_R600 || rdev->family == CHIP_RS600 ||
-                  rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) {
-               radeon_encoder->hdmi_offset = r600_hdmi_find_free_block(dev);
+       } else if (rdev->family >= CHIP_R600) {
+               /* 2 routable blocks, but using dig_encoder should be fine */
+               radeon_encoder->hdmi_offset = dig->dig_encoder ?
+                       R600_HDMI_BLOCK2 : R600_HDMI_BLOCK1;
+       } else if (rdev->family == CHIP_RS600 || rdev->family == CHIP_RS690 ||
+                  rdev->family == CHIP_RS740) {
+               /* Only 1 routable block */
+               radeon_encoder->hdmi_offset = R600_HDMI_BLOCK1;
        }
+       radeon_encoder->hdmi_enabled = true;
 }
 
 /*
@@ -512,9 +479,9 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
        if (ASIC_IS_DCE5(rdev))
                return;
 
-       if (!radeon_encoder->hdmi_offset) {
+       if (!radeon_encoder->hdmi_enabled) {
                r600_hdmi_assign_block(encoder);
-               if (!radeon_encoder->hdmi_offset) {
+               if (!radeon_encoder->hdmi_enabled) {
                        dev_warn(rdev->dev, "Could not find HDMI block for "
                                "0x%x encoder\n", radeon_encoder->encoder_id);
                        return;
@@ -525,9 +492,9 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
        if (ASIC_IS_DCE5(rdev)) {
                /* TODO */
        } else if (ASIC_IS_DCE4(rdev)) {
-               WREG32_P(radeon_encoder->hdmi_config_offset + 0xc, 0x1, ~0x1);
+               WREG32_P(radeon_encoder->hdmi_offset + EVERGREEN_AUDIO_PACKET_CNTL, 0x1, ~0x1);
        } else if (ASIC_IS_DCE32(rdev)) {
-               WREG32_P(radeon_encoder->hdmi_config_offset + 0x4, 0x1, ~0x1);
+               WREG32_P(radeon_encoder->hdmi_offset + R600_HDMI_AUDIO_PACKET_CNTL, 0x1, ~0x1);
        } else if (ASIC_IS_DCE3(rdev)) {
                /* TODO */
        } else if (rdev->family >= CHIP_R600) {
@@ -548,19 +515,10 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
                }
        }
 
-       if (rdev->irq.installed
-           && rdev->family != CHIP_RS600
-           && rdev->family != CHIP_RS690
-           && rdev->family != CHIP_RS740
-           && !ASIC_IS_DCE4(rdev)) {
+       if (rdev->irq.installed) {
                /* if irq is available use it */
-               rdev->irq.hdmi[offset == R600_HDMI_BLOCK1 ? 0 : 1] = true;
+               rdev->irq.afmt[offset == R600_HDMI_BLOCK1 ? 0 : 1] = true;
                radeon_irq_set(rdev);
-
-               r600_audio_disable_polling(encoder);
-       } else {
-               /* if not fallback to polling */
-               r600_audio_enable_polling(encoder);
        }
 
        DRM_DEBUG("Enabling HDMI interface @ 0x%04X for encoder 0x%x\n",
@@ -581,7 +539,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
                return;
 
        offset = radeon_encoder->hdmi_offset;
-       if (!offset) {
+       if (!radeon_encoder->hdmi_enabled) {
                dev_err(rdev->dev, "Disabling not enabled HDMI\n");
                return;
        }
@@ -590,18 +548,16 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
                offset, radeon_encoder->encoder_id);
 
        /* disable irq */
-       rdev->irq.hdmi[offset == R600_HDMI_BLOCK1 ? 0 : 1] = false;
+       rdev->irq.afmt[offset == R600_HDMI_BLOCK1 ? 0 : 1] = false;
        radeon_irq_set(rdev);
 
-       /* disable polling */
-       r600_audio_disable_polling(encoder);
 
        if (ASIC_IS_DCE5(rdev)) {
                /* TODO */
        } else if (ASIC_IS_DCE4(rdev)) {
-               WREG32_P(radeon_encoder->hdmi_config_offset + 0xc, 0, ~0x1);
+               WREG32_P(radeon_encoder->hdmi_offset + EVERGREEN_AUDIO_PACKET_CNTL, 0, ~0x1);
        } else if (ASIC_IS_DCE32(rdev)) {
-               WREG32_P(radeon_encoder->hdmi_config_offset + 0x4, 0, ~0x1);
+               WREG32_P(radeon_encoder->hdmi_offset + R600_HDMI_AUDIO_PACKET_CNTL, 0, ~0x1);
        } else if (rdev->family >= CHIP_R600 && !ASIC_IS_DCE3(rdev)) {
                switch (radeon_encoder->encoder_id) {
                case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
@@ -620,6 +576,6 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
                }
        }
 
+       radeon_encoder->hdmi_enabled = false;
        radeon_encoder->hdmi_offset = 0;
-       radeon_encoder->hdmi_config_offset = 0;
 }