diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-01-21 14:47:08 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-01-21 14:47:08 -0500 |
| commit | 9e0cc0ca5d7bc68756ae92ee3b5b2392366be71a (patch) | |
| tree | d10f9aca7d4d2e51c685aeb2169e16d35b0c23e0 /src/legacy_output.c | |
| parent | 12010ae9296635ffa5f42ce0cd14482aaa290cf7 (diff) | |
Fix logic cut and paste error
Diffstat (limited to 'src/legacy_output.c')
| -rw-r--r-- | src/legacy_output.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/legacy_output.c b/src/legacy_output.c index a35d0bbd..a7222533 100644 --- a/src/legacy_output.c +++ b/src/legacy_output.c @@ -763,7 +763,7 @@ RADEONEnableDisplay(xf86OutputPtr output, BOOL bEnable) RADEONDacPowerSet(pScrn, bEnable, TRUE); break; case ENCODER_OBJECT_ID_INTERNAL_DAC2: - if (radeon_output->active_device && (ATOM_DEVICE_TV_SUPPORT)) { + if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT)) { ErrorF("enable TV\n"); info->output_tv1 |= (1 << o); tmp = INREG(RADEON_TV_MASTER_CNTL); @@ -861,11 +861,11 @@ RADEONEnableDisplay(xf86OutputPtr output, BOOL bEnable) tmp &= ~RADEON_CRTC_CRT_ON; OUTREG(RADEON_CRTC_EXT_CNTL, tmp); save->crtc_ext_cntl &= ~RADEON_CRTC_CRT_ON; - RADEONDacPowerSet(pScrn, bEnable, (radeon_output->DACType == DAC_PRIMARY)); + RADEONDacPowerSet(pScrn, bEnable, TRUE); } break; case ENCODER_OBJECT_ID_INTERNAL_DAC2: - if (radeon_output->active_device && (ATOM_DEVICE_TV_SUPPORT)) { + if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT)) { ErrorF("disable TV\n"); info->output_tv1 &= ~(1 << o); tv_dac_change = 2; @@ -1197,8 +1197,11 @@ RADEONInitRMXRegisters(xf86OutputPtr output, RADEONSavePtr save, save->fp_horz_vert_active = 0; - if ((radeon_output->active_device && (ATOM_DEVICE_LCD_SUPPORT)) || - (radeon_output->active_device && (ATOM_DEVICE_DFP_SUPPORT))) { + if ((radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) || + (radeon_output->active_device & (ATOM_DEVICE_DFP_SUPPORT))) { + + ErrorF("RMX for DFP/LCD\n"); + if (radeon_output->PanelXRes == 0 || radeon_output->PanelYRes == 0) { Hscale = FALSE; Vscale = FALSE; @@ -1409,6 +1412,7 @@ legacy_output_mode_set(xf86OutputPtr output, DisplayModePtr mode, return; if (radeon_crtc->crtc_id == 0) { + ErrorF("set RMX\n"); is_primary = TRUE; RADEONInitRMXRegisters(output, info->ModeReg, adjusted_mode); RADEONRestoreRMXRegisters(pScrn, info->ModeReg); @@ -1454,7 +1458,7 @@ legacy_output_mode_set(xf86OutputPtr output, DisplayModePtr mode, RADEONRestoreDACRegisters(pScrn, info->ModeReg); break; case ENCODER_OBJECT_ID_INTERNAL_DAC2: - if (radeon_output->active_device && (ATOM_DEVICE_TV_SUPPORT)) { + if (radeon_output->active_device & (ATOM_DEVICE_TV_SUPPORT)) { ErrorF("set TV\n"); RADEONInitTVRegisters(output, info->ModeReg, adjusted_mode, is_primary); RADEONRestoreDACRegisters(pScrn, info->ModeReg); |