Change in ...coreboot[master]: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at c...

[mikeb mikeb (Code Review)]

Hello Mike Banon,

I'd like you to do a code review. Please visit

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

to review the following change.

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI

Create the way of adding the discrete VGA OpROM at config UI ( alternative to
./cbfstool ./cb.rom add -f vgabios_dgpu.bin -n pci1002,6663.rom -t optionrom )
DGPU options are accessible only if CONFIG_MULTIPLE_VGA_ADAPTERS is enabled.

Signed-off-by: Mike Banon 
Change-Id: I0a7bf0fe95c833cf3df0c7cb20fc27b6ab218c5a
---
M src/arch/x86/Makefile.inc
M src/device/Kconfig
2 files changed, 42 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/31449/1

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 8dafac8..47ef66b 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -47,6 +47,13 @@
 pci$(stripped_vgabios_id).rom-file := $(call strip_quotes,$(CONFIG_VGA_BIOS_FILE))
 pci$(stripped_vgabios_id).rom-type := optionrom

+ifeq ($(CONFIG_MULTIPLE_VGA_ADAPTERS),y)
+stripped_vgabios_dgpu_id = $(call strip_quotes,$(CONFIG_VGA_BIOS_DGPU_ID))
+cbfs-files-$(CONFIG_VGA_BIOS_DGPU) += pci$(stripped_vgabios_dgpu_id).rom
+pci$(stripped_vgabios_dgpu_id).rom-file := $(call strip_quotes,$(CONFIG_VGA_BIOS_DGPU_FILE))
+pci$(stripped_vgabios_dgpu_id).rom-type := optionrom
+endif
+
 verstage-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c
 bootblock-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c
 romstage-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c
diff --git a/src/device/Kconfig b/src/device/Kconfig
index b90b15f..33c1e5b3 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -613,6 +613,41 @@

Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.

+config VGA_BIOS_DGPU
+	bool "Add a Discrete VGA BIOS image"
+	depends on ARCH_X86 && MULTIPLE_VGA_ADAPTERS
+	help
+	  Select this option if you have a VGA BIOS image for Discrete GPU
+	  that you would like to add to your ROM.
+
+	  You will be able to specify the location and file name of the
+	  image later.
+
+config VGA_BIOS_DGPU_FILE
+	string "Discrete VGA BIOS path and filename"
+	depends on VGA_BIOS_DGPU
+	default "vgabios_dgpu.bin"
+	help
+	  The path and filename of the file to use as VGA BIOS for Discrete GPU.
+
+config VGA_BIOS_DGPU_ID
+	string "Discrete VGA device PCI IDs"
+	depends on VGA_BIOS_DGPU
+	default "1002,6663"
+	help
+	  The comma-separated PCI vendor and device ID that would associate
+	  your VGA BIOS to your discrete video card.
+
+	  Examples:
+	      1002,6663 for HD 8570M
+	      1002,6665 for R5 M230
+
+	  In the above examples 1002 is the PCI vendor ID (in hex, but without
+	  the "0x" prefix) and 6663 / 6665 specifies the PCI device ID of the
+	  discrete video card (also in hex, without "0x" prefix).
+
+	  Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
+
 config INTEL_GMA_HAVE_VBT
    bool
    help

[Arthur Heymans (Code Review)]

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 1:

What about making the gpu cbfs filename and to be included vga oprom filenames a ',' or ';' separated list that you parse? That would allow for an arbitrary number of vga oproms.

[Arthur Heymans (Code Review)]

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 1:
> Patch Set 1:
>
> What about making the gpu cbfs filename and to be included vga oprom filenames a ',' or ';' separated list that you parse? That would allow for an arbitrary number of vga oproms.

',' won't work :-)

[Paul Menzel (Code Review)]

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

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 1: Code-Review+1

(1 comment)

https://review.coreboot.org/#/c/31449/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31449/1//COMMIT_MSG@9 
PS1, Line 9:  
Please remove the space.

