<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25406">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add a flag to use GMCH transcoder registers<br><br>Change-Id: Ic9bff918bdcab3c5c55316cb6de1a8a8bf1c6430<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M common/hw-gfx-gma-config.ads.template<br>M common/hw-gfx-gma-registers.ads<br>M common/hw-gfx-gma-transcoder.adb<br>M common/hw-gfx-gma-transcoder.ads<br>4 files changed, 57 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/06/25406/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template</span><br><span>index 076f681..8a39359 100644</span><br><span>--- a/common/hw-gfx-gma-config.ads.template</span><br><span>+++ b/common/hw-gfx-gma-config.ads.template</span><br><span>@@ -57,6 +57,7 @@</span><br><span> Has_PF_Pipe_Select : constant Boolean := CPU in Ivybridge .. Haswell;</span><br><span> VGA_Plane_Workaround : constant Boolean := CPU = Ivybridge;</span><br><span> Has_GMCH_VGACNTRL : constant Boolean := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ Has_GMCH_DP_Transcoder : constant Boolean := false;</span><br><span> </span><br><span> ----- Panel power: -----</span><br><span> Has_PP_Write_Protection : constant Boolean := CPU <= Ivybridge;</span><br><span>diff --git a/common/hw-gfx-gma-registers.ads b/common/hw-gfx-gma-registers.ads</span><br><span>index 37e62e8..40d3437 100644</span><br><span>--- a/common/hw-gfx-gma-registers.ads</span><br><span>+++ b/common/hw-gfx-gma-registers.ads</span><br><span>@@ -436,6 +436,10 @@</span><br><span> PIPEACONF,</span><br><span> PIPEAMISC,</span><br><span> PIPE_FRMCNT_A,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEA_GMCH_DATA_M,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEA_GMCH_DATA_N,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEA_GMCH_LINK_M,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEA_GMCH_LINK_N,</span><br><span> DSPACNTR,</span><br><span> DSPALINOFF,</span><br><span> DSPASTRIDE,</span><br><span>@@ -457,6 +461,10 @@</span><br><span> PIPEBCONF,</span><br><span> PIPEBMISC,</span><br><span> PIPE_FRMCNT_B,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEB_GMCH_DATA_M,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEB_GMCH_DATA_N,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEB_GMCH_LINK_M,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEB_GMCH_LINK_N,</span><br><span> DSPBCNTR,</span><br><span> DSPBLINOFF,</span><br><span> DSPBSTRIDE,</span><br><span>@@ -707,6 +715,10 @@</span><br><span> PIPEA_DATA_N1 => 16#06_0034# / Register_Width,</span><br><span> PIPEA_LINK_M1 => 16#06_0040# / Register_Width,</span><br><span> PIPEA_LINK_N1 => 16#06_0044# / Register_Width,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEA_GMCH_DATA_M => 16#07_0050# / Register_Width,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEA_GMCH_DATA_N => 16#07_0054# / Register_Width,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEA_GMCH_LINK_M => 16#07_0060# / Register_Width,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEA_GMCH_LINK_N => 16#07_0064# / Register_Width,</span><br><span> PIPEA_DDI_FUNC_CTL => 16#06_0400# / Register_Width,</span><br><span> PIPEA_MSA_MISC => 16#06_0410# / Register_Width,</span><br><span> </span><br><span>@@ -798,6 +810,10 @@</span><br><span> PIPEB_DATA_N1 => 16#06_1034# / Register_Width,</span><br><span> PIPEB_LINK_M1 => 16#06_1040# / Register_Width,</span><br><span> PIPEB_LINK_N1 => 16#06_1044# / Register_Width,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEB_GMCH_DATA_M => 16#07_1050# / Register_Width,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEB_GMCH_DATA_N => 16#07_1054# / Register_Width,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEB_GMCH_LINK_M => 16#07_1060# / Register_Width,</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPEB_GMCH_LINK_N => 16#07_1064# / Register_Width,</span><br><span> PIPEB_DDI_FUNC_CTL => 16#06_1400# / Register_Width,</span><br><span> PIPEB_MSA_MISC => 16#06_1410# / Register_Width,</span><br><span> </span><br><span>diff --git a/common/hw-gfx-gma-transcoder.adb b/common/hw-gfx-gma-transcoder.adb</span><br><span>index 91ef6b6..5990fcf 100644</span><br><span>--- a/common/hw-gfx-gma-transcoder.adb</span><br><span>+++ b/common/hw-gfx-gma-transcoder.adb</span><br><span>@@ -15,7 +15,6 @@</span><br><span> with HW.Debug;</span><br><span> with GNAT.Source_Info;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-with HW.GFX.GMA.Config;</span><br><span> with HW.GFX.GMA.DP_Info;</span><br><span> </span><br><span> package body HW.GFX.GMA.Transcoder is</span><br><span>diff --git a/common/hw-gfx-gma-transcoder.ads b/common/hw-gfx-gma-transcoder.ads</span><br><span>index aa67eb4..281aeae 100644</span><br><span>--- a/common/hw-gfx-gma-transcoder.ads</span><br><span>+++ b/common/hw-gfx-gma-transcoder.ads</span><br><span>@@ -13,6 +13,7 @@</span><br><span> --</span><br><span> </span><br><span> with HW.GFX.GMA.Registers;</span><br><span style="color: hsl(120, 100%, 40%);">+with HW.GFX.GMA.Config;</span><br><span> </span><br><span> private package HW.GFX.GMA.Transcoder</span><br><span> is</span><br><span>@@ -49,6 +50,37 @@</span><br><span> </span><br><span> type Transcoder_Array is array (Transcoder_Index) of Transcoder_Regs;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ PIPE_DATA_M1 : constant array (0 .. 1) of Registers.Registers_Index :=</span><br><span style="color: hsl(120, 100%, 40%);">+ (if Config.Has_GMCH_DP_Transcoder then</span><br><span style="color: hsl(120, 100%, 40%);">+ (0 => Registers.PIPEA_GMCH_DATA_M,</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 => Registers.PIPEB_GMCH_DATA_M)</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ (0 => Registers.PIPEA_DATA_M1,</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 => Registers.PIPEB_DATA_M1));</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPE_DATA_N1 : constant array (0 .. 1) of Registers.Registers_Index :=</span><br><span style="color: hsl(120, 100%, 40%);">+ (if Config.Has_GMCH_DP_Transcoder then</span><br><span style="color: hsl(120, 100%, 40%);">+ (0 => Registers.PIPEA_GMCH_DATA_N,</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 => Registers.PIPEB_GMCH_DATA_N)</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ (0 => Registers.PIPEA_DATA_N1,</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 => Registers.PIPEB_DATA_N1));</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPE_LINK_M1 : constant array (0 .. 1) of Registers.Registers_Index :=</span><br><span style="color: hsl(120, 100%, 40%);">+ (if Config.Has_GMCH_DP_Transcoder then</span><br><span style="color: hsl(120, 100%, 40%);">+ (0 => Registers.PIPEA_GMCH_LINK_M,</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 => Registers.PIPEB_GMCH_LINK_M)</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ (0 => Registers.PIPEA_LINK_M1,</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 => Registers.PIPEB_LINK_M1));</span><br><span style="color: hsl(120, 100%, 40%);">+ PIPE_LINK_N1 : constant array (0 .. 1) of Registers.Registers_Index :=</span><br><span style="color: hsl(120, 100%, 40%);">+ (if Config.Has_GMCH_DP_Transcoder then</span><br><span style="color: hsl(120, 100%, 40%);">+ (0 => Registers.PIPEA_GMCH_LINK_N,</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 => Registers.PIPEB_GMCH_LINK_N)</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ (0 => Registers.PIPEA_LINK_N1,</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 => Registers.PIPEB_LINK_N1));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> Transcoders : constant Transcoder_Array :=</span><br><span> (Trans_EDP =></span><br><span> (HTOTAL => Registers.HTOTAL_EDP,</span><br><span>@@ -73,10 +105,10 @@</span><br><span> VBLANK => Registers.VBLANK_A,</span><br><span> VSYNC => Registers.VSYNC_A,</span><br><span> CONF => Registers.PIPEACONF,</span><br><span style="color: hsl(0, 100%, 40%);">- DATA_M1 => Registers.PIPEA_DATA_M1,</span><br><span style="color: hsl(0, 100%, 40%);">- DATA_N1 => Registers.PIPEA_DATA_N1,</span><br><span style="color: hsl(0, 100%, 40%);">- LINK_M1 => Registers.PIPEA_LINK_M1,</span><br><span style="color: hsl(0, 100%, 40%);">- LINK_N1 => Registers.PIPEA_LINK_N1,</span><br><span style="color: hsl(120, 100%, 40%);">+ DATA_M1 => PIPE_DATA_M1(0),</span><br><span style="color: hsl(120, 100%, 40%);">+ DATA_N1 => PIPE_DATA_N1(0),</span><br><span style="color: hsl(120, 100%, 40%);">+ LINK_M1 => PIPE_LINK_M1(0),</span><br><span style="color: hsl(120, 100%, 40%);">+ LINK_N1 => PIPE_LINK_N1(0),</span><br><span> DDI_FUNC_CTL => Registers.PIPEA_DDI_FUNC_CTL,</span><br><span> MSA_MISC => Registers.PIPEA_MSA_MISC,</span><br><span> CLK_SEL => Registers.TRANSA_CLK_SEL),</span><br><span>@@ -88,10 +120,10 @@</span><br><span> VBLANK => Registers.VBLANK_B,</span><br><span> VSYNC => Registers.VSYNC_B,</span><br><span> CONF => Registers.PIPEBCONF,</span><br><span style="color: hsl(0, 100%, 40%);">- DATA_M1 => Registers.PIPEB_DATA_M1,</span><br><span style="color: hsl(0, 100%, 40%);">- DATA_N1 => Registers.PIPEB_DATA_N1,</span><br><span style="color: hsl(0, 100%, 40%);">- LINK_M1 => Registers.PIPEB_LINK_M1,</span><br><span style="color: hsl(0, 100%, 40%);">- LINK_N1 => Registers.PIPEB_LINK_N1,</span><br><span style="color: hsl(120, 100%, 40%);">+ DATA_M1 => PIPE_DATA_M1(1),</span><br><span style="color: hsl(120, 100%, 40%);">+ DATA_N1 => PIPE_DATA_N1(1),</span><br><span style="color: hsl(120, 100%, 40%);">+ LINK_M1 => PIPE_LINK_M1(1),</span><br><span style="color: hsl(120, 100%, 40%);">+ LINK_N1 => PIPE_LINK_N1(1),</span><br><span> DDI_FUNC_CTL => Registers.PIPEB_DDI_FUNC_CTL,</span><br><span> MSA_MISC => Registers.PIPEB_MSA_MISC,</span><br><span> CLK_SEL => Registers.TRANSB_CLK_SEL),</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25406">change 25406</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/25406"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libgfxinit </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ic9bff918bdcab3c5c55316cb6de1a8a8bf1c6430 </div>
<div style="display:none"> Gerrit-Change-Number: 25406 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>