diff --git a/common/haswell_shared/hw-gfx-gma-connectors.adb b/common/haswell_shared/hw-gfx-gma-connectors.adb
index 15b3c12..734b11a 100644
--- a/common/haswell_shared/hw-gfx-gma-connectors.adb
+++ b/common/haswell_shared/hw-gfx-gma-connectors.adb
@@ -83,7 +83,7 @@
    procedure Post_All_Off
    is
    begin
-      for Port in Digital_Port range DIGI_A .. DIGI_D loop
+      for Port in Digital_Port range DIGI_A .. Config.Last_Digital_Port loop
          DDI.Off (Port);
       end loop;
       if Config.Is_FDI_Port (Analog) then
diff --git a/common/haswell_shared/hw-gfx-gma-port_detect.adb b/common/haswell_shared/hw-gfx-gma-port_detect.adb
index bf9fba5..b8ba37d 100644
--- a/common/haswell_shared/hw-gfx-gma-port_detect.adb
+++ b/common/haswell_shared/hw-gfx-gma-port_detect.adb
@@ -59,9 +59,6 @@
       Internal_Detected,
       DDI_Detected : Boolean;
 
-      Last_Digital_Port : constant Digital_Port :=
-        (if Config.Has_DDI_D then DIGI_D else DIGI_C);
-
       subtype Ext_Digital_Port is
          Digital_Port range DIGI_B .. DIGI_D;
       type Digital_Port_To_GMA_Port is array (Ext_Digital_Port) of Port_Type;
@@ -116,7 +113,7 @@
       Config.Valid_Port (Internal) := Internal_Detected;
 
       -- DDI_[BCD]
-      for Port in Ext_Digital_Port range DIGI_B .. Last_Digital_Port loop
+      for Port in Ext_Digital_Port range DIGI_B .. Config.Last_Digital_Port loop
          Registers.Is_Set_Mask
            (Register => Registers.SFUSE_STRAP,
             Mask     => DDI_PORT_DETECTED (Port),