Change in coreboot[master]: soc/amd/picasso: Use common block graphics driver

[Furquan Shaikh (Code Review)]

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40676 )

Change subject: soc/amd/picasso: Use common block graphics driver
......................................................................

soc/amd/picasso: Use common block graphics driver

This change selects common block graphics driver for Picasso and also
adds PCI ID for Family 17h graphics controller to the graphics
driver.

Since the common driver provides .acpi_name() callback for graphics
device, soc_acpi_name() no longer needs to provide the ACPI name for
graphics device.

BUG=b:153858769

Change-Id: Id3ffcb05d8f8a253a0b27407d52d7907c507cabb
Signed-off-by: Furquan Shaikh 
---
M src/soc/amd/common/block/graphics/graphics.c
M src/soc/amd/picasso/Kconfig
M src/soc/amd/picasso/chip.c
3 files changed, 8 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/40676/1

diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c
index b21cf2c..8e14aa7 100644
--- a/src/soc/amd/common/block/graphics/graphics.c
+++ b/src/soc/amd/common/block/graphics/graphics.c
@@ -5,6 +5,11 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>

+static const struct *graphics_acpi_name(const struct device *dev)
+{
+	return "IGFX";
+}
+
 static const struct device_operations graphics_ops = {
    .read_resources			= pci_dev_read_resources,
    .set_resources			= pci_dev_set_resources,
@@ -13,9 +18,11 @@
    .ops_pci			= &pci_dev_ops_pci,
    .write_acpi_tables		= pci_rom_write_acpi_tables,
    .acpi_fill_ssdt_generator	= pci_rom_ssdt,
+	.acpi_name			= graphics_acpi_name,
 };

static const unsigned short pci_device_ids[] = {
+	PCI_DEVICE_ID_AMD_FAM17H_GPU,
    0,
 };

diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index c7e65fa..3113b27 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -31,6 +31,7 @@
    select SOC_AMD_COMMON_BLOCK_ACPIMMIO
    select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
    select SOC_AMD_COMMON_BLOCK_ACPI
+	select SOC_AMD_COMMON_BLOCK_GRAPHICS
    select SOC_AMD_COMMON_BLOCK_LPC
    select SOC_AMD_COMMON_BLOCK_PCI
    select SOC_AMD_COMMON_BLOCK_HDA
diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index 7b3e7fb..4b25b88 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -51,8 +51,6 @@
    	return NULL;

switch (dev->path.pci.devfn) {
-	case GFX_DEVFN:
-		return "IGFX";
    case PCIE0_DEVFN:
    	return "PBR4";
    case PCIE1_DEVFN:

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40676 )

Change subject: soc/amd/picasso: Use common block graphics driver
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/40676/1/src/soc/amd/common/block/gr... 
File src/soc/amd/common/block/graphics/graphics.c:

https://review.coreboot.org/c/coreboot/+/40676/1/src/soc/amd/common/block/gr... 
PS1, Line 8: static const struct *graphics_acpi_name(const struct device *dev)
need consistent spacing around '*' (ctx:WxV)

[Furquan Shaikh (Code Review)]

Hello build bot (Jenkins), Raul Rangel, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/40676

to look at the new patch set (#2).

Change subject: soc/amd/picasso: Use common block graphics driver
......................................................................

soc/amd/picasso: Use common block graphics driver

This change selects common block graphics driver for Picasso and also
adds PCI ID for Family 17h graphics controller to the graphics
driver.

Since the common driver provides .acpi_name() callback for graphics
device, soc_acpi_name() no longer needs to provide the ACPI name for
graphics device.

BUG=b:153858769

Change-Id: Id3ffcb05d8f8a253a0b27407d52d7907c507cabb
Signed-off-by: Furquan Shaikh 
---
M src/soc/amd/common/block/graphics/graphics.c
M src/soc/amd/picasso/Kconfig
M src/soc/amd/picasso/chip.c
3 files changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/40676/2

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40676 )

Change subject: soc/amd/picasso: Use common block graphics driver
......................................................................

Patch Set 2: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40676 )

Change subject: soc/amd/picasso: Use common block graphics driver
......................................................................

Patch Set 2: Code-Review+2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40676 )

Change subject: soc/amd/picasso: Use common block graphics driver
......................................................................

Patch Set 3: Code-Review+1

[Raul Rangel (Code Review)]

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40676 )

Change subject: soc/amd/picasso: Use common block graphics driver
......................................................................

Patch Set 3: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40676 )

Change subject: soc/amd/picasso: Use common block graphics driver
......................................................................

soc/amd/picasso: Use common block graphics driver

This change selects common block graphics driver for Picasso and also
adds PCI ID for Family 17h graphics controller to the graphics
driver.

Since the common driver provides .acpi_name() callback for graphics
device, soc_acpi_name() no longer needs to provide the ACPI name for
graphics device.

BUG=b:153858769

Change-Id: Id3ffcb05d8f8a253a0b27407d52d7907c507cabb
Signed-off-by: Furquan Shaikh 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40676
Tested-by: build bot (Jenkins) 
Reviewed-by: Paul Menzel 
Reviewed-by: Raul Rangel 
Reviewed-by: Aaron Durbin 
Reviewed-by: Angel Pons 
---
M src/soc/amd/common/block/graphics/graphics.c
M src/soc/amd/picasso/Kconfig
M src/soc/amd/picasso/chip.c
3 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Aaron Durbin: Looks good to me, approved
  Raul Rangel: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c
index 6d40f7c..880573b 100644
--- a/src/soc/amd/common/block/graphics/graphics.c
+++ b/src/soc/amd/common/block/graphics/graphics.c
@@ -21,6 +21,7 @@
 };

static const unsigned short pci_device_ids[] = {
+	PCI_DEVICE_ID_AMD_FAM17H_GPU,
    0,
 };

diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index c7e65fa..3113b27 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -31,6 +31,7 @@
    select SOC_AMD_COMMON_BLOCK_ACPIMMIO
    select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
    select SOC_AMD_COMMON_BLOCK_ACPI
+	select SOC_AMD_COMMON_BLOCK_GRAPHICS
    select SOC_AMD_COMMON_BLOCK_LPC
    select SOC_AMD_COMMON_BLOCK_PCI
    select SOC_AMD_COMMON_BLOCK_HDA
diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index 7b3e7fb..4b25b88 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -51,8 +51,6 @@
    	return NULL;

switch (dev->path.pci.devfn) {
-	case GFX_DEVFN:
-		return "IGFX";
    case PCIE0_DEVFN:
    	return "PBR4";
    case PCIE1_DEVFN: