2 files changed, 18 insertions, 8 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index ad53c4808bdb..5ca0a9f1f43a 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -60,6 +60,7 @@ struct hdmi_context {
         bool                            hpd;
         bool                            powered;
         bool                            is_v13;
+        bool                            dvi_mode;
         struct mutex                    hdmi_mutex;
 
         struct resource                 *regs_res;
@@ -1211,10 +1212,12 @@ static int hdmi_get_edid(void *ctx, struct drm_connector *connector,
 
         raw_edid = drm_get_edid(connector, hdata->ddc_port->adapter);
         if (raw_edid) {
+                hdata->dvi_mode = !drm_detect_hdmi_monitor(raw_edid);
                 memcpy(edid, raw_edid, min((1 + raw_edid->extensions)
                                         * EDID_LENGTH, len));
-                DRM_DEBUG_KMS("width[%d] x height[%d]\n",
-                                raw_edid->width_cm, raw_edid->height_cm);
+                DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n",
+                        (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
+                        raw_edid->width_cm, raw_edid->height_cm);
         } else {
                 return -ENODEV;
         }
@@ -1437,10 +1440,7 @@ static void hdmi_audio_init(struct hdmi_context *hdata)
 
 static void hdmi_audio_control(struct hdmi_context *hdata, bool onoff)
 {
-        u32 mod;
-
-        mod = hdmi_reg_read(hdata, HDMI_MODE_SEL);
-        if (mod & HDMI_DVI_MODE_EN)
+        if (hdata->dvi_mode)
                 return;
 
         hdmi_reg_writeb(hdata, HDMI_AUI_CON, onoff ? 2 : 0);
@@ -1479,6 +1479,14 @@ static void hdmi_conf_init(struct hdmi_context *hdata)
         /* disable bluescreen */
         hdmi_reg_writemask(hdata, HDMI_CON_0, 0, HDMI_BLUE_SCR_EN);
 
+        if (hdata->dvi_mode) {
+                /* choose DVI mode */
+                hdmi_reg_writemask(hdata, HDMI_MODE_SEL,
+                                HDMI_MODE_DVI_EN, HDMI_MODE_MASK);
+                hdmi_reg_writeb(hdata, HDMI_CON_2,
+                                HDMI_VID_PREAMBLE_DIS | HDMI_GUARD_BAND_DIS);
+        }
+
         if (hdata->is_v13) {
                 /* choose bluescreen (fecal) color */
                 hdmi_reg_writeb(hdata, HDMI_V13_BLUE_SCREEN_0, 0x12);
diff --git a/drivers/gpu/drm/exynos/regs-hdmi.h b/drivers/gpu/drm/exynos/regs-hdmi.h
index 3c04bea842ce..9cc7c5e9718c 100644
--- a/drivers/gpu/drm/exynos/regs-hdmi.h
+++ b/drivers/gpu/drm/exynos/regs-hdmi.h
@@ -138,14 +138,16 @@
 #define HDMI_ASP_MASK                   (1 << 2)
 #define HDMI_EN                         (1 << 0)
 
+/* HDMI_CON_2 */
+#define HDMI_VID_PREAMBLE_DIS           (1 << 5)
+#define HDMI_GUARD_BAND_DIS             (1 << 1)
+
 /* HDMI_PHY_STATUS */
 #define HDMI_PHY_STATUS_READY           (1 << 0)
 
 /* HDMI_MODE_SEL */
 #define HDMI_MODE_HDMI_EN               (1 << 1)
 #define HDMI_MODE_DVI_EN                (1 << 0)
-#define HDMI_DVI_MODE_EN                (1)
-#define HDMI_DVI_MODE_DIS               (0)
 #define HDMI_MODE_MASK                  (3 << 0)
 
 /* HDMI_TG_CMD */