[coreboot-gerrit] Change in ...libgfxinit[master]: gfx_test: Use GMA.Read_GTT() instead of own GTT mapping

[Nico Huber (Code Review)]

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/libgfxinit/+/27058 )

Change subject: gfx_test: Use GMA.Read_GTT() instead of own GTT mapping
......................................................................

gfx_test: Use GMA.Read_GTT() instead of own GTT mapping

Change-Id: Iabf26cebc91ccf62711a9a83a68b6ffd2182e3fe
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/27058
Reviewed-by: Arthur Heymans 
---
M gfxtest/hw-gfx-gma-gfx_test.adb
1 file changed, 7 insertions(+), 18 deletions(-)

Approvals:
  Nico Huber: Verified
  Arthur Heymans: Looks good to me, approved

diff --git a/gfxtest/hw-gfx-gma-gfx_test.adb b/gfxtest/hw-gfx-gma-gfx_test.adb
index 6839dc3..736b93d 100644
--- a/gfxtest/hw-gfx-gma-gfx_test.adb
+++ b/gfxtest/hw-gfx-gma-gfx_test.adb
@@ -28,21 +28,17 @@

package Dev is new PCI.Dev (PCI.Address'(0, 2, 0));

-   type GTT_PTE_Type is mod 2 ** (Config.GTT_PTE_Size * 8);
-   type GTT_Registers_Type is array (GTT_Range) of GTT_PTE_Type;
-   package GTT is new MMIO_Range
-     (Base_Addr   => 0,
-      Element_T   => GTT_PTE_Type,
-      Index_T     => GTT_Range,
-      Array_T     => GTT_Registers_Type);
-
-   GTT_Backup : GTT_Registers_Type;
+   type GTT_Entry is record
+      Addr  : GTT_Address_Type;
+      Valid : Boolean;
+   end record;
+   GTT_Backup : array (GTT_Range) of GTT_Entry;

procedure Backup_GTT
    is
    begin
       for Idx in GTT_Range loop
-         GTT.Read (GTT_Backup (Idx), Idx);
+         Read_GTT (GTT_Backup (Idx).Addr, GTT_Backup (Idx).Valid, Idx);
       end loop;
    end Backup_GTT;

@@ -50,7 +46,7 @@
    is
    begin
       for Idx in GTT_Range loop
-         GTT.Write (Idx, GTT_Backup (Idx));
+         Write_GTT (Idx, GTT_Backup (Idx).Addr, GTT_Backup (Idx).Valid);
       end loop;
    end Restore_GTT;

@@ -574,13 +570,6 @@
          return;
       end if;

-      Dev.Map (Res_Addr, PCI.Res0, Offset => Config.GTT_Offset);
-      if Res_Addr = 0 then
-         Debug.Put_Line ("Failed to map PCI resource0.");
-         return;
-      end if;
-      GTT.Set_Base_Address (Res_Addr);
-
       Dev.Map (Res_Addr, PCI.Res2, WC => True);
       if Res_Addr = 0 then
          Debug.Put_Line ("Failed to map PCI resource2.");