diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template
index b4e52f6..e82b133 100644
--- a/common/hw-gfx-gma-config.ads.template
+++ b/common/hw-gfx-gma-config.ads.template
@@ -39,6 +39,7 @@
 
    Has_Internal_Display    : constant Boolean := Internal_Display /= None;
    Internal_Is_EDP         : constant Boolean := Internal_Display = DP;
+   Have_DVI_I              : constant Boolean := Analog_I2C_Port /= PCH_DAC;
    Has_Presence_Straps     : constant Boolean := CPU /= Broxton;
 
    ----- CPU pipe: --------
diff --git a/common/hw-gfx-gma-display_probing.adb b/common/hw-gfx-gma-display_probing.adb
index 97792cf..96cf536 100644
--- a/common/hw-gfx-gma-display_probing.adb
+++ b/common/hw-gfx-gma-display_probing.adb
@@ -61,6 +61,16 @@
       return Sibling_Port (Port) /= Disabled;
    end Has_Sibling_Port;
 
+   function Is_DVI_I (Port : Active_Port_Type) return Boolean
+   with
+      Global => null
+   is
+   begin
+      return Config.Have_DVI_I and
+             (Port = Analog or
+              Config_Helpers.To_PCH_Port (Port) = Config.Analog_I2C_Port);
+   end Is_DVI_I;
+
    procedure Read_EDID
      (Raw_EDID :    out EDID.Raw_EDID_Data;
       Port     : in     Active_Port_Type;
@@ -134,8 +144,8 @@
       end if;
 
       if Success and then
-         (EDID.Compatible_Display
-            (Raw_EDID, Config_Helpers.To_Display_Type (Port)) and
+         ((not Is_DVI_I (Port) or EDID.Compatible_Display
+            (Raw_EDID, Config_Helpers.To_Display_Type (Port))) and
           EDID.Has_Preferred_Mode (Raw_EDID))
       then
          Pipe_Cfg.Port := Port;