summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.com>2007-08-02 00:20:50 -0400
committerAlex Deucher <alex@botch2.com>2007-08-02 00:20:50 -0400
commit98d7e00437bea78e03180eb30ff30de3455d9d1a (patch)
treefc61cff940bc9a2b3a326a810fb948874c20674b /src
parent5c549c1d42f7bbc556942af13aff2661fae856f2 (diff)
RADEON: limit tv modes to the only one we can program at the moment
Diffstat (limited to 'src')
-rw-r--r--src/radeon_output.c8
-rw-r--r--src/radeon_tv.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 2790ddf..d3bb344 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -609,6 +609,14 @@ radeon_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
{
RADEONOutputPrivatePtr radeon_output = output->driver_private;
+ if (radeon_output->type == OUTPUT_STV ||
+ radeon_output->type == OUTPUT_CTV) {
+ if (pMode->HDisplay == 800 && pMode->VDisplay == 600)
+ return MODE_OK;
+ else
+ return MODE_CLOCK_RANGE;
+ }
+
if (radeon_output->type != OUTPUT_LVDS)
return MODE_OK;
diff --git a/src/radeon_tv.c b/src/radeon_tv.c
index 001d013..e4e6763 100644
--- a/src/radeon_tv.c
+++ b/src/radeon_tv.c
@@ -141,7 +141,7 @@ static const CARD16 vert_timing_PAL[] =
**********************************************************************/
static const TVModeConstants availableTVModes[] =
{
- {
+ {
800, /* horResolution */
600, /* verResolution */
TV_STD_NTSC, /* standard */
@@ -156,7 +156,7 @@ static const TVModeConstants availableTVModes[] =
4, /* crtcPLL_postDiv */
1022, /* pixToTV */
},
- {
+ {
800, /* horResolution */
600, /* verResolution */
TV_STD_PAL, /* standard */