diff options
| author | Alex Deucher <alex@botch2.com> | 2007-08-03 19:27:59 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.com> | 2007-08-03 19:27:59 -0400 |
| commit | b61a49f2a5401560f85e11bcdd005287433cad12 (patch) | |
| tree | e60128772c944eb4356af0a3e067ddeebc229b44 | |
| parent | 288fa627274cb399059262d4f8bd844fc220a042 (diff) | |
RADEON: Change indexing of TV constants table in preparation for standard re-work
| -rw-r--r-- | src/radeon_tv.c | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/src/radeon_tv.c b/src/radeon_tv.c index b802234..ec355e2 100644 --- a/src/radeon_tv.c +++ b/src/radeon_tv.c @@ -202,7 +202,11 @@ static Bool RADEONInitTVRestarts(xf86OutputPtr output, RADEONSavePtr save, CARD16 hInc; const TVModeConstants *constPtr; - constPtr = &availableTVModes[radeon_output->tvStd]; + /* FIXME: need to revisit this when we add more modes */ + if (radeon_output->tvStd == TV_STD_NTSC) + constPtr = &availableTVModes[0]; + else + constPtr = &availableTVModes[1]; hTotal = constPtr->horTotal; vTotal = constPtr->verTotal; @@ -292,7 +296,12 @@ void RADEONInitTVRegisters(xf86OutputPtr output, RADEONSavePtr save, const CARD16 *hor_timing; const CARD16 *vert_timing; - constPtr = &availableTVModes[radeon_output->tvStd]; + + /* FIXME: need to revisit this when we add more modes */ + if (radeon_output->tvStd == TV_STD_NTSC) + constPtr = &availableTVModes[0]; + else + constPtr = &availableTVModes[1]; save->tv_crc_cntl = 0; @@ -536,7 +545,11 @@ void RADEONAdjustCrtcRegistersForTV(ScrnInfoPtr pScrn, RADEONSavePtr save, const TVModeConstants *constPtr; RADEONOutputPrivatePtr radeon_output = output->driver_private; - constPtr = &availableTVModes[radeon_output->tvStd]; + /* FIXME: need to revisit this when we add more modes */ + if (radeon_output->tvStd == TV_STD_NTSC) + constPtr = &availableTVModes[0]; + else + constPtr = &availableTVModes[1]; save->crtc_h_total_disp = (((constPtr->horResolution / 8) - 1) << RADEON_CRTC_H_DISP_SHIFT) | (((constPtr->horTotal / 8) - 1) << RADEON_CRTC_H_TOTAL_SHIFT); @@ -562,7 +575,11 @@ void RADEONAdjustPLLRegistersForTV(ScrnInfoPtr pScrn, RADEONSavePtr save, const TVModeConstants *constPtr; RADEONOutputPrivatePtr radeon_output = output->driver_private; - constPtr = &availableTVModes[radeon_output->tvStd]; + /* FIXME: need to revisit this when we add more modes */ + if (radeon_output->tvStd == TV_STD_NTSC) + constPtr = &availableTVModes[0]; + else + constPtr = &availableTVModes[1]; save->htotal_cntl = (constPtr->horTotal & 0x7 /*0xf*/) | RADEON_HTOT_CNTL_VGA_EN; @@ -609,7 +626,11 @@ void RADEONAdjustCrtc2RegistersForTV(ScrnInfoPtr pScrn, RADEONSavePtr save, const TVModeConstants *constPtr; RADEONOutputPrivatePtr radeon_output = output->driver_private; - constPtr = &availableTVModes[radeon_output->tvStd]; + /* FIXME: need to revisit this when we add more modes */ + if (radeon_output->tvStd == TV_STD_NTSC) + constPtr = &availableTVModes[0]; + else + constPtr = &availableTVModes[1]; save->crtc2_h_total_disp = (((constPtr->horResolution / 8) - 1) << RADEON_CRTC_H_DISP_SHIFT) | (((constPtr->horTotal / 8) - 1) << RADEON_CRTC_H_TOTAL_SHIFT); @@ -635,7 +656,11 @@ void RADEONAdjustPLL2RegistersForTV(ScrnInfoPtr pScrn, RADEONSavePtr save, const TVModeConstants *constPtr; RADEONOutputPrivatePtr radeon_output = output->driver_private; - constPtr = &availableTVModes[radeon_output->tvStd]; + /* FIXME: need to revisit this when we add more modes */ + if (radeon_output->tvStd == TV_STD_NTSC) + constPtr = &availableTVModes[0]; + else + constPtr = &availableTVModes[1]; save->htotal_cntl2 = (constPtr->horTotal & 0x7); /* 0xf */ |