diff options
| author | Alex Deucher <alex@cube.(none)> | 2008-03-06 17:31:37 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@cube.(none)> | 2008-03-06 17:31:37 -0500 |
| commit | 600dbe080997a01ceaf6be86723189d518bc1281 (patch) | |
| tree | 9c8253e30694e9b30507af19eba4e9f08d344547 /src/radeon_driver.c | |
| parent | 594743a99811a8b0f391412892414fcd158eeb56 (diff) | |
| parent | 5b7875d0cbfbdbcd1515c4e942d30de298b49dff (diff) | |
Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati
Diffstat (limited to 'src/radeon_driver.c')
| -rw-r--r-- | src/radeon_driver.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 04c9d3a2..f7fc1918 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -2635,8 +2635,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive)) goto fail; - if (xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr)) - goto fail; + xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr); pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR; pScrn->monitor = pScrn->confScreen->monitor; @@ -2738,17 +2737,22 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) if (crtc_max_Y > 8192) crtc_max_Y = 8192; } else { + /* + * note that these aren't really the CRTC limits, they're just + * heuristics until we have a better memory manager. + */ if (pScrn->videoRam <= 16384) { crtc_max_X = 1600; crtc_max_Y = 1200; + } else if (IS_R300_VARIANT) { + crtc_max_X = 2560; + crtc_max_Y = 1200; + } else if (IS_AVIVO_VARIANT) { + crtc_max_X = 2560; + crtc_max_Y = 1600; } else { - if (IS_R300_VARIANT || IS_AVIVO_VARIANT) { - crtc_max_X = 2560; - crtc_max_Y = 1200; - } else { - crtc_max_X = 2048; - crtc_max_Y = 1200; - } + crtc_max_X = 2048; + crtc_max_Y = 1200; } } xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Max desktop size set to %dx%d\n", |