diff options
author | Daniel Stone <daniel@fooishbar.org> | 2004-12-04 22:34:54 +0000 |
---|---|---|
committer | Daniel Stone <daniel@fooishbar.org> | 2004-12-04 22:34:54 +0000 |
commit | 960d15ae3a44efe7c02a3d6d0acbabe63e07be74 (patch) | |
tree | 5741febc9a6bcfae725a85b52ca9fb8d277aaeaf /src/r128_driver.c | |
parent | 4706dfb7804a46e3cc5aafc3644f5a1134ab3d19 (diff) |
Disable interrupt handling after the DRM handler has been removed,
preventing lockups (closes: #1886).
Allow pitches with a granularity of 32, rather than 64, because some
clamshell iBooks have 800-byte pitches. Change Xv allocation
granularity to 8 bytes, rather than 16 bytes, also (closes: #1888).
Diffstat (limited to 'src/r128_driver.c')
-rw-r--r-- | src/r128_driver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/r128_driver.c b/src/r128_driver.c index 714df3da..cf4e0450 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -1642,7 +1642,11 @@ static Bool R128PreInitModes(ScrnInfoPtr pScrn) NULL, /* linePitches */ 8 * 64, /* minPitch */ 8 * 1024, /* maxPitch */ - 8 * 64, /* pitchInc */ +/* + * ATI docs say pitchInc must be 8 * 64, but this doesn't permit a pitch of + * 800 bytes, which is known to work on the Rage128 LF on clamshell iBooks + */ + 8 * 32, /* pitchInc */ 128, /* minHeight */ 2048, /* maxHeight */ pScrn->display->virtualX, |