diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-12-17 11:29:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-12-17 11:29:07 +1000 |
| commit | 2a768abbd2f18abe203571213260bccc225f70fd (patch) | |
| tree | b94bede95d2511d433864e8d697274f0337b9482 | |
| parent | b7fdd5da08bfec705691363b8890699c794dce53 (diff) | |
atom/tv: fixup the tv out default if bios doesn't specify
| -rw-r--r-- | src/atombios_output.c | 8 | ||||
| -rw-r--r-- | src/radeon_atombios.c | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/atombios_output.c b/src/atombios_output.c index 396af31d..cf258ac1 100644 --- a/src/atombios_output.c +++ b/src/atombios_output.c @@ -62,11 +62,6 @@ atombios_output_dac1_setup(xf86OutputPtr output, DisplayModePtr mode) disp_data.ucDacStandard = ATOM_DAC1_CV; else if (OUTPUT_IS_TV) { switch (radeon_output->tvStd) { - case TV_STD_NTSC: - case TV_STD_NTSC_J: - case TV_STD_PAL_60: - disp_data.ucDacStandard = ATOM_DAC1_NTSC; - break; case TV_STD_PAL: case TV_STD_PAL_M: case TV_STD_SCART_PAL: @@ -74,6 +69,9 @@ atombios_output_dac1_setup(xf86OutputPtr output, DisplayModePtr mode) case TV_STD_PAL_CN: disp_data.ucDacStandard = ATOM_DAC1_PAL; break; + case TV_STD_NTSC: + case TV_STD_NTSC_J: + case TV_STD_PAL_60: default: disp_data.ucDacStandard = ATOM_DAC1_NTSC; break; diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c index 7a15c8e2..76ae2ac5 100644 --- a/src/radeon_atombios.c +++ b/src/radeon_atombios.c @@ -1848,10 +1848,6 @@ RADEONGetATOMTVInfo(xf86OutputPtr output) return FALSE; switch(tv_info->ucTV_BootUpDefaultStandard) { - case NTSC_SUPPORT: - radeon_output->default_tvStd = TV_STD_NTSC; - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Default TV standard: NTSC\n"); - break; case NTSCJ_SUPPORT: radeon_output->default_tvStd = TV_STD_NTSC_J; xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Default TV standard: NTSC-J\n"); @@ -1868,6 +1864,11 @@ RADEONGetATOMTVInfo(xf86OutputPtr output) radeon_output->default_tvStd = TV_STD_PAL_60; xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Default TV standard: PAL-60\n"); break; + default: + case NTSC_SUPPORT: + radeon_output->default_tvStd = TV_STD_NTSC; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Default TV standard: NTSC\n"); + break; } radeon_output->tvStd = radeon_output->default_tvStd; |