Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48959 )
Change subject: soc/intel/common: Drop duplicate gfx.asl stub ......................................................................
soc/intel/common: Drop duplicate gfx.asl stub
Switch platforms including it to use drivers/intel/gma/acpi/gma_stub.asl. Include for soc/skylake as well, which previously did not have GFX0 defined. Adjust graphics.asl for mb/51nb/x210 to prevent device redefinition.
Change-Id: I376349ccddb95c166f0836ec1273bb8252c7c155 Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M src/mainboard/51nb/x210/acpi/graphics.asl M src/soc/intel/alderlake/acpi/southbridge.asl M src/soc/intel/apollolake/acpi/southbridge.asl M src/soc/intel/cannonlake/acpi/southbridge.asl D src/soc/intel/common/block/acpi/acpi/gfx.asl M src/soc/intel/elkhartlake/acpi/southbridge.asl M src/soc/intel/icelake/acpi/southbridge.asl M src/soc/intel/jasperlake/acpi/southbridge.asl M src/soc/intel/skylake/acpi/pch.asl M src/soc/intel/tigerlake/acpi/southbridge.asl 10 files changed, 12 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/48959/1
diff --git a/src/mainboard/51nb/x210/acpi/graphics.asl b/src/mainboard/51nb/x210/acpi/graphics.asl index e703ba1..4a5672c 100644 --- a/src/mainboard/51nb/x210/acpi/graphics.asl +++ b/src/mainboard/51nb/x210/acpi/graphics.asl @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-Device (GFX0) +Scope (GFX0) { - Name (_ADR, 0x00020000) + Method (_DOS, 1, NotSerialized) { /* We never do anything in firmware, so _DOS is a noop */ diff --git a/src/soc/intel/alderlake/acpi/southbridge.asl b/src/soc/intel/alderlake/acpi/southbridge.asl index 3d8e554..fc82d72 100644 --- a/src/soc/intel/alderlake/acpi/southbridge.asl +++ b/src/soc/intel/alderlake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gma_stub.asl>
/* ESPI 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/apollolake/acpi/southbridge.asl b/src/soc/intel/apollolake/acpi/southbridge.asl index 4a8be47..21f080a 100644 --- a/src/soc/intel/apollolake/acpi/southbridge.asl +++ b/src/soc/intel/apollolake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "xhci.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gma_stub.asl>
/* LPC */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl index fafbbfd..330d35a 100644 --- a/src/soc/intel/cannonlake/acpi/southbridge.asl +++ b/src/soc/intel/cannonlake/acpi/southbridge.asl @@ -17,7 +17,7 @@ #endif
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gma_stub.asl>
/* LPC 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/common/block/acpi/acpi/gfx.asl b/src/soc/intel/common/block/acpi/acpi/gfx.asl deleted file mode 100644 index 109543f..0000000 --- a/src/soc/intel/common/block/acpi/acpi/gfx.asl +++ /dev/null @@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -Device (GFX0) -{ - Name (_ADR, 0x00020000) -} diff --git a/src/soc/intel/elkhartlake/acpi/southbridge.asl b/src/soc/intel/elkhartlake/acpi/southbridge.asl index 17d1913..a968425 100644 --- a/src/soc/intel/elkhartlake/acpi/southbridge.asl +++ b/src/soc/intel/elkhartlake/acpi/southbridge.asl @@ -15,7 +15,7 @@ #include "gpio.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gma_stub.asl>
/* ESPI 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/icelake/acpi/southbridge.asl b/src/soc/intel/icelake/acpi/southbridge.asl index 129a88d..6ac305a 100644 --- a/src/soc/intel/icelake/acpi/southbridge.asl +++ b/src/soc/intel/icelake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gma_stub.asl>
/* ESPI 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/jasperlake/acpi/southbridge.asl b/src/soc/intel/jasperlake/acpi/southbridge.asl index ebc6fd8..08589c2 100644 --- a/src/soc/intel/jasperlake/acpi/southbridge.asl +++ b/src/soc/intel/jasperlake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gma_stub.asl>
/* ESPI 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/skylake/acpi/pch.asl b/src/soc/intel/skylake/acpi/pch.asl index 6eea5bb..c327a53 100644 --- a/src/soc/intel/skylake/acpi/pch.asl +++ b/src/soc/intel/skylake/acpi/pch.asl @@ -65,3 +65,6 @@ #if CONFIG(SOC_INTEL_COMMON_BLOCK_SGX) #include <soc/intel/common/acpi/sgx.asl> #endif + +/* Integrated graphics 0:2.0 */ +#include <drivers/intel/gma/acpi/gma_stub.asl> diff --git a/src/soc/intel/tigerlake/acpi/southbridge.asl b/src/soc/intel/tigerlake/acpi/southbridge.asl index 3d8e554..fc82d72 100644 --- a/src/soc/intel/tigerlake/acpi/southbridge.asl +++ b/src/soc/intel/tigerlake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gma_stub.asl>
/* ESPI 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl>
Hello build bot (Jenkins), Andrey Petrov, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/48959
to look at the new patch set (#2).
Change subject: soc/intel/common: Move gfx.asl to drivers/intel/gma ......................................................................
soc/intel/common: Move gfx.asl to drivers/intel/gma
Adjust platform-level includes as needed.
Change-Id: I376349ccddb95c166f0836ec1273bb8252c7c155 Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- R src/drivers/intel/gma/acpi/gfx.asl M src/soc/intel/alderlake/acpi/southbridge.asl M src/soc/intel/apollolake/acpi/southbridge.asl M src/soc/intel/cannonlake/acpi/southbridge.asl M src/soc/intel/elkhartlake/acpi/southbridge.asl M src/soc/intel/icelake/acpi/southbridge.asl M src/soc/intel/jasperlake/acpi/southbridge.asl M src/soc/intel/tigerlake/acpi/southbridge.asl 8 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/48959/2
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48959 )
Change subject: soc/intel/common: Move gfx.asl to drivers/intel/gma ......................................................................
Patch Set 2: Code-Review+1
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48959 )
Change subject: soc/intel/common: Move gfx.asl to drivers/intel/gma ......................................................................
Patch Set 2: Code-Review+2
Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48959 )
Change subject: soc/intel/common: Move gfx.asl to drivers/intel/gma ......................................................................
soc/intel/common: Move gfx.asl to drivers/intel/gma
Adjust platform-level includes as needed.
Change-Id: I376349ccddb95c166f0836ec1273bb8252c7c155 Signed-off-by: Matt DeVillier matt.devillier@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/48959 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Michael Niewöhner foss@mniewoehner.de --- R src/drivers/intel/gma/acpi/gfx.asl M src/soc/intel/alderlake/acpi/southbridge.asl M src/soc/intel/apollolake/acpi/southbridge.asl M src/soc/intel/cannonlake/acpi/southbridge.asl M src/soc/intel/elkhartlake/acpi/southbridge.asl M src/soc/intel/icelake/acpi/southbridge.asl M src/soc/intel/jasperlake/acpi/southbridge.asl M src/soc/intel/tigerlake/acpi/southbridge.asl 8 files changed, 7 insertions(+), 7 deletions(-)
Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved
diff --git a/src/soc/intel/common/block/acpi/acpi/gfx.asl b/src/drivers/intel/gma/acpi/gfx.asl similarity index 100% rename from src/soc/intel/common/block/acpi/acpi/gfx.asl rename to src/drivers/intel/gma/acpi/gfx.asl diff --git a/src/soc/intel/alderlake/acpi/southbridge.asl b/src/soc/intel/alderlake/acpi/southbridge.asl index 3d8e554..744b7ef 100644 --- a/src/soc/intel/alderlake/acpi/southbridge.asl +++ b/src/soc/intel/alderlake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gfx.asl>
/* ESPI 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/apollolake/acpi/southbridge.asl b/src/soc/intel/apollolake/acpi/southbridge.asl index 4a8be47..4d4e4dc 100644 --- a/src/soc/intel/apollolake/acpi/southbridge.asl +++ b/src/soc/intel/apollolake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "xhci.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gfx.asl>
/* LPC */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/cannonlake/acpi/southbridge.asl b/src/soc/intel/cannonlake/acpi/southbridge.asl index fafbbfd..f091d8f 100644 --- a/src/soc/intel/cannonlake/acpi/southbridge.asl +++ b/src/soc/intel/cannonlake/acpi/southbridge.asl @@ -17,7 +17,7 @@ #endif
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gfx.asl>
/* LPC 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/elkhartlake/acpi/southbridge.asl b/src/soc/intel/elkhartlake/acpi/southbridge.asl index 17d1913..02425c4 100644 --- a/src/soc/intel/elkhartlake/acpi/southbridge.asl +++ b/src/soc/intel/elkhartlake/acpi/southbridge.asl @@ -15,7 +15,7 @@ #include "gpio.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gfx.asl>
/* ESPI 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/icelake/acpi/southbridge.asl b/src/soc/intel/icelake/acpi/southbridge.asl index 129a88d..925f28f 100644 --- a/src/soc/intel/icelake/acpi/southbridge.asl +++ b/src/soc/intel/icelake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gfx.asl>
/* ESPI 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/jasperlake/acpi/southbridge.asl b/src/soc/intel/jasperlake/acpi/southbridge.asl index ebc6fd8..b97ec58 100644 --- a/src/soc/intel/jasperlake/acpi/southbridge.asl +++ b/src/soc/intel/jasperlake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gfx.asl>
/* ESPI 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/tigerlake/acpi/southbridge.asl b/src/soc/intel/tigerlake/acpi/southbridge.asl index 3d8e554..744b7ef 100644 --- a/src/soc/intel/tigerlake/acpi/southbridge.asl +++ b/src/soc/intel/tigerlake/acpi/southbridge.asl @@ -18,7 +18,7 @@ #include "gpio.asl"
/* GFX 00:02.0 */ -#include <soc/intel/common/block/acpi/acpi/gfx.asl> +#include <drivers/intel/gma/acpi/gfx.asl>
/* ESPI 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl>
-
Matt DeVillier (Code Review) -
Michael Niewöhner (Code Review)