diff options
| author | David Airlie <airlied@linux.ie> | 2007-02-02 14:54:00 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-02-02 15:34:37 +1100 |
| commit | d7317604c843e21c1df048a9253ed55a1957cccd (patch) | |
| tree | c5fa31df8be9c098aad15a7dbbe7574759b2bc48 /src/radeon_video.c | |
| parent | 15c68ac19ff9971ae02cf52036ba36ddea1a6759 (diff) | |
get rid of mergetype and displaytype from radeon.h
Diffstat (limited to 'src/radeon_video.c')
| -rw-r--r-- | src/radeon_video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c index 93ea1ebf..ed4cbfb7 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -1332,7 +1332,7 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn) */ /* Figure out which head we are on */ - if ((info->MergedFB && info->OverlayOnCRTC2) || info->IsSecondary) + if ((info->OverlayOnCRTC2) || info->IsSecondary) dot_clock = info->ModeReg.dot_clock_freq_2; else dot_clock = info->ModeReg.dot_clock_freq; @@ -2469,7 +2469,7 @@ RADEONDisplayVideo( y_mult = 1; /* TODO NO IDEA WHAT THIS IS ABOUT */ - if (info->MergedFB) { + if (0) {//info->MergedFB) { if (overlay_mode->Flags & V_INTERLACE) v_inc_shift++; if (overlay_mode->Flags & V_DBLSCAN) { |