diff options
author | Dave Airlie <airlied@linux.ie> | 2007-01-04 12:29:51 +1100 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-01-04 12:29:51 +1100 |
commit | a43c1d55f5f855d9e6ae939dd4eec1c607b6d514 (patch) | |
tree | 3eb7861c6a9d2a1297d780bdceeaa46c6690e9cd /src/radeon_driver.c | |
parent | 87592ffb717da1f0a1767a38918d16d60953599c (diff) |
bring radeon randr code inline with intel randr code
Diffstat (limited to 'src/radeon_driver.c')
-rw-r--r-- | src/radeon_driver.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 615525c4..fb0fa80c 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -3267,14 +3267,12 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) if (!xf86RandR12PreInit (pScrn)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "RandR initialization failure\n"); - PreInitCleanup(pScrn); - return FALSE; + goto fail; } if (pScrn->modes == NULL) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No modes.\n"); - PreInitCleanup(pScrn); - return FALSE; + goto fail; } /* Free the video bios (if applicable) */ @@ -4303,9 +4301,9 @@ _X_EXPORT Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, /* Rotation */ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "RandR enabled, ignore the following RandR disabled message.\n"); xf86DisableRandR(); /* Disable built-in RandR extension */ - /* support all rotations */ + xf86RandR12Init (pScreen); - xf86RandR12SetRotations (pScreen, RR_Rotate_0); /* only 0 degrees for I965G */ + xf86RandR12SetRotations (pScreen, RR_Rotate_0); info->CreateScreenResources = pScreen->CreateScreenResources; pScreen->CreateScreenResources = RADEONCreateScreenResources; |