coreboot-mirror
/
libgfxinit
mirror of https://review.coreboot.org/libgfxinit.git
1
0
Fork 0
Code Issues Releases Wiki Activity

gma: Implement automatic CPU detection 

In dynamic CPU configurations, Config.Detect_CPU() sets the CPU
variables according to the given PCI device id. In static confi-
gurations it does nothing.

We update the default configs to make use of this feature where
applicable. This should still give us full build-test coverage
while cutting the amount of tests in half.

Change-Id: I8ce31c867f97c8d6ef99ca096cb45f7719e78a19
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/27138
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Nico Huber 2018-06-17 16:30:33 +02:00
parent adfe11fec3
commit 6a996dc7ba
16 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/Makefile.inc
View File

@ -79,6 +79,7 @@ $(hw-gfx-gma-config-ads): $(dir)/hw-gfx-gma-config.ads.template $(cnf)
-e's/<\(ilk\|hsw\|skl\)\(...\)\?var>/$(_GEN_CONST_TARGET)/' \
-e's/\(.*: *<cpufunc>.*:=\) *\(.*\);/\1\n (\2);/' \
-e's/\([^ ]\+\) *: *<cpufunc> \+\([^ ]*\) *:=/function \1 return \2 is/' \
-e's/<cpunull>//' \
$< >$@
else
$(hw-gfx-gma-config-ads): $(dir)/hw-gfx-gma-config.ads.template $(cnf)
@ -93,18 +94,20 @@ $(hw-gfx-gma-config-ads): $(dir)/hw-gfx-gma-config.ads.template $(cnf)
-e'/Dyn_CPU\(_Var\)\?/d' \
-e's/<\(gen\|\(ilk\|hsw\|skl\)\(...\)\?\)bool>/constant Boolean/' \
-e's/<\(\(ilk\|hsw\|skl\)\(...\)\?\)var>/constant/' \
-e's/<cpunull>/ is null/' \
$< >$@
endif
gfxinit-gen-y += $(hw-gfx-gma-config-ads)
gfxinit-$(CONFIG_GFX_GMA_DYN_CPU) += dyncpu/hw-gfx-gma-config.adb
ifneq ($(filter G45,$(CONFIG_GFX_GMA_CPU)),)
ifneq ($(filter G45,$(CONFIG_GFX_GMA_GENERATION)),)
subdirs-y += g45
else ifneq ($(filter Ironlake Sandybridge Ivybridge,$(CONFIG_GFX_GMA_CPU)),)
else ifneq ($(filter Ironlake,$(CONFIG_GFX_GMA_GENERATION)),)
subdirs-y += ironlake
else ifneq ($(filter Haswell Broadwell,$(CONFIG_GFX_GMA_CPU)),)
else ifneq ($(filter Haswell,$(CONFIG_GFX_GMA_GENERATION)),)
subdirs-y += haswell_shared haswell
else ifneq ($(filter Broxton,$(CONFIG_GFX_GMA_CPU)),)
else ifneq ($(filter Broxton,$(CONFIG_GFX_GMA_GENERATION)),)
subdirs-y += haswell_shared broxton
else ifneq ($(filter Skylake,$(CONFIG_GFX_GMA_CPU)),)
else ifneq ($(filter Skylake,$(CONFIG_GFX_GMA_GENERATION)),)
subdirs-y += haswell_shared skylake
endif

31
common/dyncpu/hw-gfx-gma-config.adb Normal file
View File

@ -0,0 +1,31 @@
--
-- Copyright (C) 2018 Nico Huber <nico.h@gmx.de>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
package body HW.GFX.GMA.Config
is
procedure Detect_CPU (Device : Word16) is
begin
for CPU in Gen_CPU_Type loop
for CPU_Var in Gen_CPU_Variant loop
if Is_GPU (Device, CPU, CPU_Var) then
Config.CPU := CPU;
Config.CPU_Var := CPU_Var;
exit;
end if;
end loop;
end loop;
end Detect_CPU;
end HW.GFX.GMA.Config;

4
common/hw-gfx-gma-config.ads.template
View File

@ -361,4 +361,8 @@ private package HW.GFX.GMA.Config is
function Compatible_GPU (Device_Id : Word16) return Boolean is
(Is_GPU (Device_Id, CPU, CPU_Var));
pragma Warnings (GNATprove, Off, "subprogram ""Detect_CPU"" has no effect",
Reason => "only effective in dynamic cpu config");
procedure Detect_CPU (Device : Word16)<cpunull>;
end HW.GFX.GMA.Config;

25
common/hw-gfx-gma.adb
View File

@ -425,6 +425,7 @@ is
Dev.Read16 (Vendor, PCI.Vendor_Id);
Dev.Read16 (Device, PCI.Device_Id);
Config.Detect_CPU (Device);
Success := Vendor = 16#8086# and Config.Compatible_GPU (Device);
end Check_Platform_PCI;
begin
@ -443,29 +444,27 @@ is
Cursor => Default_Cursor,
Mode => HW.GFX.Invalid_Mode));
Config.Variable := Config.Initial_Settings;
Registers.Set_Register_Base (Config.Default_MMIO_Base);
PLLs.Initialize;
Dev.Initialize (Success);
if Success then
Dev.Map (PCI_MMIO_Base, PCI.Res0, Length => MMIO_GTT_Offset);
Dev.Map (PCI_GTT_Base, PCI.Res0, Offset => MMIO_GTT_Offset);
if PCI_MMIO_Base /= 0 and PCI_GTT_Base /= 0 then
Registers.Set_Register_Base (PCI_MMIO_Base, PCI_GTT_Base);
else
pragma Debug (Debug.Put_Line
("ERROR: Couldn't map resoure0."));
Registers.Set_Register_Base (Config.Default_MMIO_Base);
Success := Config.Default_MMIO_Base_Set;
end if;
Check_Platform_PCI (Success);
if Success then
Check_Platform_PCI (Success);
Dev.Map (PCI_MMIO_Base, PCI.Res0, Length => MMIO_GTT_Offset);
Dev.Map (PCI_GTT_Base, PCI.Res0, Offset => MMIO_GTT_Offset);
if PCI_MMIO_Base /= 0 and PCI_GTT_Base /= 0 then
Registers.Set_Register_Base (PCI_MMIO_Base, PCI_GTT_Base);
else
pragma Debug (Debug.Put_Line
("ERROR: Couldn't map resoure0."));
Success := Config.Default_MMIO_Base_Set;
end if;
end if;
else
pragma Debug (Debug.Put_Line
("WARNING: Couldn't initialize PCI dev."));
Registers.Set_Register_Base (Config.Default_MMIO_Base);
Success := Config.Default_MMIO_Base_Set;
if Success then

