[PATCH v2 05/13] drm/gma500: replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi

[Claudio Suarez]

Once EDID is parsed, the monitor HDMI support information is available
through drm_display_info.is_hdmi. Retriving the same information with
drm_detect_hdmi_monitor() is less efficient. Change to
drm_display_info.is_hdmi

Signed-off-by: Claudio Suarez <c...@net-c.es>
---
 drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 3 ++-
 drivers/gpu/drm/gma500/psb_intel_sdvo.c | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c 
b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index e525689f84f0..d9db5d52d52e 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
@@ -130,6 +130,7 @@ static enum drm_connector_status cdv_hdmi_detect(
        struct edid *edid = NULL;
        enum drm_connector_status status = connector_status_disconnected;
 
+       /* This updates connector->display_info */
        edid = drm_get_edid(connector, &gma_encoder->i2c_bus->adapter);
 
        hdmi_priv->has_hdmi_sink = false;
@@ -138,7 +139,7 @@ static enum drm_connector_status cdv_hdmi_detect(
                if (edid->input & DRM_EDID_INPUT_DIGITAL) {
                        status = connector_status_connected;
                        hdmi_priv->has_hdmi_sink =
-                                               drm_detect_hdmi_monitor(edid);
+                                               connector->display_info.is_hdmi;
                        hdmi_priv->has_hdmi_audio =
                                                drm_detect_monitor_audio(edid);
                }
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c 
b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 355da2856389..5ef49d17de98 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -1266,8 +1266,10 @@ psb_intel_sdvo_hdmi_sink_detect(struct drm_connector 
*connector)
                if (edid->input & DRM_EDID_INPUT_DIGITAL) {
                        status = connector_status_connected;
                        if (psb_intel_sdvo->is_hdmi) {
-                               psb_intel_sdvo->has_hdmi_monitor = 
drm_detect_hdmi_monitor(edid);
-                               psb_intel_sdvo->has_hdmi_audio = 
drm_detect_monitor_audio(edid);
+                               psb_intel_sdvo->has_hdmi_monitor =
+                                               connector->display_info.is_hdmi;
+                               psb_intel_sdvo->has_hdmi_audio =
+                                               drm_detect_monitor_audio(edid);
                        }
                } else
                        status = connector_status_disconnected;
-- 
2.33.0