From 5efe10a637a65a61eb1823bcb33ffacb7ea22d55 Mon Sep 17 00:00:00 2001 From: Frank Vibrans Date: Tue, 13 Mar 2012 11:02:04 -0600 Subject: [PATCH] Union Station: Fixes to turn on HDMI This commit includes the changes to enable the HDMI on Union Station. The changes switch the output from the display port to the HDMI. Change-Id: I4e15ff6db7d056f156791ff1406d4bae35ff2767 Signed-off-by: Frank Vibrans Reviewed-on: http://review.coreboot.org/788 Tested-by: build bot (Jenkins) Reviewed-by: Peter Stuge --- src/mainboard/amd/union_station/PlatformGnbPcie.c | 4 ++-- src/mainboard/amd/union_station/buildOpts.c | 2 +- src/mainboard/amd/union_station/dsdt.asl | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mainboard/amd/union_station/PlatformGnbPcie.c b/src/mainboard/amd/union_station/PlatformGnbPcie.c index b0389b82d9..f1f06a8ee2 100644 --- a/src/mainboard/amd/union_station/PlatformGnbPcie.c +++ b/src/mainboard/amd/union_station/PlatformGnbPcie.c @@ -95,14 +95,14 @@ PCIe_DDI_DESCRIPTOR DdiList [] = { 0, //Descriptor flags PCIE_ENGINE_DATA_INITIALIZER (PcieDdiEngine, 8, 11), //PCIE_DDI_DATA_INITIALIZER (ConnectorTypeDP, Aux1, Hdp1) - {ConnectorTypeDP, Aux1, Hdp1} + {ConnectorTypeHDMI, Aux1, Hdp1} }, // Initialize Ddi descriptor (DDI interface Lanes 12:15, DdB, ...) { DESCRIPTOR_TERMINATE_LIST, //Descriptor flags !!!IMPORTANT!!! Terminate last element of array PCIE_ENGINE_DATA_INITIALIZER (PcieDdiEngine, 12, 15), //PCIE_DDI_DATA_INITIALIZER (ConnectorTypeDP, Aux2, Hdp2) - {ConnectorTypeDP, Aux2, Hdp2} + {ConnectorTypeHDMI, Aux2, Hdp2} } }; diff --git a/src/mainboard/amd/union_station/buildOpts.c b/src/mainboard/amd/union_station/buildOpts.c index 20d667d6e7..f87522c944 100644 --- a/src/mainboard/amd/union_station/buildOpts.c +++ b/src/mainboard/amd/union_station/buildOpts.c @@ -176,7 +176,7 @@ //#define BLDCFG_SET_HTCRC_SYNC_FLOOD FALSE //#define BLDCFG_USE_UNIT_ID_CLUMPING FALSE //#define BLDCFG_SYSTEM_PHYSICAL_SOCKET_MAP 0 -#define BLDCFG_CFG_GNB_HD_AUDIO FALSE//TRUE +#define BLDCFG_CFG_GNB_HD_AUDIO TRUE //#define BLDCFG_CFG_ABM_SUPPORT FALSE //#define BLDCFG_CFG_DYNAMIC_REFRESH_RATE 0 //#define BLDCFG_CFG_LCD_BACK_LIGHT_CONTROL 0 diff --git a/src/mainboard/amd/union_station/dsdt.asl b/src/mainboard/amd/union_station/dsdt.asl index 5c8b6612a9..fb2cfe88e5 100644 --- a/src/mainboard/amd/union_station/dsdt.asl +++ b/src/mainboard/amd/union_station/dsdt.asl @@ -1166,13 +1166,14 @@ DefinitionBlock ( } /* end AMRT */ /* The internal GFX bridge */ - Device(AGPB) { + Device(HDMI) { Name(_ADR, 0x00010000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - Return (APR1) + If(PMOD){ Return(APR1) } /* APIC mode */ + Return (PR1) /* PIC Mode */ } - } /* end AGPB */ + } /* end HDMI */ /* The external GFX bridge */ Device(PBR2) {