[mikeb mikeb (Code Review)]

mikeb mikeb has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 1:
> Patch Set 1:
>
> What about making the gpu cbfs filename and to be included vga oprom filenames a ',' or ';' separated list that you parse? That would allow for an arbitrary number of vga oproms.

Something like this could be useful for those who don't want to memorize PCI ven/dev IDs - so maybe a good idea, but I am not ready to do it at the moment (too many tasks at TODO list :P at least I'm glad I finally completed these dGPU patches and hopefully just some final cuts are required now)

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 1:

(3 comments)

https://review.coreboot.org/#/c/31449/1/src/device/Kconfig 
File src/device/Kconfig:

https://review.coreboot.org/#/c/31449/1/src/device/Kconfig@617 
PS1, Line 617: 	bool "Add a Discrete VGA BIOS image"
discrete

https://review.coreboot.org/#/c/31449/1/src/device/Kconfig@618 
PS1, Line 618: 	depends on ARCH_X86 && MULTIPLE_VGA_ADAPTERS
MULTIPLE_VGA_ADAPTERS seems to be some ancient Kconfig that should no longer be used.

https://review.coreboot.org/#/c/31449/1/src/device/Kconfig@620 
PS1, Line 620: 	  Select this option if you have a VGA BIOS image for Discrete GPU
discrete

[mikeb mikeb (Code Review)]

Hello Paul Menzel, Mike Banon, build bot (Jenkins), Patrick Georgi, Martin Roth,

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

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

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

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI

Create the way of adding the discrete VGA OpROM at config UI (alternative to
./cbfstool ./cb.rom add -f vgabios_dgpu.bin -n pci1002,6663.rom -t optionrom )
DGPU options are accessible only if CONFIG_MULTIPLE_VGA_ADAPTERS is enabled.

Signed-off-by: Mike Banon 
Change-Id: I0a7bf0fe95c833cf3df0c7cb20fc27b6ab218c5a
---
M src/arch/x86/Makefile.inc
M src/device/Kconfig
2 files changed, 42 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/31449/2

[mikeb mikeb (Code Review)]

mikeb mikeb has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 2:

(4 comments)

https://review.coreboot.org/#/c/31449/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31449/1//COMMIT_MSG@9 
PS1, Line 9:
> Please remove the space.

Done.

https://review.coreboot.org/#/c/31449/1/src/device/Kconfig 
File src/device/Kconfig:

https://review.coreboot.org/#/c/31449/1/src/device/Kconfig@617 
PS1, Line 617: 	bool "Add a Discrete VGA BIOS image"
> discrete

Done.

https://review.coreboot.org/#/c/31449/1/src/device/Kconfig@618 
PS1, Line 618: 	depends on ARCH_X86 && MULTIPLE_VGA_ADAPTERS
> MULTIPLE_VGA_ADAPTERS seems to be some ancient Kconfig that should no longer be used.

I disagree: MULTIPLE_VGA_ADAPTERS option already surrounds important AMD-specific code at AMD northbridges, more information at https://review.coreboot.org/c/coreboot/+/31448#message-b19757941999d0b435fc0...

https://review.coreboot.org/#/c/31449/1/src/device/Kconfig@620 
PS1, Line 620: 	  Select this option if you have a VGA BIOS image for Discrete GPU
> discrete

Done.

[mikeb mikeb (Code Review)]

mikeb mikeb has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/#/c/31449/1/src/device/Kconfig 
File src/device/Kconfig:

https://review.coreboot.org/#/c/31449/1/src/device/Kconfig@618 
PS1, Line 618: 	depends on ARCH_X86 && MULTIPLE_VGA_ADAPTERS
> I disagree: MULTIPLE_VGA_ADAPTERS option already surrounds important AMD-specific code at AMD northb […]

