[PATCH v2 1/2] x86: queensbay: Return directly if IGD / SDVO were already disabled
Initialize 'igd' and 'sdvo' to NULL so that we just need to test them against NULL later, to be compatible with that case that IGD and SDVO devices were already in disabled state.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
---
Changes in v2: - Reword the commit message and add a comment in the codes
arch/x86/cpu/queensbay/tnc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c index 782ed863fe..4a008622d1 100644 --- a/arch/x86/cpu/queensbay/tnc.c +++ b/arch/x86/cpu/queensbay/tnc.c @@ -18,19 +18,17 @@
static int __maybe_unused disable_igd(void) { - struct udevice *igd, *sdvo; + struct udevice *igd = NULL; + struct udevice *sdvo = NULL; int ret;
- ret = dm_pci_bus_find_bdf(TNC_IGD, &igd); - if (ret) - return ret; - if (!igd) - return 0; - - ret = dm_pci_bus_find_bdf(TNC_SDVO, &sdvo); - if (ret) - return ret; - if (!sdvo) + /* + * In case the IGD and SDVO devices were already in disabled state, + * we should return and not proceed any further. + */ + dm_pci_bus_find_bdf(TNC_IGD, &igd); + dm_pci_bus_find_bdf(TNC_SDVO, &sdvo); + if (!igd || !sdvo) return 0;
/*
The board routes the Integrated Graphics Device (IGD) to an LVDS panel, which is less popular than a PCIe based graphics card.
Disable the IGD so that it does not show up in the PCI configuration space as a VGA display controller, so we can use an external PCIe graphics card with whatever cable we have.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Simon Glass sjg@chromium.org ---
(no changes since v1)
configs/crownbay_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 1208aad42f..d7ee0fe45e 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -8,9 +8,8 @@ CONFIG_MAX_CPUS=2 CONFIG_DEFAULT_DEVICE_TREE="crownbay" CONFIG_VENDOR_INTEL=y CONFIG_TARGET_CROWNBAY=y +CONFIG_DISABLE_IGD=y CONFIG_SMP=y -CONFIG_HAVE_VGA_BIOS=y -CONFIG_VGA_BIOS_ADDR=0xfffa0000 CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_FIT=y
On Mon, Aug 2, 2021 at 3:05 PM Bin Meng bmeng.cn@gmail.com wrote:
The board routes the Integrated Graphics Device (IGD) to an LVDS panel, which is less popular than a PCIe based graphics card.
Disable the IGD so that it does not show up in the PCI configuration space as a VGA display controller, so we can use an external PCIe graphics card with whatever cable we have.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Simon Glass sjg@chromium.org
(no changes since v1)
configs/crownbay_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
applied to u-boot-x86, thanks!
On Mon, 2 Aug 2021 at 01:05, Bin Meng bmeng.cn@gmail.com wrote:
Initialize 'igd' and 'sdvo' to NULL so that we just need to test them against NULL later, to be compatible with that case that IGD and SDVO devices were already in disabled state.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Changes in v2:
- Reword the commit message and add a comment in the codes
arch/x86/cpu/queensbay/tnc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Mon, Aug 2, 2021 at 10:45 PM Simon Glass sjg@chromium.org wrote:
On Mon, 2 Aug 2021 at 01:05, Bin Meng bmeng.cn@gmail.com wrote:
Initialize 'igd' and 'sdvo' to NULL so that we just need to test them against NULL later, to be compatible with that case that IGD and SDVO devices were already in disabled state.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Changes in v2:
- Reword the commit message and add a comment in the codes
arch/x86/cpu/queensbay/tnc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
applied to u-boot-x86, thanks!
participants (2)
-
Bin Meng -
Simon Glass