drm/radeon: only mark audio as connected if the monitor supports it (v3)

Otherwise the driver may try and send audio which may confuse the
monitor.

v2: set pin to NULL if no audio
v3: avoid crash with analog encoders

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

2 files changed, 21 insertions, 14 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
index 2c17df978d61..8b82abb78df1 100644
--- a/drivers/gpu/drm/radeon/radeon_audio.c
+++ b/drivers/gpu/drm/radeon/radeon_audio.c
@@ -460,30 +460,33 @@ void radeon_audio_detect(struct drm_connector *connector,
         if (!connector || !connector->encoder)
                 return;
 
+        if (!radeon_encoder_is_digital(connector->encoder))
+                return;
+
         rdev = connector->encoder->dev->dev_private;
         radeon_encoder = to_radeon_encoder(connector->encoder);
         dig = radeon_encoder->enc_priv;
 
-        if (status == connector_status_connected) {
-                struct radeon_connector *radeon_connector;
-                int sink_type;
-
-                if (!drm_detect_monitor_audio(radeon_connector_edid(connector))) {
-                        radeon_encoder->audio = NULL;
-                        return;
-                }
+        if (!dig->afmt)
+                return;
 
-                radeon_connector = to_radeon_connector(connector);
-                sink_type = radeon_dp_getsinktype(radeon_connector);
+        if (status == connector_status_connected) {
+                struct radeon_connector *radeon_connector = to_radeon_connector(connector);
 
                 if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
-                        sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT)
+                    radeon_dp_getsinktype(radeon_connector) ==
+                    CONNECTOR_OBJECT_ID_DISPLAYPORT)
                         radeon_encoder->audio = rdev->audio.dp_funcs;
                 else
                         radeon_encoder->audio = rdev->audio.hdmi_funcs;
 
                 dig->afmt->pin = radeon_audio_get_pin(connector->encoder);
-                radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
+                if (drm_detect_monitor_audio(radeon_connector_edid(connector))) {
+                        radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
+                } else {
+                        radeon_audio_enable(rdev, dig->afmt->pin, 0);
+                        dig->afmt->pin = NULL;
+                }
         } else {
                 radeon_audio_enable(rdev, dig->afmt->pin, 0);
                 dig->afmt->pin = NULL;
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index cebb65e07e1d..d17d251dbd4f 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1379,8 +1379,10 @@ out:
         /* updated in get modes as well since we need to know if it's analog or digital */
         radeon_connector_update_scratch_regs(connector, ret);
 
-        if (radeon_audio != 0)
+        if (radeon_audio != 0) {
+                radeon_connector_get_edid(connector);
                 radeon_audio_detect(connector, ret);
+        }
 
 exit:
         pm_runtime_mark_last_busy(connector->dev->dev);
@@ -1717,8 +1719,10 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
 
         radeon_connector_update_scratch_regs(connector, ret);
 
-        if (radeon_audio != 0)
+        if (radeon_audio != 0) {
+                radeon_connector_get_edid(connector);
                 radeon_audio_detect(connector, ret);
+        }
 
 out:
         pm_runtime_mark_last_busy(connector->dev->dev);