diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-01-21 20:29:56 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-01-21 20:29:56 +1100 |
| commit | aa9d04ba94a3cd60b248231da517e2817591fc69 (patch) | |
| tree | 164fd3afd49b8966e51d3196faa20ed197e5239b /src/radeon_display.c | |
| parent | e8be0056e8ff666f63a294691661f5dab289203e (diff) | |
remove alot more mergedfb support
Diffstat (limited to 'src/radeon_display.c')
| -rw-r--r-- | src/radeon_display.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index f80162d6..98faf4cf 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -45,7 +45,6 @@ #include "radeon_macros.h" #include "radeon_probe.h" #include "radeon_version.h" -#include "radeon_mergedfb.h" void radeon_crtc_load_lut(xf86CrtcPtr crtc); @@ -2025,10 +2024,7 @@ void RADEONInitDispBandwidth(ScrnInfoPtr pScrn) } else if (pRADEONEnt->Controller[1]->binding == 1) info2 = info; mode1 = info->CurrentLayout.mode; - if (info->MergedFB) { - mode1 = ((RADEONMergedDisplayModePtr)info->CurrentLayout.mode->Private)->CRT1; - mode2 = ((RADEONMergedDisplayModePtr)info->CurrentLayout.mode->Private)->CRT2; - } else if ((pRADEONEnt->HasSecondary) && info2) { + if ((pRADEONEnt->HasSecondary) && info2) { mode2 = info2->CurrentLayout.mode; } else { mode2 = NULL; |