Hello Alexander Couzens,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/38921
to review the following change.
Change subject: [WIP] 3rdparty/libgfxinit: Update submodule pointer ......................................................................
[WIP] 3rdparty/libgfxinit: Update submodule pointer
Waiting for libgfxinit changes to land.
Changes allow to use the integrated panel logic (power sequencing and backlight control) for more connectors.
Change-Id: I78b1b458ca00714dcbe7753a7beb4fb05d69986b Signed-off-by: Nico Huber nico.huber@secunet.com --- M 3rdparty/libgfxinit M src/drivers/intel/gma/Kconfig 2 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/38921/1
diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit index fe7985f..b4ddd3c 160000 --- a/3rdparty/libgfxinit +++ b/3rdparty/libgfxinit @@ -1 +1 @@ -Subproject commit fe7985f2a0692bc773d470a92ec54d22d3c12e4b +Subproject commit b4ddd3c36516fc00fd55f12d0631ca6eee123039 diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig index 2071351..6c25aee 100644 --- a/src/drivers/intel/gma/Kconfig +++ b/src/drivers/intel/gma/Kconfig @@ -102,11 +102,15 @@ default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X
-config GFX_GMA_INTERNAL_PORT +config GFX_GMA_PANEL_1_PORT string - default "DP" if GFX_GMA_INTERNAL_IS_EDP + default "eDP" if GFX_GMA_INTERNAL_IS_EDP default "LVDS"
+config GFX_GMA_PANEL_2_PORT + string + default "" + config GFX_GMA_ANALOG_I2C_PORT string default "PCH_HDMI_B" if GFX_GMA_ANALOG_I2C_HDMI_B
Hello Alexander Couzens, Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38921
to look at the new patch set (#2).
Change subject: [WIP] 3rdparty/libgfxinit: Update submodule pointer ......................................................................
[WIP] 3rdparty/libgfxinit: Update submodule pointer
Waiting for libgfxinit changes to land.
Changes allow to use the integrated panel logic (power sequen- cing and backlight control) for more connectors. The Kconfigs GFX_GMA_PANEL_1_PORT and GFX_GMA_PANEL_2_PORT can now be set to any port, e.g.
config GFX_GMA_PANEL_1_PORT default "DP3"
Change-Id: I78b1b458ca00714dcbe7753a7beb4fb05d69986b Signed-off-by: Nico Huber nico.huber@secunet.com --- M 3rdparty/libgfxinit M src/drivers/intel/gma/Kconfig 2 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/38921/2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38921 )
Change subject: [WIP] 3rdparty/libgfxinit: Update submodule pointer ......................................................................
Patch Set 2: Code-Review+1
Hello build bot (Jenkins), Angel Pons, Alexander Couzens, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38921
to look at the new patch set (#3).
Change subject: 3rdparty/libgfxinit: Update submodule pointer ......................................................................
3rdparty/libgfxinit: Update submodule pointer
Changes allow to use the integrated panel logic (power sequen- cing and backlight control) for more connectors. The Kconfigs GFX_GMA_PANEL_1_PORT and GFX_GMA_PANEL_2_PORT can now be set to any port, e.g.
config GFX_GMA_PANEL_1_PORT default "DP3"
This also adds Comet Lake PCI IDs which should still work the same as Kaby and Coffee Lake.
Change-Id: I78b1b458ca00714dcbe7753a7beb4fb05d69986b Signed-off-by: Nico Huber nico.huber@secunet.com --- M 3rdparty/libgfxinit M src/drivers/intel/gma/Kconfig 2 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/38921/3
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38921 )
Change subject: 3rdparty/libgfxinit: Update submodule pointer ......................................................................
Patch Set 3:
Oops, looks like some updates are needed
Hello build bot (Jenkins), Angel Pons, Alexander Couzens, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38921
to look at the new patch set (#4).
Change subject: 3rdparty/libgfxinit: Update submodule pointer ......................................................................
3rdparty/libgfxinit: Update submodule pointer
Changes allow to use the integrated panel logic (power sequen- cing and backlight control) for more connectors. The Kconfigs GFX_GMA_PANEL_1_PORT and GFX_GMA_PANEL_2_PORT can now be set to any port, e.g.
config GFX_GMA_PANEL_1_PORT default "DP3"
Now that the panel logic is not tied to the `Internal` port choice anymore, we can properly split it into `LVDS` and `eDP`.
This also adds Comet Lake PCI IDs which should still work the same as Kaby and Coffee Lake.
Change-Id: I78b1b458ca00714dcbe7753a7beb4fb05d69986b Signed-off-by: Nico Huber nico.huber@secunet.com --- M 3rdparty/libgfxinit M Documentation/gfx/libgfxinit.md M src/drivers/intel/gma/Kconfig M src/drivers/intel/gma/libgfxinit.h M src/mainboard/apple/macbookair4_2/Kconfig M src/mainboard/apple/macbookair4_2/gma-mainboard.ads M src/mainboard/google/auron/gma-mainboard.ads M src/mainboard/google/butterfly/Kconfig M src/mainboard/google/butterfly/gma-mainboard.ads M src/mainboard/google/eve/gma-mainboard.ads M src/mainboard/google/glados/gma-mainboard.ads M src/mainboard/google/link/gma-mainboard.ads M src/mainboard/google/parrot/Kconfig M src/mainboard/google/parrot/gma-mainboard.ads M src/mainboard/google/poppy/gma-mainboard.ads M src/mainboard/google/slippy/gma-mainboard.ads M src/mainboard/google/stout/Kconfig M src/mainboard/google/stout/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/Kconfig.name M src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads M src/mainboard/intel/dg43gt/gma-mainboard.ads M src/mainboard/kontron/ktqm77/Kconfig M src/mainboard/kontron/ktqm77/gma-mainboard.ads M src/mainboard/lenovo/l520/Kconfig M src/mainboard/lenovo/l520/gma-mainboard.ads M src/mainboard/lenovo/s230u/Kconfig M src/mainboard/lenovo/s230u/gma-mainboard.ads M src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads M src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads M src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads M src/mainboard/lenovo/t410/gma-mainboard.ads M src/mainboard/lenovo/t420/Kconfig M src/mainboard/lenovo/t420/gma-mainboard.ads M src/mainboard/lenovo/t420s/Kconfig M src/mainboard/lenovo/t420s/gma-mainboard.ads M src/mainboard/lenovo/t430/Kconfig M src/mainboard/lenovo/t430/gma-mainboard.ads M src/mainboard/lenovo/t430s/Kconfig M src/mainboard/lenovo/t430s/Makefile.inc R src/mainboard/lenovo/t430s/variants/t430s/gma-mainboard.ads C src/mainboard/lenovo/t430s/variants/t431s/gma-mainboard.ads M src/mainboard/lenovo/t440p/gma-mainboard.ads M src/mainboard/lenovo/t520/Kconfig M src/mainboard/lenovo/t520/gma-mainboard.ads M src/mainboard/lenovo/t530/Kconfig M src/mainboard/lenovo/t530/gma-mainboard.ads M src/mainboard/lenovo/x131e/Kconfig M src/mainboard/lenovo/x131e/gma-mainboard.ads M src/mainboard/lenovo/x1_carbon_gen1/Kconfig M src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads M src/mainboard/lenovo/x200/gma-mainboard.ads M src/mainboard/lenovo/x201/gma-mainboard.ads M src/mainboard/lenovo/x220/Kconfig M src/mainboard/lenovo/x220/gma-mainboard.ads M src/mainboard/lenovo/x230/Kconfig M src/mainboard/lenovo/x230/gma-mainboard.ads M src/mainboard/packardbell/ms2290/gma-mainboard.ads M src/mainboard/purism/librem_bdw/gma-mainboard.ads M src/mainboard/purism/librem_skl/gma-mainboard.ads M src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads M src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads M src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads M src/mainboard/samsung/lumpy/Kconfig M src/mainboard/samsung/lumpy/gma-mainboard.ads M util/autoport/main.go 70 files changed, 125 insertions(+), 88 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/38921/4
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38921 )
Change subject: 3rdparty/libgfxinit: Update submodule pointer ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38921/4/src/drivers/intel/gma/Kconf... File src/drivers/intel/gma/Kconfig:
https://review.coreboot.org/c/coreboot/+/38921/4/src/drivers/intel/gma/Kconf... PS4, Line 112: "" This is what breaks everything
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38921 )
Change subject: 3rdparty/libgfxinit: Update submodule pointer ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38921/4/src/drivers/intel/gma/Kconf... File src/drivers/intel/gma/Kconfig:
https://review.coreboot.org/c/coreboot/+/38921/4/src/drivers/intel/gma/Kconf... PS4, Line 112: ""
This is what breaks everything
use "Disabled" instead, it builds on GA-H61M-DS2V
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Angel Pons, Evgeny Zinoviev, Alexander Couzens, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38921
to look at the new patch set (#5).
Change subject: 3rdparty/libgfxinit: Update submodule pointer ......................................................................
3rdparty/libgfxinit: Update submodule pointer
Changes allow to use the integrated panel logic (power sequen- cing and backlight control) for more connectors. The Kconfigs GFX_GMA_PANEL_1_PORT and GFX_GMA_PANEL_2_PORT can now be set to any port, e.g.
config GFX_GMA_PANEL_1_PORT default "DP3"
Now that the panel logic is not tied to the `Internal` port choice anymore, we can properly split it into `LVDS` and `eDP`.
This also adds Comet Lake PCI IDs which should still work the same as Kaby and Coffee Lake.
Change-Id: I78b1b458ca00714dcbe7753a7beb4fb05d69986b Signed-off-by: Nico Huber nico.huber@secunet.com --- M 3rdparty/libgfxinit M Documentation/gfx/libgfxinit.md M src/drivers/intel/gma/Kconfig M src/drivers/intel/gma/libgfxinit.h M src/mainboard/apple/macbookair4_2/Kconfig M src/mainboard/apple/macbookair4_2/gma-mainboard.ads M src/mainboard/google/auron/gma-mainboard.ads M src/mainboard/google/butterfly/Kconfig M src/mainboard/google/butterfly/gma-mainboard.ads M src/mainboard/google/eve/gma-mainboard.ads M src/mainboard/google/glados/gma-mainboard.ads M src/mainboard/google/link/gma-mainboard.ads M src/mainboard/google/parrot/Kconfig M src/mainboard/google/parrot/gma-mainboard.ads M src/mainboard/google/poppy/gma-mainboard.ads M src/mainboard/google/slippy/gma-mainboard.ads M src/mainboard/google/stout/Kconfig M src/mainboard/google/stout/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/Kconfig.name M src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads M src/mainboard/intel/dg43gt/gma-mainboard.ads M src/mainboard/kontron/ktqm77/Kconfig M src/mainboard/kontron/ktqm77/gma-mainboard.ads M src/mainboard/lenovo/l520/Kconfig M src/mainboard/lenovo/l520/gma-mainboard.ads M src/mainboard/lenovo/s230u/Kconfig M src/mainboard/lenovo/s230u/gma-mainboard.ads M src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads M src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads M src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads M src/mainboard/lenovo/t410/gma-mainboard.ads M src/mainboard/lenovo/t420/Kconfig M src/mainboard/lenovo/t420/gma-mainboard.ads M src/mainboard/lenovo/t420s/Kconfig M src/mainboard/lenovo/t420s/gma-mainboard.ads M src/mainboard/lenovo/t430/Kconfig M src/mainboard/lenovo/t430/gma-mainboard.ads M src/mainboard/lenovo/t430s/Kconfig M src/mainboard/lenovo/t430s/Makefile.inc R src/mainboard/lenovo/t430s/variants/t430s/gma-mainboard.ads C src/mainboard/lenovo/t430s/variants/t431s/gma-mainboard.ads M src/mainboard/lenovo/t440p/gma-mainboard.ads M src/mainboard/lenovo/t520/Kconfig M src/mainboard/lenovo/t520/gma-mainboard.ads M src/mainboard/lenovo/t530/Kconfig M src/mainboard/lenovo/t530/gma-mainboard.ads M src/mainboard/lenovo/x131e/Kconfig M src/mainboard/lenovo/x131e/gma-mainboard.ads M src/mainboard/lenovo/x1_carbon_gen1/Kconfig M src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads M src/mainboard/lenovo/x200/gma-mainboard.ads M src/mainboard/lenovo/x201/gma-mainboard.ads M src/mainboard/lenovo/x220/Kconfig M src/mainboard/lenovo/x220/gma-mainboard.ads M src/mainboard/lenovo/x230/Kconfig M src/mainboard/lenovo/x230/gma-mainboard.ads M src/mainboard/packardbell/ms2290/gma-mainboard.ads M src/mainboard/purism/librem_bdw/gma-mainboard.ads M src/mainboard/purism/librem_skl/gma-mainboard.ads M src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads M src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads M src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads M src/mainboard/samsung/lumpy/Kconfig M src/mainboard/samsung/lumpy/gma-mainboard.ads M util/autoport/main.go 70 files changed, 125 insertions(+), 88 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/38921/5
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38921 )
Change subject: 3rdparty/libgfxinit: Update submodule pointer ......................................................................
Patch Set 5: Code-Review+2
(1 comment)
If it builds...
https://review.coreboot.org/c/coreboot/+/38921/4/src/drivers/intel/gma/Kconf... File src/drivers/intel/gma/Kconfig:
https://review.coreboot.org/c/coreboot/+/38921/4/src/drivers/intel/gma/Kconf... PS4, Line 112: ""
use "Disabled" instead, it builds on GA-H61M-DS2V
Done
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38921 )
Change subject: 3rdparty/libgfxinit: Update submodule pointer ......................................................................
3rdparty/libgfxinit: Update submodule pointer
Changes allow to use the integrated panel logic (power sequen- cing and backlight control) for more connectors. The Kconfigs GFX_GMA_PANEL_1_PORT and GFX_GMA_PANEL_2_PORT can now be set to any port, e.g.
config GFX_GMA_PANEL_1_PORT default "DP3"
Now that the panel logic is not tied to the `Internal` port choice anymore, we can properly split it into `LVDS` and `eDP`.
This also adds Comet Lake PCI IDs which should still work the same as Kaby and Coffee Lake.
Change-Id: I78b1b458ca00714dcbe7753a7beb4fb05d69986b Signed-off-by: Nico Huber nico.huber@secunet.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38921 Reviewed-by: Angel Pons th3fanbus@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M 3rdparty/libgfxinit M Documentation/gfx/libgfxinit.md M src/drivers/intel/gma/Kconfig M src/drivers/intel/gma/libgfxinit.h M src/mainboard/apple/macbookair4_2/Kconfig M src/mainboard/apple/macbookair4_2/gma-mainboard.ads M src/mainboard/google/auron/gma-mainboard.ads M src/mainboard/google/butterfly/Kconfig M src/mainboard/google/butterfly/gma-mainboard.ads M src/mainboard/google/eve/gma-mainboard.ads M src/mainboard/google/glados/gma-mainboard.ads M src/mainboard/google/link/gma-mainboard.ads M src/mainboard/google/parrot/Kconfig M src/mainboard/google/parrot/gma-mainboard.ads M src/mainboard/google/poppy/gma-mainboard.ads M src/mainboard/google/slippy/gma-mainboard.ads M src/mainboard/google/stout/Kconfig M src/mainboard/google/stout/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/Kconfig.name M src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads M src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads M src/mainboard/intel/dg43gt/gma-mainboard.ads M src/mainboard/kontron/ktqm77/Kconfig M src/mainboard/kontron/ktqm77/gma-mainboard.ads M src/mainboard/lenovo/l520/Kconfig M src/mainboard/lenovo/l520/gma-mainboard.ads M src/mainboard/lenovo/s230u/Kconfig M src/mainboard/lenovo/s230u/gma-mainboard.ads M src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads M src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads M src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads M src/mainboard/lenovo/t410/gma-mainboard.ads M src/mainboard/lenovo/t420/Kconfig M src/mainboard/lenovo/t420/gma-mainboard.ads M src/mainboard/lenovo/t420s/Kconfig M src/mainboard/lenovo/t420s/gma-mainboard.ads M src/mainboard/lenovo/t430/Kconfig M src/mainboard/lenovo/t430/gma-mainboard.ads M src/mainboard/lenovo/t430s/Kconfig M src/mainboard/lenovo/t430s/Makefile.inc R src/mainboard/lenovo/t430s/variants/t430s/gma-mainboard.ads C src/mainboard/lenovo/t430s/variants/t431s/gma-mainboard.ads M src/mainboard/lenovo/t440p/gma-mainboard.ads M src/mainboard/lenovo/t520/Kconfig M src/mainboard/lenovo/t520/gma-mainboard.ads M src/mainboard/lenovo/t530/Kconfig M src/mainboard/lenovo/t530/gma-mainboard.ads M src/mainboard/lenovo/x131e/Kconfig M src/mainboard/lenovo/x131e/gma-mainboard.ads M src/mainboard/lenovo/x1_carbon_gen1/Kconfig M src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads M src/mainboard/lenovo/x200/gma-mainboard.ads M src/mainboard/lenovo/x201/gma-mainboard.ads M src/mainboard/lenovo/x220/Kconfig M src/mainboard/lenovo/x220/gma-mainboard.ads M src/mainboard/lenovo/x230/Kconfig M src/mainboard/lenovo/x230/gma-mainboard.ads M src/mainboard/packardbell/ms2290/gma-mainboard.ads M src/mainboard/purism/librem_bdw/gma-mainboard.ads M src/mainboard/purism/librem_skl/gma-mainboard.ads M src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads M src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads M src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads M src/mainboard/samsung/lumpy/Kconfig M src/mainboard/samsung/lumpy/gma-mainboard.ads M util/autoport/main.go 70 files changed, 125 insertions(+), 88 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit index fe7985f..cdbfce2 160000 --- a/3rdparty/libgfxinit +++ b/3rdparty/libgfxinit @@ -1 +1 @@ -Subproject commit fe7985f2a0692bc773d470a92ec54d22d3c12e4b +Subproject commit cdbfce275777f2fd142e3a3c73469807a4c40207 diff --git a/Documentation/gfx/libgfxinit.md b/Documentation/gfx/libgfxinit.md index 0608363..bb4528b 100644 --- a/Documentation/gfx/libgfxinit.md +++ b/Documentation/gfx/libgfxinit.md @@ -65,11 +65,20 @@ select MAINBOARD_HAS_LIBGFXINIT
Internal ports share some hardware blocks (e.g. backlight, panel -power sequencer). Therefore, each board has to select either eDP -or LVDS as the internal port, if any: +power sequencer). Therefore, each system with an integrated panel +should set `GFX_GMA_PANEL_1_PORT` to the respective port, e.g.:
- select GFX_GMA_INTERNAL_IS_EDP # the default, or - select GFX_GMA_INTERNAL_IS_LVDS + config GFX_GMA_PANEL_1_PORT + default "DP3" + +For the most common cases, LVDS and eDP, exists a shorthand, one +can select either: + + select GFX_GMA_PANEL_1_ON_EDP # the default, or + select GFX_GMA_PANEL_1_ON_LVDS + +Some newer chips feature a second block of panel control logic. +For this, `GFX_GMA_PANEL_2_PORT` can be set.
Boards with a DVI-I connector share the DDC (I2C) pins for both analog and digital displays. In this case, *libgfxinit* needs to @@ -96,7 +105,8 @@
type Port_Type is (Disabled, -- optionally terminates the list - Internal, -- either eDP or LVDS as selected in Kconfig + LVDS, + eDP, DP1, DP2, DP3, @@ -112,8 +122,7 @@
A good example is the mainboard Kontron/KTQM77, it features two DP++ ports (DP2/HDMI2, DP3/HDMI3), one DVI-I port (HDMI1/Analog), -eDP and LVDS. Due to the constraints mentioned above, only one of -eDP and LVDS can be enabled. It defines `ports` as follows: +eDP and LVDS. It defines `ports` as follows:
ports : constant Port_List := (DP2, @@ -122,7 +131,8 @@ HDMI2, HDMI3, Analog, - Internal, + LVDS, + eDP, others => Disabled);
The `GMA.gfxinit()` procedure probes for display EDIDs in the diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig index 2071351..d57faa0 100644 --- a/src/drivers/intel/gma/Kconfig +++ b/src/drivers/intel/gma/Kconfig @@ -74,13 +74,13 @@ depends on MAINBOARD_USE_LIBGFXINIT || INTEL_GMA_LIBGFXINIT_EDID select RAMSTAGE_LIBHWBASE
-config GFX_GMA_INTERNAL_IS_EDP +config GFX_GMA_PANEL_1_ON_EDP bool depends on GFX_GMA || MAINBOARD_HAS_LIBGFXINIT - default n if GFX_GMA_INTERNAL_IS_LVDS + default n if GFX_GMA_PANEL_1_ON_LVDS default y
-config GFX_GMA_INTERNAL_IS_LVDS +config GFX_GMA_PANEL_1_ON_LVDS bool depends on GFX_GMA || MAINBOARD_HAS_LIBGFXINIT default y if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_NEHALEM @@ -102,11 +102,15 @@ default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X
-config GFX_GMA_INTERNAL_PORT +config GFX_GMA_PANEL_1_PORT string - default "DP" if GFX_GMA_INTERNAL_IS_EDP + default "eDP" if GFX_GMA_PANEL_1_ON_EDP default "LVDS"
+config GFX_GMA_PANEL_2_PORT + string + default "Disabled" + config GFX_GMA_ANALOG_I2C_PORT string default "PCH_HDMI_B" if GFX_GMA_ANALOG_I2C_HDMI_B diff --git a/src/drivers/intel/gma/libgfxinit.h b/src/drivers/intel/gma/libgfxinit.h index c4a8a5b..7a00b5c 100644 --- a/src/drivers/intel/gma/libgfxinit.h +++ b/src/drivers/intel/gma/libgfxinit.h @@ -16,7 +16,8 @@
enum { GMA_PORT_DISABLED, - GMA_PORT_INTERNAL, + GMA_PORT_LVDS, + GMA_PORT_EDP, GMA_PORT_DP1, GMA_PORT_DP2, GMA_PORT_DP3, diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig index 627b421..2f48e50 100644 --- a/src/mainboard/apple/macbookair4_2/Kconfig +++ b/src/mainboard/apple/macbookair4_2/Kconfig @@ -12,7 +12,7 @@ select SERIRQ_CONTINUOUS_MODE select SOUTHBRIDGE_INTEL_BD82X6X select SYSTEM_TYPE_LAPTOP - select GFX_GMA_INTERNAL_IS_EDP + select GFX_GMA_PANEL_1_ON_EDP select MAINBOARD_HAS_LIBGFXINIT select HAVE_CMOS_DEFAULT select HAVE_OPTION_TABLE diff --git a/src/mainboard/apple/macbookair4_2/gma-mainboard.ads b/src/mainboard/apple/macbookair4_2/gma-mainboard.ads index e45320f..64f6981 100644 --- a/src/mainboard/apple/macbookair4_2/gma-mainboard.ads +++ b/src/mainboard/apple/macbookair4_2/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + eDP, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/google/auron/gma-mainboard.ads b/src/mainboard/google/auron/gma-mainboard.ads index d110261..79ca007 100644 --- a/src/mainboard/google/auron/gma-mainboard.ads +++ b/src/mainboard/google/auron/gma-mainboard.ads @@ -21,7 +21,7 @@ private package GMA.Mainboard is
ports : constant Port_List := - (Internal, + (eDP, HDMI1, DP1, DP2, diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index 33a840f..4e01455 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -18,7 +18,7 @@ select SERIRQ_CONTINUOUS_MODE # Workaround for EC/KBC IRQ1. select HAVE_IFD_BIN select HAVE_ME_BIN - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select MAINBOARD_HAS_LIBGFXINIT select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
diff --git a/src/mainboard/google/butterfly/gma-mainboard.ads b/src/mainboard/google/butterfly/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/google/butterfly/gma-mainboard.ads +++ b/src/mainboard/google/butterfly/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/google/eve/gma-mainboard.ads b/src/mainboard/google/eve/gma-mainboard.ads index 87cdb5e..52f6783 100644 --- a/src/mainboard/google/eve/gma-mainboard.ads +++ b/src/mainboard/google/eve/gma-mainboard.ads @@ -21,7 +21,7 @@ private package GMA.Mainboard is
ports : constant Port_List := - (Internal, + (eDP, DP1, DP2, HDMI1, diff --git a/src/mainboard/google/glados/gma-mainboard.ads b/src/mainboard/google/glados/gma-mainboard.ads index 87cdb5e..52f6783 100644 --- a/src/mainboard/google/glados/gma-mainboard.ads +++ b/src/mainboard/google/glados/gma-mainboard.ads @@ -21,7 +21,7 @@ private package GMA.Mainboard is
ports : constant Port_List := - (Internal, + (eDP, DP1, DP2, HDMI1, diff --git a/src/mainboard/google/link/gma-mainboard.ads b/src/mainboard/google/link/gma-mainboard.ads index 4173725..fae0b5b 100644 --- a/src/mainboard/google/link/gma-mainboard.ads +++ b/src/mainboard/google/link/gma-mainboard.ads @@ -17,7 +17,7 @@ private package GMA.Mainboard is
ports : constant Port_List := - (Internal, + (eDP, DP3, HDMI3, others => Disabled); diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index c5b680c..4afd761 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -19,7 +19,7 @@ # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE # This board also feature sandy-bridge CPU's so must have LVDS - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select MAINBOARD_HAS_LIBGFXINIT select SANDYBRIDGE_VBOOT_IN_ROMSTAGE
diff --git a/src/mainboard/google/parrot/gma-mainboard.ads b/src/mainboard/google/parrot/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/google/parrot/gma-mainboard.ads +++ b/src/mainboard/google/parrot/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/google/poppy/gma-mainboard.ads b/src/mainboard/google/poppy/gma-mainboard.ads index 87cdb5e..52f6783 100644 --- a/src/mainboard/google/poppy/gma-mainboard.ads +++ b/src/mainboard/google/poppy/gma-mainboard.ads @@ -21,7 +21,7 @@ private package GMA.Mainboard is
ports : constant Port_List := - (Internal, + (eDP, DP1, DP2, HDMI1, diff --git a/src/mainboard/google/slippy/gma-mainboard.ads b/src/mainboard/google/slippy/gma-mainboard.ads index cd5e2f5..e362f89 100644 --- a/src/mainboard/google/slippy/gma-mainboard.ads +++ b/src/mainboard/google/slippy/gma-mainboard.ads @@ -22,7 +22,7 @@
ports : constant Port_List := (HDMI1, - Internal, + eDP, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index f945cc0..b0ab7f9 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -16,7 +16,7 @@ select MAINBOARD_HAS_TPM1 select INTEL_INT15 select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select HAVE_IFD_BIN select HAVE_ME_BIN select SANDYBRIDGE_VBOOT_IN_ROMSTAGE diff --git a/src/mainboard/google/stout/gma-mainboard.ads b/src/mainboard/google/stout/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/google/stout/gma-mainboard.ads +++ b/src/mainboard/google/stout/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name index 3c95e85..c4a8662 100644 --- a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name +++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name @@ -18,7 +18,7 @@
select BOARD_HP_SNB_IVB_LAPTOPS select BOARD_ROMSIZE_KB_16384 - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_INT15 select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_USES_IFD_GBE_REGION @@ -29,7 +29,7 @@
select BOARD_HP_SNB_IVB_LAPTOPS select BOARD_ROMSIZE_KB_8192 - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_INT15 select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_USES_IFD_GBE_REGION @@ -40,7 +40,7 @@
select BOARD_HP_SNB_IVB_LAPTOPS select BOARD_ROMSIZE_KB_8192 - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_INT15 select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_LPC_TPM @@ -54,7 +54,7 @@
select BOARD_HP_SNB_IVB_LAPTOPS select BOARD_ROMSIZE_KB_16384 - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_INT15 select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_USES_IFD_GBE_REGION @@ -75,7 +75,7 @@
select BOARD_HP_SNB_IVB_LAPTOPS select BOARD_ROMSIZE_KB_16384 - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_GMA_HAVE_VBT select INTEL_INT15 select MAINBOARD_HAS_LIBGFXINIT @@ -89,7 +89,7 @@ select BOARD_HP_SNB_IVB_LAPTOPS select BOARD_ROMSIZE_KB_16384 select GENERIC_SPD_BIN - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_INT15 select INTEL_GMA_HAVE_VBT select MAINBOARD_USES_IFD_GBE_REGION diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads index 1944a24..a272d3e 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads +++ b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/gma-mainboard.ads @@ -26,7 +26,7 @@ HDMI1, HDMI3, Analog, - Internal, + LVDS, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads index 430720a..bad712b 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads +++ b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/gma-mainboard.ads @@ -24,7 +24,7 @@ (DP1, HDMI1, Analog, - Internal, + LVDS, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads index 01ae99a..fe4efa2 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads +++ b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads index 01ae99a..fe4efa2 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads +++ b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads +++ b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads index 01ae99a..fe4efa2 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads +++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/intel/dg43gt/gma-mainboard.ads b/src/mainboard/intel/dg43gt/gma-mainboard.ads index 7dab160..43a7d89 100644 --- a/src/mainboard/intel/dg43gt/gma-mainboard.ads +++ b/src/mainboard/intel/dg43gt/gma-mainboard.ads @@ -24,7 +24,6 @@ (HDMI1, HDMI2, Analog, - Internal, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig index 77775e6..a67fa9e 100644 --- a/src/mainboard/kontron/ktqm77/Kconfig +++ b/src/mainboard/kontron/ktqm77/Kconfig @@ -12,7 +12,7 @@ select HAVE_ACPI_RESUME select MAINBOARD_HAS_LIBGFXINIT select GFX_GMA_ANALOG_I2C_HDMI_B - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select MAINBOARD_USES_IFD_GBE_REGION
config MAINBOARD_DIR diff --git a/src/mainboard/kontron/ktqm77/gma-mainboard.ads b/src/mainboard/kontron/ktqm77/gma-mainboard.ads index 66ce273..3ac3cd2 100644 --- a/src/mainboard/kontron/ktqm77/gma-mainboard.ads +++ b/src/mainboard/kontron/ktqm77/gma-mainboard.ads @@ -21,7 +21,7 @@
-- For a three-pipe setup, bandwidth is shared between the 2nd and -- the 3rd pipe (if it's not eDP). Thus, probe ports that likely - -- have a high-resolution display attached first, `Internal` last. + -- have a high-resolution display attached first, `eDP` last.
ports : constant Port_List := (DP2, @@ -30,7 +30,8 @@ HDMI2, HDMI3, Analog, - Internal, + LVDS, + eDP, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig index a300d16..6716606 100644 --- a/src/mainboard/lenovo/l520/Kconfig +++ b/src/mainboard/lenovo/l520/Kconfig @@ -12,7 +12,7 @@ select HAVE_CMOS_DEFAULT select NORTHBRIDGE_INTEL_SANDYBRIDGE select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select SERIRQ_CONTINUOUS_MODE select SOUTHBRIDGE_INTEL_BD82X6X select SYSTEM_TYPE_LAPTOP diff --git a/src/mainboard/lenovo/l520/gma-mainboard.ads b/src/mainboard/lenovo/l520/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/lenovo/l520/gma-mainboard.ads +++ b/src/mainboard/lenovo/l520/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig index 662c9a5..1248906 100644 --- a/src/mainboard/lenovo/s230u/Kconfig +++ b/src/mainboard/lenovo/s230u/Kconfig @@ -14,7 +14,7 @@ select HAVE_ACPI_RESUME select INTEL_INT15 select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select SERIRQ_CONTINUOUS_MODE select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 diff --git a/src/mainboard/lenovo/s230u/gma-mainboard.ads b/src/mainboard/lenovo/s230u/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/lenovo/s230u/gma-mainboard.ads +++ b/src/mainboard/lenovo/s230u/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads b/src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads index 8a72a31..3623d62 100644 --- a/src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads +++ b/src/mainboard/lenovo/t400/variants/r500/gma-mainboard.ads @@ -24,7 +24,7 @@ (DP1, HDMI1, Analog, - Internal, + LVDS, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads b/src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads index 71d1600..9bf6352 100644 --- a/src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads +++ b/src/mainboard/lenovo/t400/variants/t400/coronado-5/gma-mainboard.ads @@ -26,7 +26,7 @@ DP2, HDMI2, Analog, - Internal, + LVDS, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads b/src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads index 92702b2..9ab80b5 100644 --- a/src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads +++ b/src/mainboard/lenovo/t400/variants/t400/malibu-3/gma-mainboard.ads @@ -24,7 +24,7 @@ (DP2, HDMI2, Analog, - Internal, + LVDS, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t410/gma-mainboard.ads b/src/mainboard/lenovo/t410/gma-mainboard.ads index 9c2a3cb..b75db6c 100644 --- a/src/mainboard/lenovo/t410/gma-mainboard.ads +++ b/src/mainboard/lenovo/t410/gma-mainboard.ads @@ -24,7 +24,7 @@ (DP2, -- DP++ connector on the dock HDMI2, Analog, - Internal, + LVDS, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index d26ad17..7c715ed 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/src/mainboard/lenovo/t420/Kconfig @@ -20,7 +20,7 @@ select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select DRIVERS_LENOVO_HYBRID_GRAPHICS select INTEL_GMA_HAVE_VBT select MAINBOARD_USES_IFD_GBE_REGION diff --git a/src/mainboard/lenovo/t420/gma-mainboard.ads b/src/mainboard/lenovo/t420/gma-mainboard.ads index a19bf33..eb0936d 100644 --- a/src/mainboard/lenovo/t420/gma-mainboard.ads +++ b/src/mainboard/lenovo/t420/gma-mainboard.ads @@ -27,6 +27,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index 89f84fc..6af93ac 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -17,7 +17,7 @@ select HAVE_ACPI_RESUME select INTEL_INT15 select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select DRIVERS_LENOVO_HYBRID_GRAPHICS diff --git a/src/mainboard/lenovo/t420s/gma-mainboard.ads b/src/mainboard/lenovo/t420s/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/lenovo/t420s/gma-mainboard.ads +++ b/src/mainboard/lenovo/t420s/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig index a73a1b2..009377d 100644 --- a/src/mainboard/lenovo/t430/Kconfig +++ b/src/mainboard/lenovo/t430/Kconfig @@ -22,7 +22,7 @@ select USE_NATIVE_RAMINIT select DRIVERS_LENOVO_HYBRID_GRAPHICS select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_GMA_HAVE_VBT select MAINBOARD_USES_IFD_GBE_REGION
diff --git a/src/mainboard/lenovo/t430/gma-mainboard.ads b/src/mainboard/lenovo/t430/gma-mainboard.ads index a19bf33..eb0936d 100644 --- a/src/mainboard/lenovo/t430/gma-mainboard.ads +++ b/src/mainboard/lenovo/t430/gma-mainboard.ads @@ -27,6 +27,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index 5162e05..3ed0d0e 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -19,7 +19,7 @@ select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS if BOARD_LENOVO_T430S + select GFX_GMA_PANEL_1_ON_LVDS if BOARD_LENOVO_T430S select INTEL_GMA_HAVE_VBT select MAINBOARD_USES_IFD_GBE_REGION select DRIVERS_RICOH_RCE822 if BOARD_LENOVO_T431S diff --git a/src/mainboard/lenovo/t430s/Makefile.inc b/src/mainboard/lenovo/t430s/Makefile.inc index 425047f..d9f54d5 100644 --- a/src/mainboard/lenovo/t430s/Makefile.inc +++ b/src/mainboard/lenovo/t430s/Makefile.inc @@ -18,5 +18,5 @@ romstage-y += variants/$(VARIANT_DIR)/gpio.c romstage-y += variants/$(VARIANT_DIR)/romstage.c ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads subdirs-$(CONFIG_BOARD_LENOVO_T431S) += variants/$(VARIANT_DIR)/spd diff --git a/src/mainboard/lenovo/t430s/gma-mainboard.ads b/src/mainboard/lenovo/t430s/variants/t430s/gma-mainboard.ads similarity index 95% rename from src/mainboard/lenovo/t430s/gma-mainboard.ads rename to src/mainboard/lenovo/t430s/variants/t430s/gma-mainboard.ads index 8cf5d2f..61793e2 100644 --- a/src/mainboard/lenovo/t430s/gma-mainboard.ads +++ b/src/mainboard/lenovo/t430s/variants/t430s/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t430s/gma-mainboard.ads b/src/mainboard/lenovo/t430s/variants/t431s/gma-mainboard.ads similarity index 95% copy from src/mainboard/lenovo/t430s/gma-mainboard.ads copy to src/mainboard/lenovo/t430s/variants/t431s/gma-mainboard.ads index 8cf5d2f..4cc7433 100644 --- a/src/mainboard/lenovo/t430s/gma-mainboard.ads +++ b/src/mainboard/lenovo/t430s/variants/t431s/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + eDP, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t440p/gma-mainboard.ads b/src/mainboard/lenovo/t440p/gma-mainboard.ads index d36cb82..1626f88 100644 --- a/src/mainboard/lenovo/t440p/gma-mainboard.ads +++ b/src/mainboard/lenovo/t440p/gma-mainboard.ads @@ -24,7 +24,7 @@ (DP1, -- MiniDP DP2, -- dock, DP2-1 (DP/HDMI) and DP2-2 (DP/DVI) Analog, - Internal, + eDP, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index 6d31be2..a628adc 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -14,7 +14,7 @@ select HAVE_CMOS_DEFAULT select HAVE_ACPI_RESUME select INTEL_INT15 - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 diff --git a/src/mainboard/lenovo/t520/gma-mainboard.ads b/src/mainboard/lenovo/t520/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/lenovo/t520/gma-mainboard.ads +++ b/src/mainboard/lenovo/t520/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 233d4d3..bef0dee 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -18,7 +18,7 @@ select MAINBOARD_HAS_TPM1 select DRIVERS_LENOVO_HYBRID_GRAPHICS select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_GMA_HAVE_VBT select MAINBOARD_USES_IFD_GBE_REGION select DRIVERS_RICOH_RCE822 if BOARD_LENOVO_W530 diff --git a/src/mainboard/lenovo/t530/gma-mainboard.ads b/src/mainboard/lenovo/t530/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/lenovo/t530/gma-mainboard.ads +++ b/src/mainboard/lenovo/t530/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig index 352be84..29fda10 100644 --- a/src/mainboard/lenovo/x131e/Kconfig +++ b/src/mainboard/lenovo/x131e/Kconfig @@ -17,7 +17,7 @@ select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select SERIRQ_CONTINUOUS_MODE select INTEL_GMA_HAVE_VBT
diff --git a/src/mainboard/lenovo/x131e/gma-mainboard.ads b/src/mainboard/lenovo/x131e/gma-mainboard.ads index 2df96b5..cd3b98d 100644 --- a/src/mainboard/lenovo/x131e/gma-mainboard.ads +++ b/src/mainboard/lenovo/x131e/gma-mainboard.ads @@ -22,7 +22,7 @@ ports : constant Port_List := (HDMI1, Analog, - Internal, + LVDS, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig index f49805c..830ace4 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig +++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig @@ -20,7 +20,7 @@ select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_GMA_HAVE_VBT
# Workaround for EC/KBC IRQ1. diff --git a/src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads b/src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads index 99d0a28..c9a3d47 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads +++ b/src/mainboard/lenovo/x1_carbon_gen1/gma-mainboard.ads @@ -25,7 +25,7 @@ HDMI1, HDMI2, HDMI3, - Internal, + LVDS, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/x200/gma-mainboard.ads b/src/mainboard/lenovo/x200/gma-mainboard.ads index 92702b2..9ab80b5 100644 --- a/src/mainboard/lenovo/x200/gma-mainboard.ads +++ b/src/mainboard/lenovo/x200/gma-mainboard.ads @@ -24,7 +24,7 @@ (DP2, HDMI2, Analog, - Internal, + LVDS, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/x201/gma-mainboard.ads b/src/mainboard/lenovo/x201/gma-mainboard.ads index 9c2a3cb..b75db6c 100644 --- a/src/mainboard/lenovo/x201/gma-mainboard.ads +++ b/src/mainboard/lenovo/x201/gma-mainboard.ads @@ -24,7 +24,7 @@ (DP2, -- DP++ connector on the dock HDMI2, Analog, - Internal, + LVDS, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index b20255e..7c4754d 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -19,7 +19,7 @@ select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_GMA_HAVE_VBT select MAINBOARD_USES_IFD_GBE_REGION
diff --git a/src/mainboard/lenovo/x220/gma-mainboard.ads b/src/mainboard/lenovo/x220/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/lenovo/x220/gma-mainboard.ads +++ b/src/mainboard/lenovo/x220/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 73dfdf6..b25d7cf 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -20,7 +20,7 @@ select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select INTEL_GMA_HAVE_VBT select MAINBOARD_USES_IFD_GBE_REGION
diff --git a/src/mainboard/lenovo/x230/gma-mainboard.ads b/src/mainboard/lenovo/x230/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/lenovo/x230/gma-mainboard.ads +++ b/src/mainboard/lenovo/x230/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/packardbell/ms2290/gma-mainboard.ads b/src/mainboard/packardbell/ms2290/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/packardbell/ms2290/gma-mainboard.ads +++ b/src/mainboard/packardbell/ms2290/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/purism/librem_bdw/gma-mainboard.ads b/src/mainboard/purism/librem_bdw/gma-mainboard.ads index 1aba615..750e46e 100644 --- a/src/mainboard/purism/librem_bdw/gma-mainboard.ads +++ b/src/mainboard/purism/librem_bdw/gma-mainboard.ads @@ -21,7 +21,7 @@ private package GMA.Mainboard is
ports : constant Port_List := - (Internal, + (eDP, HDMI1, others => Disabled);
diff --git a/src/mainboard/purism/librem_skl/gma-mainboard.ads b/src/mainboard/purism/librem_skl/gma-mainboard.ads index 1aba615..750e46e 100644 --- a/src/mainboard/purism/librem_skl/gma-mainboard.ads +++ b/src/mainboard/purism/librem_skl/gma-mainboard.ads @@ -21,7 +21,7 @@ private package GMA.Mainboard is
ports : constant Port_List := - (Internal, + (eDP, HDMI1, others => Disabled);
diff --git a/src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads b/src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads index 4d55f2c..82c66e0 100644 --- a/src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads +++ b/src/mainboard/razer/blade_stealth_kbl/gma-mainboard.ads @@ -21,7 +21,7 @@ private package GMA.Mainboard is
ports : constant Port_List := - (Internal, + (eDP, DP1, DP2, HDMI1, diff --git a/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads b/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads index c9d6a75..bde759f 100644 --- a/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads +++ b/src/mainboard/roda/rv11/variants/rv11/gma-mainboard.ads @@ -20,6 +20,6 @@
private package GMA.Mainboard is
- ports : constant Port_List := (Internal, HDMI3, others => Disabled); + ports : constant Port_List := (eDP, HDMI3, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads b/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads index 5f1bf50..fe74875 100644 --- a/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads +++ b/src/mainboard/roda/rv11/variants/rw11/gma-mainboard.ads @@ -22,7 +22,7 @@
-- For a three-pipe setup, bandwidth is shared between the 2nd and -- the 3rd pipe (if it's not eDP). Thus, probe ports that likely - -- have a high-resolution display attached first, `Internal` last. + -- have a high-resolution display attached first, `eDP` last.
ports : constant Port_List := (DP2, @@ -30,7 +30,7 @@ HDMI2, HDMI3, Analog, - Internal, + eDP, others => Disabled);
end GMA.Mainboard; diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 56304c9..6e72921 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -13,7 +13,7 @@ select HAVE_OPTION_TABLE select NORTHBRIDGE_INTEL_SANDYBRIDGE select MAINBOARD_HAS_LIBGFXINIT - select GFX_GMA_INTERNAL_IS_LVDS + select GFX_GMA_PANEL_1_ON_LVDS select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_SMSC_MEC1308 select HAVE_IFD_BIN diff --git a/src/mainboard/samsung/lumpy/gma-mainboard.ads b/src/mainboard/samsung/lumpy/gma-mainboard.ads index e45320f..105b231 100644 --- a/src/mainboard/samsung/lumpy/gma-mainboard.ads +++ b/src/mainboard/samsung/lumpy/gma-mainboard.ads @@ -28,6 +28,7 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + others => Disabled);
end GMA.Mainboard; diff --git a/util/autoport/main.go b/util/autoport/main.go index dbd8913..e3c3fdf 100644 --- a/util/autoport/main.go +++ b/util/autoport/main.go @@ -931,7 +931,8 @@ HDMI2, HDMI3, Analog, - Internal); + LVDS, + eDP);
end GMA.Mainboard; `)