diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-30 11:06:10 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-30 11:06:10 +0200 |
| commit | 1acd6d6fa42acec07fb11aeb189f492ddb021cb4 (patch) | |
| tree | 98dc04102513d384dd2893ec0a4f1fa186c9e7db /src | |
| parent | 1a71106c0e4fe5f650239dc694163fdf52d33663 (diff) | |
radeon: Guard some MergedFB specific code with info->MergedFB tests.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10442 .
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 57d8826..0e68d7d 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -2247,7 +2247,7 @@ static Bool RADEONPreInitModes(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) /* If we have 2 screens from the config file, we don't need * to do clone thing, let each screen handles one head. */ - if (!pRADEONEnt->HasSecondary) { + if (info->MergedFB) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Validating CRTC2 modes for MergedFB ------------ \n"); @@ -2273,7 +2273,7 @@ static Bool RADEONPreInitModes(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) if (pRADEONEnt->HasCRTC2) { - if(pRADEONEnt->Controller[1]->binding == 1) { + if(pRADEONEnt->Controller[1]->binding == 1 && info->MergedFB) { xf86SetCrtcForModes(info->CRT2pScrn, INTERLACE_HALVE_V); |