Update: it turned out that the already-existing-at-coreboot-master MULTIPLE_VGA_ADAPTERS code is not required for getting a dGPU working, although it has not been ruled out that this code could not be somehow useful (e.g. for getting the Crossfire working) or essential for some other board, because for this G505S almost all this already-existing code never runs at the moment, blocked by another check. More information at - https://review.coreboot.org/c/coreboot/+/31448#message-86a7c4f33a958847d16f9...

In any case this MULTIPLE_VGA_ADAPTERS name is perfectly suitable for what I am doing, but if you disagree, please suggest a better name

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/#/c/31449/2/src/device/Kconfig 
File src/device/Kconfig:

https://review.coreboot.org/#/c/31449/2/src/device/Kconfig@618 
PS2, Line 618: 	depends on ARCH_X86 && MULTIPLE_VGA_ADAPTERS
I find "depends on VGA_BIOS" instead of "depends MULTIPLE_VGA_ADAPTERS" a better way.
There are lot's of platforms not selecting MULTIPLE_VGA_ADAPTERS that would benefit from this change.

[Angel Pons (Code Review)]

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

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 2:

On Sony VPCEH, I load the Nvidia dGPU's VBIOS on coreboot as if I was loading a VBIOS for an Intel card. Is this intended for the case of two graphics adapters that need two different VBIOSes?

[mikeb mikeb (Code Review)]

Hello Angel Pons, Paul Menzel, Mike Banon, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,

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

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

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

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI

Create the way of adding the discrete VGA OpROM at config UI (alternative to
./cbfstool ./cb.rom add -f vgabios_dgpu.bin -n pci1002,6663.rom -t optionrom )
DGPU options are accessible only if CONFIG_MULTIPLE_VGA_ADAPTERS is enabled.

Signed-off-by: Mike Banon 
Change-Id: I0a7bf0fe95c833cf3df0c7cb20fc27b6ab218c5a
---
M src/arch/x86/Makefile.inc
M src/device/Kconfig
2 files changed, 42 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/31449/3

[mikeb mikeb (Code Review)]

mikeb mikeb has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 3:

(1 comment)
> Patch Set 2:
>
> On Sony VPCEH, I load the Nvidia dGPU's VBIOS on coreboot as if I was loading a VBIOS for an Intel card. Is this intended for the case of two graphics adapters that need two different VBIOSes?

Yes.

https://review.coreboot.org/#/c/31449/2/src/device/Kconfig 
File src/device/Kconfig:

https://review.coreboot.org/#/c/31449/2/src/device/Kconfig@618 
PS2, Line 618: 	depends on ARCH_X86 && MULTIPLE_VGA_ADAPTERS
> I find "depends on VGA_BIOS" instead of "depends MULTIPLE_VGA_ADAPTERS" a better way. […]

Good idea Patrick, thank you. Done.

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
......................................................................

Patch Set 4: Code-Review+1

(2 comments)

https://review.coreboot.org/#/c/31449/4//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31449/4//COMMIT_MSG@7 
PS4, Line 7: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
summary is a bit long

https://review.coreboot.org/#/c/31449/4//COMMIT_MSG@11 
PS4, Line 11: DGPU options are accessible only if CONFIG_MULTIPLE_VGA_ADAPTERS is enabled.
no longer true

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[mikeb mikeb (Code Review)]

Hello Patrick Rudolph, Angel Pons, Paul Menzel, Mike Banon, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,

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

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

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

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

src/device/Kconfig: Include the discrete VGA OpROM at config UI

Create the way of adding the discrete VGA OpROM at config UI (alternative to
./cbfstool ./cb.rom add -f vgabios_dgpu.bin -n pci1002,6663.rom -t optionrom )
DGPU options are accessible only if CONFIG_VGA_BIOS is enabled.

Signed-off-by: Mike Banon 
Change-Id: I0a7bf0fe95c833cf3df0c7cb20fc27b6ab218c5a
---
M src/arch/x86/Makefile.inc
M src/device/Kconfig
2 files changed, 42 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/31449/5

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[mikeb mikeb (Code Review)]