6
configs/broadwell
View File

@ -1,6 +0,0 @@
CONFIG_GFX_GMA_GENERATION = Haswell
CONFIG_GFX_GMA_CPU = Broadwell
CONFIG_GFX_GMA_CPU_VARIANT = Normal
CONFIG_GFX_GMA_INTERNAL_PORT = DP
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#

6
configs/broadwell_ult
View File

@ -1,6 +0,0 @@
CONFIG_GFX_GMA_GENERATION = Haswell
CONFIG_GFX_GMA_CPU = Broadwell
CONFIG_GFX_GMA_CPU_VARIANT = ULT
CONFIG_GFX_GMA_INTERNAL_PORT = DP
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#

1
configs/broxton
View File

@ -1,3 +1,4 @@
CONFIG_GFX_GMA_DYN_CPU =
CONFIG_GFX_GMA_GENERATION = Broxton
CONFIG_GFX_GMA_CPU = Broxton
CONFIG_GFX_GMA_CPU_VARIANT = Normal # N/A

3
configs/g45
View File

@ -1,6 +1,7 @@
CONFIG_GFX_GMA_DYN_CPU =
CONFIG_GFX_GMA_GENERATION = G45
CONFIG_GFX_GMA_CPU = G45
CONFIG_GFX_GMA_CPU_VARIANT = Normal
CONFIG_GFX_GMA_CPU_VARIANT = Normal # N/A
CONFIG_GFX_GMA_INTERNAL_PORT = LVDS
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#

3
configs/haswell
View File

@ -1,6 +1,5 @@
CONFIG_GFX_GMA_DYN_CPU = y
CONFIG_GFX_GMA_GENERATION = Haswell
CONFIG_GFX_GMA_CPU = Haswell
CONFIG_GFX_GMA_CPU_VARIANT = Normal
CONFIG_GFX_GMA_INTERNAL_PORT = DP
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#

6
configs/haswell_ult
View File

@ -1,6 +0,0 @@
CONFIG_GFX_GMA_GENERATION = Haswell
CONFIG_GFX_GMA_CPU = Haswell
CONFIG_GFX_GMA_CPU_VARIANT = ULT
CONFIG_GFX_GMA_INTERNAL_PORT = DP
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#

3
configs/ironlake
View File

@ -1,6 +1,5 @@
CONFIG_GFX_GMA_DYN_CPU = y
CONFIG_GFX_GMA_GENERATION = Ironlake
CONFIG_GFX_GMA_CPU = Ironlake
CONFIG_GFX_GMA_CPU_VARIANT = Normal
CONFIG_GFX_GMA_INTERNAL_PORT = LVDS
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#

3
configs/ivybridge_edp → configs/ironlake_edp
View File

@ -1,6 +1,5 @@
CONFIG_GFX_GMA_DYN_CPU = y
CONFIG_GFX_GMA_GENERATION = Ironlake
CONFIG_GFX_GMA_CPU = Ivybridge
CONFIG_GFX_GMA_CPU_VARIANT = Normal
CONFIG_GFX_GMA_INTERNAL_PORT = DP
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#

6
configs/ivybridge_lvds
View File

@ -1,6 +0,0 @@
CONFIG_GFX_GMA_GENERATION = Ironlake
CONFIG_GFX_GMA_CPU = Ivybridge
CONFIG_GFX_GMA_CPU_VARIANT = Normal
CONFIG_GFX_GMA_INTERNAL_PORT = LVDS
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#

6
configs/sandybridge
View File

@ -1,6 +0,0 @@
CONFIG_GFX_GMA_GENERATION = Ironlake
CONFIG_GFX_GMA_CPU = Sandybridge
CONFIG_GFX_GMA_CPU_VARIANT = Normal
CONFIG_GFX_GMA_INTERNAL_PORT = LVDS
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#

3
configs/skylake
View File

@ -1,6 +1,5 @@
CONFIG_GFX_GMA_DYN_CPU = y
CONFIG_GFX_GMA_GENERATION = Skylake
CONFIG_GFX_GMA_CPU = Skylake
CONFIG_GFX_GMA_CPU_VARIANT = Normal
CONFIG_GFX_GMA_INTERNAL_PORT = DP
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#

6
configs/skylake_ult
View File

@ -1,6 +0,0 @@
CONFIG_GFX_GMA_GENERATION = Skylake
CONFIG_GFX_GMA_CPU = Skylake
CONFIG_GFX_GMA_CPU_VARIANT = ULT
CONFIG_GFX_GMA_INTERNAL_PORT = DP
CONFIG_GFX_GMA_ANALOG_I2C_PORT = PCH_DAC
CONFIG_GFX_GMA_DEFAULT_MMIO = 16\#e000_0000\#