1 files changed, 25 insertions, 59 deletions

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index de158b76bcd5..d97e6cb52d34 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -107,7 +107,8 @@ struct intel_sdvo {
          * This is set if we treat the device as HDMI, instead of DVI.
          */
         bool is_hdmi;
-        bool has_audio;
+        bool has_hdmi_monitor;
+        bool has_hdmi_audio;
 
         /**
          * This is set if we detect output of sdvo device as LVDS and
@@ -1023,7 +1024,7 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
         if (!intel_sdvo_set_target_input(intel_sdvo))
                 return;
 
-        if (intel_sdvo->is_hdmi &&
+        if (intel_sdvo->has_hdmi_monitor &&
             !intel_sdvo_set_avi_infoframe(intel_sdvo))
                 return;
 
@@ -1063,7 +1064,7 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
         }
         if (intel_crtc->pipe == 1)
                 sdvox |= SDVO_PIPE_B_SELECT;
-        if (intel_sdvo->has_audio)
+        if (intel_sdvo->has_hdmi_audio)
                 sdvox |= SDVO_AUDIO_ENABLE;
 
         if (INTEL_INFO(dev)->gen >= 4) {
@@ -1295,55 +1296,14 @@ intel_sdvo_get_edid(struct drm_connector *connector)
         return drm_get_edid(connector, &sdvo->ddc);
 }
 
-static struct drm_connector *
-intel_find_analog_connector(struct drm_device *dev)
-{
-        struct drm_connector *connector;
-        struct intel_sdvo *encoder;
-
-        list_for_each_entry(encoder,
-                            &dev->mode_config.encoder_list,
-                            base.base.head) {
-                if (encoder->base.type == INTEL_OUTPUT_ANALOG) {
-                        list_for_each_entry(connector,
-                                            &dev->mode_config.connector_list,
-                                            head) {
-                                if (&encoder->base ==
-                                    intel_attached_encoder(connector))
-                                        return connector;
-                        }
-                }
-        }
-
-        return NULL;
-}
-
-static int
-intel_analog_is_connected(struct drm_device *dev)
-{
-        struct drm_connector *analog_connector;
-
-        analog_connector = intel_find_analog_connector(dev);
-        if (!analog_connector)
-                return false;
-
-        if (analog_connector->funcs->detect(analog_connector, false) ==
-                        connector_status_disconnected)
-                return false;
-
-        return true;
-}
-
 /* Mac mini hack -- use the same DDC as the analog connector */
 static struct edid *
 intel_sdvo_get_analog_edid(struct drm_connector *connector)
 {
         struct drm_i915_private *dev_priv = connector->dev->dev_private;
 
-        if (!intel_analog_is_connected(connector->dev))
-                return NULL;
-
-        return drm_get_edid(connector, &dev_priv->gmbus[dev_priv->crt_ddc_pin].adapter);
+        return drm_get_edid(connector,
+                            &dev_priv->gmbus[dev_priv->crt_ddc_pin].adapter);
 }
 
 enum drm_connector_status
@@ -1388,8 +1348,10 @@ intel_sdvo_hdmi_sink_detect(struct drm_connector *connector)
                 /* DDC bus is shared, match EDID to connector type */
                 if (edid->input & DRM_EDID_INPUT_DIGITAL) {
                         status = connector_status_connected;
-                        intel_sdvo->is_hdmi = drm_detect_hdmi_monitor(edid);
-                        intel_sdvo->has_audio = drm_detect_monitor_audio(edid);
+                        if (intel_sdvo->is_hdmi) {
+                                intel_sdvo->has_hdmi_monitor = drm_detect_hdmi_monitor(edid);
+                                intel_sdvo->has_hdmi_audio = drm_detect_monitor_audio(edid);
+                        }
                 }
                 connector->display_info.raw_edid = NULL;
                 kfree(edid);
@@ -1398,7 +1360,7 @@ intel_sdvo_hdmi_sink_detect(struct drm_connector *connector)
         if (status == connector_status_connected) {
                 struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
                 if (intel_sdvo_connector->force_audio)
-                        intel_sdvo->has_audio = intel_sdvo_connector->force_audio > 0;
+                        intel_sdvo->has_hdmi_audio = intel_sdvo_connector->force_audio > 0;
         }
 
         return status;
@@ -1415,10 +1377,12 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
         if (!intel_sdvo_write_cmd(intel_sdvo,
                                   SDVO_CMD_GET_ATTACHED_DISPLAYS, NULL, 0))
                 return connector_status_unknown;
-        if (intel_sdvo->is_tv) {
-                /* add 30ms delay when the output type is SDVO-TV */
+
+        /* add 30ms delay when the output type might be TV */
+        if (intel_sdvo->caps.output_flags &
+            (SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_CVBS0))
                 mdelay(30);
-        }
+
         if (!intel_sdvo_read_response(intel_sdvo, &response, 2))
                 return connector_status_unknown;
 
@@ -1472,8 +1436,10 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
                 edid = intel_sdvo_get_analog_edid(connector);
 
         if (edid != NULL) {
-                drm_mode_connector_update_edid_property(connector, edid);
-                drm_add_edid_modes(connector, edid);
+                if (edid->input & DRM_EDID_INPUT_DIGITAL) {
+                        drm_mode_connector_update_edid_property(connector, edid);
+                        drm_add_edid_modes(connector, edid);
+                }
                 connector->display_info.raw_edid = NULL;
                 kfree(edid);
         }
@@ -1713,12 +1679,12 @@ intel_sdvo_set_property(struct drm_connector *connector,
 
                 intel_sdvo_connector->force_audio = val;
 
-                if (val > 0 && intel_sdvo->has_audio)
+                if (val > 0 && intel_sdvo->has_hdmi_audio)
                         return 0;
-                if (val < 0 && !intel_sdvo->has_audio)
+                if (val < 0 && !intel_sdvo->has_hdmi_audio)
                         return 0;
 
-                intel_sdvo->has_audio = val > 0;
+                intel_sdvo->has_hdmi_audio = val > 0;
                 goto done;
         }
 
@@ -2070,6 +2036,8 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
                 intel_sdvo_set_colorimetry(intel_sdvo,
                                            SDVO_COLORIMETRY_RGB256);
                 connector->connector_type = DRM_MODE_CONNECTOR_HDMIA;
+
+                intel_sdvo_add_hdmi_properties(intel_sdvo_connector);
                 intel_sdvo->is_hdmi = true;
         }
         intel_sdvo->base.clone_mask = ((1 << INTEL_SDVO_NON_TV_CLONE_BIT) |
@@ -2077,8 +2045,6 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
 
         intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo);
 
-        intel_sdvo_add_hdmi_properties(intel_sdvo_connector);
-
         return true;
 }