mikeb mikeb has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

Patch Set 5:

(2 comments)

https://review.coreboot.org/#/c/31449/4//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31449/4//COMMIT_MSG@7 
PS4, Line 7: src/device/Kconfig: Add support for discrete VGA OpROM inclusion at config UI
> summary is a bit long

done

https://review.coreboot.org/#/c/31449/4//COMMIT_MSG@11 
PS4, Line 11: DGPU options are accessible only if CONFIG_MULTIPLE_VGA_ADAPTERS is enabled.
> no longer true

updated

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

Patch Set 5:

(1 comment)

https://review.coreboot.org/#/c/31449/5/src/arch/x86/Makefile.inc 
File src/arch/x86/Makefile.inc:

https://review.coreboot.org/#/c/31449/5/src/arch/x86/Makefile.inc@50 
PS5, Line 50: CONFIG_MULTIPLE_VGA_ADAPTERS
Config_vga_bios

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[mikeb mikeb (Code Review)]

Hello Patrick Rudolph, Angel Pons, Paul Menzel, Mike Banon, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,

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

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

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

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

src/device/Kconfig: Include the discrete VGA OpROM at config UI

Create the way of adding the discrete VGA OpROM at config UI (alternative to
./cbfstool ./cb.rom add -f vgabios_dgpu.bin -n pci1002,6663.rom -t optionrom )
DGPU options are accessible only if CONFIG_VGA_BIOS is enabled.

Signed-off-by: Mike Banon 
Change-Id: I0a7bf0fe95c833cf3df0c7cb20fc27b6ab218c5a
---
M src/arch/x86/Makefile.inc
M src/device/Kconfig
2 files changed, 42 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/31449/6

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[mikeb mikeb (Code Review)]

mikeb mikeb has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/#/c/31449/5/src/arch/x86/Makefile.inc 
File src/arch/x86/Makefile.inc:

https://review.coreboot.org/#/c/31449/5/src/arch/x86/Makefile.inc@50 
PS5, Line 50: CONFIG_MULTIPLE_VGA_ADAPTERS
> Config_vga_bios

Thank you very much for noticing! Maybe CONFIG_VGA_BIOS_DGPU is more suitable?

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/#/c/31449/6/src/arch/x86/Makefile.inc 
File src/arch/x86/Makefile.inc:

https://review.coreboot.org/#/c/31449/6/src/arch/x86/Makefile.inc@52 
PS6, Line 52: cbfs-files-$(CONFIG_VGA_BIOS_DGPU) += pci$(stripped_vgabios_dgpu_id).rom
we know, $(CONFIG_VGA_BIOS_DGPU) is `y`, here. Hmm, actually...
I think you should remove the `ifeq` around this (just like
for CONFIG_VGA_BIOS above). It's not needed, we'd just have
some unused variables around.

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[mikeb mikeb (Code Review)]

Hello Patrick Rudolph, Angel Pons, Paul Menzel, Mike Banon, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,

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

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

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

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

src/device/Kconfig: Include the discrete VGA OpROM at config UI

Create the way of adding the discrete VGA OpROM at config UI (alternative to
./cbfstool ./cb.rom add -f vgabios_dgpu.bin -n pci1002,6663.rom -t optionrom )
DGPU options are accessible only if CONFIG_VGA_BIOS is enabled.

Signed-off-by: Mike Banon 
Change-Id: I0a7bf0fe95c833cf3df0c7cb20fc27b6ab218c5a
---
M src/arch/x86/Makefile.inc
M src/device/Kconfig
2 files changed, 40 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/31449/7

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[mikeb mikeb (Code Review)]

mikeb mikeb has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

Patch Set 7:

(1 comment)

https://review.coreboot.org/#/c/31449/6/src/arch/x86/Makefile.inc 
File src/arch/x86/Makefile.inc:

