[coreboot-gerrit] Patch set updated for coreboot: drivers/lenovo: Add hybrid graphics driver
Patrick Rudolph (siro@das-labor.org)
gerrit at coreboot.org
Thu Apr 21 10:24:49 CEST 2016
Patrick Rudolph (siro at das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12896
-gerrit
commit 9d003f14b1d997f6600e061ef7719a0bb914956f
Author: Patrick Rudolph <siro at das-labor.org>
Date: Sat Dec 26 08:35:08 2015 +0100
drivers/lenovo: Add hybrid graphics driver
Add a universal hybrid graphics driver compatible with
all supported lenovo devices.
Hybrid graphics allows to connect the display panel to
either of one GPUs.
As there are only two GPUs one GPIO needs to be toggled.
In case the discrete GPU is activated the panel is routed to it.
On deactivation the panel is routed to the integrated
GPU.
On lenovo laptops the dGPU is always connected to PEG10 and it is
save to disable the PEG slot on dGPU deactivation.
Use common gpio.c for southbridge I82801IX.
Tested on Lenovo T520 using Nvidia NVS 5200m.
Depends on change id:
I97418f421fb1e525752c32ba886c7c78e8d3aa24
Ie37ec4aeae8ab49fe8e26438c430911d1815551c
Iccc6d254bafb927b6470704cec7c9dd7528e2c68
Ibb54c03fd83a529d1ceccfb2c33190e7d42224d8
I8bd981c4696c174152cf41caefa6c083650d283a
Iaf0c2f941f2625a5547f9cba79da1b173da6f295
I994114734fa931926c34ed04305cddfbeb429b62
Change-Id: I9b80b31a7749bdf893ed3b772a6505c9f29a56d1
Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
src/drivers/lenovo/Kconfig | 13 ++++
src/drivers/lenovo/Makefile.inc | 1 +
src/drivers/lenovo/hybrid_graphics.c | 107 +++++++++++++++++++++++++++++++++
src/mainboard/lenovo/t400/Kconfig | 1 +
src/mainboard/lenovo/t420s/Kconfig | 1 +
src/mainboard/lenovo/t430s/Kconfig | 1 +
src/mainboard/lenovo/t520/Kconfig | 1 +
src/mainboard/lenovo/t530/Kconfig | 1 +
src/southbridge/intel/i82801ix/Kconfig | 1 +
9 files changed, 127 insertions(+)
diff --git a/src/drivers/lenovo/Kconfig b/src/drivers/lenovo/Kconfig
index f20f3b2..f8eddf2 100644
--- a/src/drivers/lenovo/Kconfig
+++ b/src/drivers/lenovo/Kconfig
@@ -27,3 +27,16 @@ config DIGITIZER_ABSENT
endchoice
endif
+
+config DRIVERS_LENOVO_HYBRID_GRAPHICS
+ bool
+ default n
+
+config HYBRID_GRAPHICS_GPIO_NUM
+ depends on DRIVERS_LENOVO_HYBRID_GRAPHICS
+ int
+ default 52
+ help
+ Set a default GPIO that sets the panel LVDS signal routing to
+ integrated or discrete GPU.
+
diff --git a/src/drivers/lenovo/Makefile.inc b/src/drivers/lenovo/Makefile.inc
index c50db5b..66f8594 100644
--- a/src/drivers/lenovo/Makefile.inc
+++ b/src/drivers/lenovo/Makefile.inc
@@ -1 +1,2 @@
ramstage-$(CONFIG_DRIVERS_LENOVO_WACOM) += wacom.c
+ramstage-$(CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS) += hybrid_graphics.c
diff --git a/src/drivers/lenovo/hybrid_graphics.c b/src/drivers/lenovo/hybrid_graphics.c
new file mode 100644
index 0000000..68a5952
--- /dev/null
+++ b/src/drivers/lenovo/hybrid_graphics.c
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2015-2016 Patrick Rudolph
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <types.h>
+#include <string.h>
+#include <device/device.h>
+#include <device/pci_def.h>
+#include <device/pci_ops.h>
+#include <device/pci_ids.h>
+#include <device/pci.h>
+#include <console/console.h>
+#include <southbridge/intel/common/gpio.h>
+
+/* Hybrid graphics allows to connect LVDS interface to either iGPU
+ * or dGPU depending on GPIO level.
+ * As it is only linked on lenovo and only executed if the GPU exists
+ * we know for sure that the dGPU is there and connected to first PEG slot.
+ *
+ * Note: Once native gfx init is done for AMD or Nvida graphic
+ * cards, merge this code.
+ */
+
+static void hybrid_graphics_enable_peg(struct device *dev)
+{
+ struct device *peg_dev;
+
+ /* connect LVDS interface to dGPU */
+ set_gpio(CONFIG_HYBRID_GRAPHICS_GPIO_NUM, GPIO_LEVEL_LOW);
+ printk(BIOS_DEBUG, "Switching panel to discrete GPU\n");
+ dev->enabled = 1;
+
+ /* Enable PEG10 */
+ peg_dev = dev_find_slot(0, PCI_DEVFN(1, 0));
+ if (peg_dev)
+ peg_dev->enabled = 1;
+}
+
+static void hybrid_graphics_disable_peg(struct device *dev)
+{
+ struct device *peg_dev;
+
+ /* connect LVDS interface to iGPU */
+ set_gpio(CONFIG_HYBRID_GRAPHICS_GPIO_NUM, GPIO_LEVEL_HIGH);
+ printk(BIOS_DEBUG, "Switching panel to integrated GPU\n");
+ printk(BIOS_DEBUG, "Disabling device 0x%04x:0x%04x on bus %s\n",
+ dev->vendor, dev->device, bus_path(dev->bus));
+ dev->enabled = 0;
+
+ /* Disable PEG10 */
+ peg_dev = dev_find_slot(0, PCI_DEVFN(1, 0));
+ if (peg_dev)
+ peg_dev->enabled = 0;
+}
+
+static struct pci_operations pci_dev_ops_pci = {
+ .set_subsystem = pci_dev_set_subsystem,
+};
+
+struct device_operations hybrid_graphics_ops = {
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .init = pci_dev_init,
+ .scan_bus = 0,
+ .enable = hybrid_graphics_enable_peg,
+ .disable = hybrid_graphics_disable_peg,
+ .ops_pci = &pci_dev_ops_pci,
+};
+
+static const unsigned short pci_device_ids_nvidia[] = {
+ 0x0ffc, /* Nvidia NVS Quadro K1000m Lenovo W530 */
+ 0x0def, /* NVidia NVS 5400m Lenovo T430/T530 */
+ 0x0dfc, /* NVidia NVS 5200m Lenovo T430s */
+ 0x1056, /* NVidia NVS 4200m Lenovo T420/T520 */
+ 0x1057, /* NVidia NVS 4200m Lenovo T420/T520 */
+ 0x0a6c, /* NVidia NVS 3100m Lenovo T410/T510 */
+ 0 };
+
+static const struct pci_driver hybrid_peg_nvidia __pci_driver = {
+ .ops = &hybrid_graphics_ops,
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .devices = pci_device_ids_nvidia,
+};
+
+static const unsigned short pci_device_ids_amd[] = {
+ 0x9591, /* ATI Mobility Radeon HD 3650 Lenovo T500/W500 */
+ 0x95c4, /* ATI Mobility Radeon HD 3470 Lenovo T400/R400 */
+ 0 };
+
+static const struct pci_driver hybrid_peg_amd __pci_driver = {
+ .ops = &hybrid_graphics_ops,
+ .vendor = PCI_VENDOR_ID_ATI,
+ .devices = pci_device_ids_amd,
+};
+
diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
index d74a813..a444bf8 100644
--- a/src/mainboard/lenovo/t400/Kconfig
+++ b/src/mainboard/lenovo/t400/Kconfig
@@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
select INTEL_INT15
select SUPERIO_NSC_PC87382
+ select DRIVERS_LENOVO_HYBRID_GRAPHICS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index 935e659..feacb51 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_INT15
select SANDYBRIDGE_IVYBRIDGE_LVDS
select MAINBOARD_HAS_LPC_TPM
+ select DRIVERS_LENOVO_HYBRID_GRAPHICS
# Workaround for EC/KBC IRQ1.
select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index bb898cf..e7ed90b 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SANDYBRIDGE_IVYBRIDGE_LVDS
select ENABLE_VMX
select MAINBOARD_HAS_LPC_TPM
+ select DRIVERS_LENOVO_HYBRID_GRAPHICS
# Workaround for EC/KBC IRQ1.
select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index c70581a..ee5dd81 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select INTEL_INT15
select SANDYBRIDGE_IVYBRIDGE_LVDS
select MAINBOARD_HAS_LPC_TPM
+ select DRIVERS_LENOVO_HYBRID_GRAPHICS
# Workaround for EC/KBC IRQ1.
select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index c1d0625..085711b 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_DO_NATIVE_VGA_INIT # default to native vga init
select ENABLE_VMX
select MAINBOARD_HAS_LPC_TPM
+ select DRIVERS_LENOVO_HYBRID_GRAPHICS
# Workaround for EC/KBC IRQ1.
select SERIRQ_CONTINUOUS_MODE
diff --git a/src/southbridge/intel/i82801ix/Kconfig b/src/southbridge/intel/i82801ix/Kconfig
index 2822774..b3e5069 100644
--- a/src/southbridge/intel/i82801ix/Kconfig
+++ b/src/southbridge/intel/i82801ix/Kconfig
@@ -23,6 +23,7 @@ config SOUTHBRIDGE_INTEL_I82801IX
select USE_WATCHDOG_ON_BOOT
select HAVE_SMI_HANDLER
select HAVE_USBDEBUG_OPTIONS
+ select SOUTHBRIDGE_INTEL_COMMON_GPIO
if SOUTHBRIDGE_INTEL_I82801IX
More information about the coreboot-gerrit
mailing list