<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26697">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gma ironlake..broadwell: Enable X-tiling<br><br>Generations pre Skylake support X-tiling only.<br><br>Change-Id: I828e20e2a6bf71c88cf9e23ada0552e2462fe7c1<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M common/hw-gfx-gma-config_helpers.adb<br>M common/hw-gfx-gma-pipe_setup.adb<br>2 files changed, 17 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/97/26697/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/common/hw-gfx-gma-config_helpers.adb b/common/hw-gfx-gma-config_helpers.adb</span><br><span>index 5e5be5d..4cf04c3 100644</span><br><span>--- a/common/hw-gfx-gma-config_helpers.adb</span><br><span>+++ b/common/hw-gfx-gma-config_helpers.adb</span><br><span>@@ -193,7 +193,7 @@</span><br><span> -- Only 32bpp RGB (ignored for VGA plane)</span><br><span> -- Stride must be big enough and a multiple of 64 bytes or the tile size</span><br><span> -- (ignored for VGA plane)</span><br><span style="color: hsl(0, 100%, 40%);">- -- Tiling and rotation is only supported on newer generations (with</span><br><span style="color: hsl(120, 100%, 40%);">+ -- Y-Tiling and rotation are only supported on newer generations (with</span><br><span> -- Plane_Control)</span><br><span> -- 90 degree rotations are only supported with Y-tiling</span><br><span> return</span><br><span>@@ -206,7 +206,7 @@</span><br><span> (FB.Offset = VGA_PLANE_FRAMEBUFFER_OFFSET or</span><br><span> (FB.BPC = 8 and Valid_Stride (FB) and</span><br><span> (Config.Has_Plane_Control or</span><br><span style="color: hsl(0, 100%, 40%);">- (FB.Tiling = Linear and FB.Rotation = No_Rotation)) and</span><br><span style="color: hsl(120, 100%, 40%);">+ (FB.Tiling /= Y_Tiled and FB.Rotation = No_Rotation)) and</span><br><span> (FB.Tiling = Y_Tiled or not Rotation_90 (FB))));</span><br><span> end Validate_Config;</span><br><span> </span><br><span>diff --git a/common/hw-gfx-gma-pipe_setup.adb b/common/hw-gfx-gma-pipe_setup.adb</span><br><span>index 7bccb4d..7a53faa 100644</span><br><span>--- a/common/hw-gfx-gma-pipe_setup.adb</span><br><span>+++ b/common/hw-gfx-gma-pipe_setup.adb</span><br><span>@@ -27,14 +27,22 @@</span><br><span> </span><br><span> DSPCNTR_ENABLE : constant := 1 * 2 ** 31;</span><br><span> DSPCNTR_GAMMA_CORRECTION : constant := 1 * 2 ** 30;</span><br><span style="color: hsl(0, 100%, 40%);">- DSPCNTR_DISABLE_TRICKLE_FEED : constant := 1 * 2 ** 14;</span><br><span> DSPCNTR_FORMAT_MASK : constant := 15 * 2 ** 26;</span><br><span style="color: hsl(120, 100%, 40%);">+ DSPCNTR_DISABLE_TRICKLE_FEED : constant := 1 * 2 ** 14;</span><br><span style="color: hsl(120, 100%, 40%);">+ DSPCNTR_TILED_SURFACE_LINEAR : constant := 0 * 2 ** 10;</span><br><span style="color: hsl(120, 100%, 40%);">+ DSPCNTR_TILED_SURFACE_X_TILED : constant := 1 * 2 ** 10;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ DSPCNTR_TILED_SURFACE : constant array (Tiling_Type) of Word32 :=</span><br><span style="color: hsl(120, 100%, 40%);">+ (Linear => DSPCNTR_TILED_SURFACE_LINEAR,</span><br><span style="color: hsl(120, 100%, 40%);">+ X_Tiled => DSPCNTR_TILED_SURFACE_X_TILED,</span><br><span style="color: hsl(120, 100%, 40%);">+ Y_Tiled => 0); -- unsupported</span><br><span> </span><br><span> DSPCNTR_MASK : constant Word32 :=</span><br><span> DSPCNTR_ENABLE or</span><br><span> DSPCNTR_GAMMA_CORRECTION or</span><br><span> DSPCNTR_FORMAT_MASK or</span><br><span style="color: hsl(0, 100%, 40%);">- DSPCNTR_DISABLE_TRICKLE_FEED;</span><br><span style="color: hsl(120, 100%, 40%);">+ DSPCNTR_DISABLE_TRICKLE_FEED or</span><br><span style="color: hsl(120, 100%, 40%);">+ DSPCNTR_TILED_SURFACE_X_TILED;</span><br><span> </span><br><span> PLANE_CTL_PLANE_ENABLE : constant := 1 * 2 ** 31;</span><br><span> PLANE_CTL_SRC_PIX_FMT_RGB_32B_8888 : constant := 4 * 2 ** 24;</span><br><span>@@ -239,17 +247,20 @@</span><br><span> Registers.Unset_And_Set_Mask</span><br><span> (Register => Controller.DSPCNTR,</span><br><span> Mask_Unset => DSPCNTR_MASK,</span><br><span style="color: hsl(0, 100%, 40%);">- Mask_Set => PRI);</span><br><span style="color: hsl(120, 100%, 40%);">+ Mask_Set => PRI or DSPCNTR_TILED_SURFACE (FB.Tiling));</span><br><span> </span><br><span> Registers.Write</span><br><span> (Controller.DSPSTRIDE, Word32 (Pixel_To_Bytes (FB.Stride, FB)));</span><br><span style="color: hsl(0, 100%, 40%);">- if Config.Has_DSP_Linoff then</span><br><span style="color: hsl(120, 100%, 40%);">+ if Config.Has_DSP_Linoff and then FB.Tiling = Linear then</span><br><span> Registers.Write</span><br><span> (Register => Controller.DSPLINOFF,</span><br><span> Value => Word32 (Pixel_To_Bytes</span><br><span> (FB.Start_Y * FB.Stride + FB.Start_X, FB)));</span><br><span> Registers.Write (Controller.DSPTILEOFF, 0);</span><br><span> else</span><br><span style="color: hsl(120, 100%, 40%);">+ if Config.Has_DSP_Linoff then</span><br><span style="color: hsl(120, 100%, 40%);">+ Registers.Write (Controller.DSPLINOFF, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ end if;</span><br><span> Registers.Write</span><br><span> (Register => Controller.DSPTILEOFF,</span><br><span> Value => Shift_Left (Word32 (FB.Start_Y), 16) or</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26697">change 26697</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/26697"/><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: I828e20e2a6bf71c88cf9e23ada0552e2462fe7c1 </div>
<div style="display:none"> Gerrit-Change-Number: 26697 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>