diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-11 18:00:40 +0200 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-11 18:00:40 +0200 |
| commit | 7e5c29961ac2a9e9dbe5d6d2d73d11cd018d62b5 (patch) | |
| tree | 89d7a86dac4e66779a21de94cafbd819040c93d4 /src/radeon_video.c | |
| parent | ab5603edd8fc3ef0560bdfb6a6d9c6af2a49d1e5 (diff) | |
RADEON: Fix RMX after the last commit
Diffstat (limited to 'src/radeon_video.c')
| -rw-r--r-- | src/radeon_video.c | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c index a91cb36..97724eb 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -2479,33 +2479,17 @@ RADEONDisplayVideo( v_inc_shift = 20; y_mult = 1; - /* TODO NO IDEA WHAT THIS IS ABOUT */ - if (0) {//info->MergedFB) { - if (overlay_mode->Flags & V_INTERLACE) - v_inc_shift++; - if (overlay_mode->Flags & V_DBLSCAN) { - v_inc_shift--; - y_mult = 2; - } - // FIXME - /* if (overlay_mode->Flags & RADEON_USE_RMX) { - v_inc = ((src_h * overlay_mode->CrtcVDisplay / info->PanelYRes) << v_inc_shift) / drw_h; - } else {*/ - v_inc = (src_h << v_inc_shift) / drw_h; - /*}*/ + if (pScrn->currentMode->Flags & V_INTERLACE) + v_inc_shift++; + if (pScrn->currentMode->Flags & V_DBLSCAN) { + v_inc_shift--; + y_mult = 2; + } + // FIXME + if (pScrn->currentMode->Flags & RADEON_USE_RMX) { + v_inc = ((src_h * pScrn->currentMode->CrtcVDisplay / info->PanelYRes) << v_inc_shift) / drw_h; } else { - if (pScrn->currentMode->Flags & V_INTERLACE) - v_inc_shift++; - if (pScrn->currentMode->Flags & V_DBLSCAN) { - v_inc_shift--; - y_mult = 2; - } - // FIXME - /* if (pScrn->currentMode->Flags & RADEON_USE_RMX) { - v_inc = ((src_h * pScrn->currentMode->CrtcVDisplay / info->PanelYRes) << v_inc_shift) / drw_h; - } else {*/ - v_inc = (src_h << v_inc_shift) / drw_h; - /*}*/ + v_inc = (src_h << v_inc_shift) / drw_h; } h_inc = (1 << (12 + ecp_div)); |