scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-17 18:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

gfx_test: Add rotation parameter

Browse Source 
Pass the requested rotation through to libgfxinit and enable Y tiling
in case of 90° rotations.

Change-Id: Icc4c4ee1ce43ecf1603cb673f1a10609494f757d
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/22713
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Nico Huber
2017-08-28 13:31:38 +02:00
parent 244ea7e88f
commit 88f3c98b1a
2 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gfxtest/gfx_test.sh
View File

@@ -2,7 +2,7 @@
set -e
usage="Usage: $0 [seconds]\n"
usage="Usage: $0 [<delay seconds> [(0|90|128|270)]]\n"
err_msgs=
command -v chvt >/dev/null || err_msgs="${err_msgs}"'Need `chvt`\n'
@@ -13,7 +13,7 @@ command -v fgconsole >/dev/null || err_msgs="${err_msgs}"'Need `fgconsole`\n'
[ -x build/gfx_test ] || \
err_msgs="${err_msgs}"'Please run from *libgfxinit* source dir and build `gfx_test` first.\n'
[ "$#" -gt 1 ] && err_msgs="${err_msgs}${usage}"
[ "$#" -gt 2 ] && err_msgs="${err_msgs}${usage}"
if [ -n "$err_msgs" ]; then
printf "$err_msgs"

55
gfxtest/hw-gfx-gma-gfx_test.adb
View File

@@ -183,25 +183,38 @@ is
procedure Calc_Framebuffer
(FB : out Framebuffer_Type;
Mode : in Mode_Type;
Rotation : in Rotation_Type;
Offset : in out Word32)
is
begin
Offset := (Offset + FB_Align - 1) and not (FB_Align - 1);
FB :=
(Width => Width_Type (Mode.H_Visible),
Height => Height_Type (Mode.V_Visible),
BPC => 8,
Stride => Width_Type ((Word32 (Mode.H_Visible) + 15) and not 15),
V_Stride => Height_Type (Mode.V_Visible),
Tiling => Linear,
Rotation => No_Rotation,
Offset => Offset);
if Rotation = Rotated_90 or Rotation = Rotated_270 then
FB :=
(Width => Width_Type (Mode.V_Visible),
Height => Height_Type (Mode.H_Visible),
BPC => 8,
Stride => Div_Round_Up (Pos32 (Mode.V_Visible), 32) * 32,
V_Stride => Div_Round_Up (Pos32 (Mode.H_Visible), 32) * 32,
Tiling => Y_Tiled,
Rotation => Rotation,
Offset => Offset);
else
FB :=
(Width => Width_Type (Mode.H_Visible),
Height => Width_Type (Mode.V_Visible),
BPC => 8,
Stride => Div_Round_Up (Pos32 (Mode.H_Visible), 16) * 16,
V_Stride => Height_Type (Mode.V_Visible),
Tiling => Linear,
Rotation => Rotation,
Offset => Offset);
end if;
Offset := Offset + Word32 (FB_Size (FB));
end Calc_Framebuffer;
Pipes : GMA.Pipe_Configs;
procedure Prepare_Configs
procedure Prepare_Configs (Rotation : Rotation_Type)
is
use type HW.GFX.GMA.Port_Type;
@@ -215,6 +228,7 @@ is
Calc_Framebuffer
(FB => Pipes (Pipe).Framebuffer,
Mode => Pipes (Pipe).Mode,
Rotation => Rotation,
Offset => Offset);
GMA.Setup_Default_FB
(FB => Pipes (Pipe).Framebuffer,
@@ -233,7 +247,9 @@ is
is
begin
Debug.Put_Line
("Usage: " & Ada.Command_Line.Command_Name & " <delay seconds>");
("Usage: " & Ada.Command_Line.Command_Name &
" <delay seconds>" &
" [(0|90|180|270)]");
Debug.New_Line;
end Print_Usage;
@@ -246,6 +262,7 @@ is
Res_Addr : Word64;
Delay_S : Natural;
Rotation : Rotation_Type := No_Rotation;
Dev_Init,
Initialized : Boolean;
@@ -253,13 +270,25 @@ is
function iopl (level : Interfaces.C.int) return Interfaces.C.int;
pragma Import (C, iopl, "iopl");
begin
if Ada.Command_Line.Argument_Count /= 1 then
if Ada.Command_Line.Argument_Count < 1 then
Print_Usage;
return;
end if;
Delay_S := Natural'Value (Ada.Command_Line.Argument (1));
if Ada.Command_Line.Argument_Count >= 2 then
declare
Rotation_Degree : constant String := Ada.Command_Line.Argument (2);
begin
if Rotation_Degree = "0" then Rotation := No_Rotation;
elsif Rotation_Degree = "90" then Rotation := Rotated_90;
elsif Rotation_Degree = "180" then Rotation := Rotated_180;
elsif Rotation_Degree = "270" then Rotation := Rotated_270;
else Print_Usage; return; end if;
end;
end if;
if iopl (3) /= 0 then
Debug.Put_Line ("Failed to change i/o privilege level.");
return;
@@ -292,7 +321,7 @@ is
if Initialized then
Backup_GTT;
Prepare_Configs;
Prepare_Configs (Rotation);
GMA.Update_Outputs (Pipes);