diff options
| -rw-r--r-- | src/atombios_crtc.c | 6 | ||||
| -rw-r--r-- | src/atombios_output.c | 11 | ||||
| -rw-r--r-- | src/radeon_atombios.c | 1 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c index 8f76e305..f144e42a 100644 --- a/src/atombios_crtc.c +++ b/src/atombios_crtc.c @@ -1,10 +1,5 @@ /* * Copyright © 2007 Red Hat, Inc. - * - * PLL code is: - * Copyright 2007 Luc Verhaegen <lverhaegen@novell.com> - * Copyright 2007 Matthias Hopf <mhopf@novell.com> - * Copyright 2007 Egbert Eich <eich@novell.com> * Copyright 2007 Advanced Micro Devices, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -28,6 +23,7 @@ * * Authors: * Dave Airlie <airlied@redhat.com> + * Alex Deucher <alexander.deucher@amd.com> * */ /* diff --git a/src/atombios_output.c b/src/atombios_output.c index 81740a8a..8e0776d2 100644 --- a/src/atombios_output.c +++ b/src/atombios_output.c @@ -474,10 +474,10 @@ atombios_output_dig2_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode AtomBiosArgRec data; unsigned char *space; - disp_data.ucAction = ATOM_TRANSMITTER_ACTION_SETUP; + disp_data.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE; disp_data.usPixelClock = mode->Clock / 10; // not sure on clk src... - disp_data.ucConfig = ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER | ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL; + disp_data.ucConfig = ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER | ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL; if (mode->Clock > 165000) disp_data.ucConfig |= (ATOM_TRANSMITTER_CONFIG_8LANE_LINK | ATOM_TRANSMITTER_CONFIG_LINKA_B | @@ -492,11 +492,8 @@ atombios_output_dig2_transmitter_setup(xf86OutputPtr output, DisplayModePtr mode data.exec.pspace = &disp_data; if (RHDAtomBiosFunc(info->atomBIOS->scrnIndex, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) { - disp_data.ucAction = ATOM_TRANSMITTER_ACTION_ENABLE; - if (RHDAtomBiosFunc(info->atomBIOS->scrnIndex, info->atomBIOS, ATOMBIOS_EXEC, &data) == ATOM_SUCCESS) { - ErrorF("Output DIG2 transmitter setup success\n"); - return ATOM_SUCCESS; - } + ErrorF("Output DIG2 transmitter setup success\n"); + return ATOM_SUCCESS; } ErrorF("Output DIG2 transmitter setup failed\n"); diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c index 3efe4c92..91160f9b 100644 --- a/src/radeon_atombios.c +++ b/src/radeon_atombios.c @@ -1545,6 +1545,7 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn) break; case ENCODER_OBJECT_ID_INTERNAL_TMDS1: case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: + case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: info->BiosConnector[i].devices |= (1 << ATOM_DEVICE_DFP1_INDEX); info->BiosConnector[i].TMDSType = TMDS_INT; break; |