[Intel-gfx] [PATCH v2 12/13] drm/nouveau: 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/nouveau/dispnv50/disp.c | 4 ++--
 drivers/gpu/drm/nouveau/dispnv50/head.c | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c 
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index d7b9f7f8c9e3..b3c7199aa63d 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -844,7 +844,7 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct 
nouveau_crtc *nv_crtc,
        int ret;
        int size;
 
-       if (!drm_detect_hdmi_monitor(nv_connector->edid))
+       if (!nv_connector->base.display_info.is_hdmi)
                return;
 
        hdmi = &nv_connector->base.display_info.hdmi;
@@ -1745,7 +1745,7 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, 
struct drm_atomic_state *sta
                         */
                        if (mode->clock >= 165000 &&
                            nv_encoder->dcb->duallink_possible &&
-                           !drm_detect_hdmi_monitor(nv_connector->edid))
+                           !nv_connector->base.display_info.is_hdmi)
                                proto = 
NV507D_SOR_SET_CONTROL_PROTOCOL_DUAL_TMDS;
                } else {
                        proto = NV507D_SOR_SET_CONTROL_PROTOCOL_SINGLE_TMDS_B;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c 
b/drivers/gpu/drm/nouveau/dispnv50/head.c
index d66f97280282..29d6c010ac13 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/head.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head.c
@@ -127,14 +127,8 @@ nv50_head_atomic_check_view(struct nv50_head_atom *armh,
        struct drm_display_mode *omode = &asyh->state.adjusted_mode;
        struct drm_display_mode *umode = &asyh->state.mode;
        int mode = asyc->scaler.mode;
-       struct edid *edid;
        int umode_vdisplay, omode_hdisplay, omode_vdisplay;
 
-       if (connector->edid_blob_ptr)
-               edid = (struct edid *)connector->edid_blob_ptr->data;
-       else
-               edid = NULL;
-
        if (!asyc->scaler.full) {
                if (mode == DRM_MODE_SCALE_NONE)
                        omode = umode;
@@ -162,7 +156,7 @@ nv50_head_atomic_check_view(struct nv50_head_atom *armh,
         */
        if ((asyc->scaler.underscan.mode == UNDERSCAN_ON ||
            (asyc->scaler.underscan.mode == UNDERSCAN_AUTO &&
-            drm_detect_hdmi_monitor(edid)))) {
+            connector->display_info.is_hdmi))) {
                u32 bX = asyc->scaler.underscan.hborder;
                u32 bY = asyc->scaler.underscan.vborder;
                u32 r = (asyh->view.oH << 19) / asyh->view.oW;
-- 
2.33.0