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 <frank.vibrans@se-eng.com>
Reviewed-on: http://review.coreboot.org/788
Tested-by: build bot (Jenkins)
Reviewed-by: Peter Stuge <peter@stuge.se>

diff --git a/src/mainboard/amd/union_station/PlatformGnbPcie.c b/src/mainboard/amd/union_station/PlatformGnbPcie.c
index b0389b82d9bd7e711562d42c5cbd1e96564bddd6..f1f06a8ee2bd56caec0f73732933494920b0711f 100644 (file)
--- 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 20d667d6e7ff6133ac370852c3d1062d4f7ecf43..f87522c9441ff530cbfb0784d9e3ca105bdc2783 100644 (file)
--- 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 5c8b6612a9ba2f4b98d7f11a7defe3fd2c30ff39..fb2cfe88e54130603a390e36f0844fcfbef76154 100644 (file)
--- 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) {