diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-12-17 11:31:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-12-17 11:31:15 +1000 |
| commit | 105cfd0b8696347ef71ad9daa941abb308bd6c2c (patch) | |
| tree | 16e0d409dbd3d8a068cfad3760b191c1c1f9a74e | |
| parent | 2a768abbd2f18abe203571213260bccc225f70fd (diff) | |
atom/tv: enable scaler can set the TV output scaler up.
Add the tv standard to the scaler enable for TV use.
| -rw-r--r-- | src/atombios_output.c | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/src/atombios_output.c b/src/atombios_output.c index cf258ac1..48f8b747 100644 --- a/src/atombios_output.c +++ b/src/atombios_output.c @@ -613,9 +613,44 @@ atombios_output_scaler_setup(xf86OutputPtr output, DisplayModePtr mode) AtomBiosArgRec data; unsigned char *space; + memset(&disp_data, 0, sizeof(disp_data)); + disp_data.ucScaler = radeon_crtc->crtc_id; - if (radeon_output->Flags & RADEON_USE_RMX) { + if (OUTPUT_IS_TV) { + switch (radeon_output->tvStd) { + case TV_STD_NTSC: + disp_data.ucTVStandard = ATOM_TV_NTSC; + break; + case TV_STD_PAL: + disp_data.ucTVStandard = ATOM_TV_PAL; + break; + case TV_STD_PAL_M: + disp_data.ucTVStandard = ATOM_TV_PALM; + break; + case TV_STD_PAL_60: + disp_data.ucTVStandard = ATOM_TV_PAL60; + break; + case TV_STD_NTSC_J: + disp_data.ucTVStandard = ATOM_TV_NTSCJ; + break; + case TV_STD_SCART_PAL: + disp_data.ucTVStandard = ATOM_TV_PAL; /* ??? */ + break; + case TV_STD_SECAM: + disp_data.ucTVStandard = ATOM_TV_SECAM; + break; + case TV_STD_PAL_CN: + disp_data.ucTVStandard = ATOM_TV_PALCN; + break; + default: + disp_data.ucTVStandard = ATOM_TV_NTSC; + break; + } + disp_data.ucEnable = SCALER_ENABLE_MULTITAP_MODE; + ErrorF("Using TV scaler %x %x\n", disp_data.ucTVStandard, disp_data.ucEnable); + + } else if (radeon_output->Flags & RADEON_USE_RMX) { ErrorF("Using RMX\n"); if (radeon_output->rmx_type == RMX_FULL) disp_data.ucEnable = ATOM_SCALER_EXPANSION; |