diff --git a/src/atombios_output.c b/src/atombios_output.c index 024fa4c..e228da3 100644 --- a/src/atombios_output.c +++ b/src/atombios_output.c @@ -595,7 +595,7 @@ atombios_output_dig_encoder_setup(xf86OutputPtr output, int action) /* doesn't really matter which dig encoder we pick as long as it's * not already in use */ - if (radeon_output->linkb) + if (0 && radeon_output->linkb) index = GetIndexIntoMasterTable(COMMAND, DIG2EncoderControl); else index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl); @@ -779,7 +779,7 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action, uint8_t /* doesn't really matter which dig encoder we pick as long as it's * not already in use */ - if (radeon_output->linkb) + if (0 && radeon_output->linkb) disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG2_ENCODER; else disp_data.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER; @@ -1489,7 +1489,7 @@ atombios_set_output_crtc_source(xf86OutputPtr output) /* doesn't really matter which dig encoder we pick as long as it's * not already in use */ - if (radeon_output->linkb) + if (0 && radeon_output->linkb) crtc_src_param2.ucEncoderID = ASIC_INT_DIG2_ENCODER_ID; else crtc_src_param2.ucEncoderID = ASIC_INT_DIG1_ENCODER_ID; @@ -1883,7 +1883,7 @@ static inline int atom_dp_get_encoder_id(xf86OutputPtr output) ret |= ATOM_DP_CONFIG_LINK_A; } else { if (radeon_output->linkb) - ret |= ATOM_DP_CONFIG_DIG2_ENCODER | ATOM_DP_CONFIG_LINK_B; + ret |= /*ATOM_DP_CONFIG_DIG2_ENCODER |*/ ATOM_DP_CONFIG_LINK_B; else ret |= ATOM_DP_CONFIG_DIG1_ENCODER | ATOM_DP_CONFIG_LINK_A; } diff --git a/src/radeon_output.c b/src/radeon_output.c index 04817e3..e0e2810 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -156,6 +156,7 @@ void RADEONPrintPortMap(ScrnInfoPtr pScrn) if (radeon_output->devices & ATOM_DEVICE_CV_SUPPORT) ErrorF(" CV: %s\n", encoder_name[info->encoders[ATOM_DEVICE_CV_INDEX]->encoder_id]); ErrorF(" DDC reg: 0x%x\n",(unsigned int)radeon_output->ddc_i2c.mask_clk_reg); + ErrorF(" Link: %c\n",radeon_output->linkb ? 'B' : 'A'); } }