[coreboot-gerrit] Change in libgfxinit[master]: Add flag to allow use of VGACNTRL on GMCH

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/25404

Change subject: Add flag to allow use of VGACNTRL on GMCH
......................................................................

Add flag to allow use of VGACNTRL on GMCH

Change-Id: If2f12f14b4f367cdfc8cc2c20402f2350e3bbba8
Signed-off-by: Arthur Heymans 
---
M common/hw-gfx-gma-config.ads.template
M common/hw-gfx-gma-pipe_setup.adb
M common/hw-gfx-gma-registers.ads
3 files changed, 12 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/04/25404/1

diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template
index aa1c3cd..e6326de 100644
--- a/common/hw-gfx-gma-config.ads.template
+++ b/common/hw-gfx-gma-config.ads.template
@@ -56,6 +56,7 @@
    Has_DSP_Linoff          : constant Boolean := CPU <= Ivybridge;
    Has_PF_Pipe_Select      : constant Boolean := CPU in Ivybridge .. Haswell;
    VGA_Plane_Workaround    : constant Boolean := CPU = Ivybridge;
+   Has_GMCH_VGACNTRL       : constant Boolean := false;

----- Panel power: -----
    Has_PP_Write_Protection : constant Boolean := CPU <= Ivybridge;
diff --git a/common/hw-gfx-gma-pipe_setup.adb b/common/hw-gfx-gma-pipe_setup.adb
index e1ff835..8b02798 100644
--- a/common/hw-gfx-gma-pipe_setup.adb
+++ b/common/hw-gfx-gma-pipe_setup.adb
@@ -89,6 +89,11 @@
    PS_CTRL_SCALER_MODE_7X5_EXTENDED    : constant := 1 * 2 ** 28;
    PS_CTRL_FILTER_SELECT_MEDIUM_2      : constant := 1 * 2 ** 23;

+   VGACNTRL_REG : constant Registers.Registers_Index :=
+     (if Config.Has_GMCH_VGACNTRL then
+	Registers.GMCH_VGACNTRL
+      else Registers.CPU_VGACNTRL);
+
    ---------------------------------------------------------------------------

function PLANE_WM_LINES (Lines : Natural) return Word32 is
@@ -260,7 +265,7 @@
          end if;

Registers.Unset_And_Set_Mask
-           (Register    => Registers.VGACNTRL,
+           (Register    => VGACNTRL_REG,
             Mask_Unset  => VGA_CONTROL_VGA_DISPLAY_DISABLE or
                            VGA_CONTROL_BLINK_DUTY_CYCLE_MASK or
                            VGA_CONTROL_VSYNC_BLINK_RATE_MASK,
@@ -512,7 +517,7 @@
       Port_IO.InB  (Reg8, VGA_SR_DATA);
       Port_IO.OutB (VGA_SR_DATA, Reg8 or VGA_SR01_SCREEN_OFF);
       Time.U_Delay (100); -- PRM says 100us, Linux does 300
-      Registers.Set_Mask (Registers.VGACNTRL, VGA_CONTROL_VGA_DISPLAY_DISABLE);
+      Registers.Set_Mask (VGACNTRL_REG, VGA_CONTROL_VGA_DISPLAY_DISABLE);
    end Legacy_VGA_Off;

procedure All_Off
diff --git a/common/hw-gfx-gma-registers.ads b/common/hw-gfx-gma-registers.ads
index 87c8069..1515fab 100644
--- a/common/hw-gfx-gma-registers.ads
+++ b/common/hw-gfx-gma-registers.ads
@@ -64,7 +64,7 @@
       BCS_PP_DCLV_HIGH,
       BCS_PP_DCLV_LOW,
       GAB_CTL_REG,
-      VGACNTRL,
+      CPU_VGACNTRL,
       FUSE_STATUS,
       ILK_DISPLAY_CHICKEN2,
       DSPCLK_GATE_D,
@@ -468,6 +468,7 @@
       PLANE_WM_1_B_7,
       PLANE_BUF_CFG_1_B,
       SPBCNTR,
+      GMCH_VGACNTRL,
       PIPE_SCANLINE_C,
       PIPECCONF,
       PIPECMISC,
@@ -1284,7 +1285,8 @@
       PCH_HDMID             => 16#0e_1160# / Register_Width,

-- Intel Registers
-      VGACNTRL              => 16#04_1000# / Register_Width,
+      CPU_VGACNTRL          => 16#04_1000# / Register_Width,
+      GMCH_VGACNTRL         => 16#07_1400# / Register_Width,
       FUSE_STATUS           => 16#04_2000# / Register_Width,
       FBA_CFB_BASE          => 16#04_3200# / Register_Width,
       IPS_CTL               => 16#04_3408# / Register_Width,