releases/3.4.49/drm-radeon-don-t-allow-audio-on-dce6.patch

   1 From 1cbcca302a318499f20a512847c5d6a510c08c35 Mon Sep 17 00:00:00 2001
   2 From: Alex Deucher <alexander.deucher@amd.com>
   3 Date: Mon, 3 Jun 2013 10:32:40 -0400
   4 Subject: drm/radeon: don't allow audio on DCE6
   5
   6 From: Alex Deucher <alexander.deucher@amd.com>
   7
   8 commit 1cbcca302a318499f20a512847c5d6a510c08c35 upstream.
   9
  10 It's not supported yet.  Fixes display issues when
  11 users force it on.
  12
  13 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15
  16 ---
  17  drivers/gpu/drm/radeon/atombios_encoders.c |   11 ++++++++---
  18  1 file changed, 8 insertions(+), 3 deletions(-)
  19
  20 --- a/drivers/gpu/drm/radeon/atombios_encoders.c
  21 +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
  22 @@ -396,6 +396,8 @@ atombios_digital_setup(struct drm_encode
  23  int
  24  atombios_get_encoder_mode(struct drm_encoder *encoder)
  25  {
  26 +       struct drm_device *dev = encoder->dev;
  27 +       struct radeon_device *rdev = dev->dev_private;
  28         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
  29         struct drm_connector *connector;
  30         struct radeon_connector *radeon_connector;
  31 @@ -421,7 +423,8 @@ atombios_get_encoder_mode(struct drm_enc
  32         case DRM_MODE_CONNECTOR_DVII:
  33         case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
  34                 if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
  35 -                   radeon_audio)
  36 +                   radeon_audio &&
  37 +                   !ASIC_IS_DCE6(rdev)) /* remove once we support DCE6 */
  38                         return ATOM_ENCODER_MODE_HDMI;
  39                 else if (radeon_connector->use_digital)
  40                         return ATOM_ENCODER_MODE_DVI;
  41 @@ -432,7 +435,8 @@ atombios_get_encoder_mode(struct drm_enc
  42         case DRM_MODE_CONNECTOR_HDMIA:
  43         default:
  44                 if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
  45 -                   radeon_audio)
  46 +                   radeon_audio &&
  47 +                   !ASIC_IS_DCE6(rdev)) /* remove once we support DCE6 */
  48                         return ATOM_ENCODER_MODE_HDMI;
  49                 else
  50                         return ATOM_ENCODER_MODE_DVI;
  51 @@ -446,7 +450,8 @@ atombios_get_encoder_mode(struct drm_enc
  52                     (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
  53                         return ATOM_ENCODER_MODE_DP;
  54                 else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
  55 -                        radeon_audio)
  56 +                        radeon_audio &&
  57 +                        !ASIC_IS_DCE6(rdev)) /* remove once we support DCE6 */
  58                         return ATOM_ENCODER_MODE_HDMI;
  59                 else
  60                         return ATOM_ENCODER_MODE_DVI;