diff options
| author | Alex Deucher <alex@botch2.(none)> | 2007-12-11 13:11:15 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2007-12-11 13:11:15 -0500 |
| commit | 3c22ad977c25d5ca2811821fcac6bb8ecd79994a (patch) | |
| tree | 08e4a2e826092957d1d9e1396eca5c41c816b4fd /src/radeon_output.c | |
| parent | c9a0cee97ca69e8fe1e1937c7670fa903214cded (diff) | |
| parent | f3d2ec3a5ae61215c792018320158750e7aa937c (diff) | |
Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
fix conflicts
Diffstat (limited to 'src/radeon_output.c')
| -rw-r--r-- | src/radeon_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index 85f1156f..d8722050 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -861,7 +861,7 @@ radeon_mode_fixup(xf86OutputPtr output, DisplayModePtr mode, } /* update timing for LVDS and DFP if RMX is active */ - if ((radeon_output->MonType == MT_LCD) || (radeon_output->Flags & RADEON_USE_RMX)) { + if (radeon_output->Flags & RADEON_USE_RMX) { /* set to the panel's native mode */ adjusted_mode->HTotal = radeon_output->PanelXRes + radeon_output->HBlank; adjusted_mode->HSyncStart = radeon_output->PanelXRes + radeon_output->HOverPlus; |