https://review.coreboot.org/#/c/31449/6/src/arch/x86/Makefile.inc@52 
PS6, Line 52: cbfs-files-$(CONFIG_VGA_BIOS_DGPU) += pci$(stripped_vgabios_dgpu_id).rom
> we know, $(CONFIG_VGA_BIOS_DGPU) is `y`, here. Hmm, actually... […]

Good idea, thank you. Done.

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

Patch Set 7: Code-Review+2

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[Paul Menzel (Code Review)]

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

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

Patch Set 7: Code-Review+1

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[mikeb mikeb (Code Review)]

mikeb mikeb has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

Patch Set 8:

Hope we could see this already-reviewed patch merged soon...

Change in ...coreboot[master]: src/device/Kconfig: Include the discrete VGA OpROM at config UI

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31449 )

Change subject: src/device/Kconfig: Include the discrete VGA OpROM at config UI
......................................................................

src/device/Kconfig: Include the discrete VGA OpROM at config UI

Create the way of adding the discrete VGA OpROM at config UI (alternative to
./cbfstool ./cb.rom add -f vgabios_dgpu.bin -n pci1002,6663.rom -t optionrom )
DGPU options are accessible only if CONFIG_VGA_BIOS is enabled.

Signed-off-by: Mike Banon 
Change-Id: I0a7bf0fe95c833cf3df0c7cb20fc27b6ab218c5a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31449
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Rudolph 
Reviewed-by: Paul Menzel 
---
M src/arch/x86/Makefile.inc
M src/device/Kconfig
2 files changed, 40 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Patrick Rudolph: Looks good to me, approved

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 3c4a8b0..e3151ef 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -47,6 +47,11 @@
 pci$(stripped_vgabios_id).rom-file := $(call strip_quotes,$(CONFIG_VGA_BIOS_FILE))
 pci$(stripped_vgabios_id).rom-type := optionrom

+stripped_vgabios_dgpu_id = $(call strip_quotes,$(CONFIG_VGA_BIOS_DGPU_ID))
+cbfs-files-$(CONFIG_VGA_BIOS_DGPU) += pci$(stripped_vgabios_dgpu_id).rom
+pci$(stripped_vgabios_dgpu_id).rom-file := $(call strip_quotes,$(CONFIG_VGA_BIOS_DGPU_FILE))
+pci$(stripped_vgabios_dgpu_id).rom-type := optionrom
+
 verstage-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c
 bootblock-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c
 romstage-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c
diff --git a/src/device/Kconfig b/src/device/Kconfig
index f0fdce2..8001b43 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -613,6 +613,41 @@

Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.

+config VGA_BIOS_DGPU
+	bool "Add a discrete VGA BIOS image"
+	depends on VGA_BIOS
+	help
+	  Select this option if you have a VGA BIOS image for discrete GPU
+	  that you would like to add to your ROM.
+
+	  You will be able to specify the location and file name of the
+	  image later.
+
+config VGA_BIOS_DGPU_FILE
+	string "Discrete VGA BIOS path and filename"
+	depends on VGA_BIOS_DGPU
+	default "vgabios_dgpu.bin"
+	help
+	  The path and filename of the file to use as VGA BIOS for discrete GPU.
+
+config VGA_BIOS_DGPU_ID
+	string "Discrete VGA device PCI IDs"
+	depends on VGA_BIOS_DGPU
+	default "1002,6663"
+	help
+	  The comma-separated PCI vendor and device ID that would associate
+	  your VGA BIOS to your discrete video card.
+
+	  Examples:
+	      1002,6663 for HD 8570M
+	      1002,6665 for R5 M230
+
+	  In the above examples 1002 is the PCI vendor ID (in hex, but without
+	  the "0x" prefix) and 6663 / 6665 specifies the PCI device ID of the
+	  discrete video card (also in hex, without "0x" prefix).
+
+	  Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
+
 config INTEL_GMA_HAVE_VBT
    bool
    help