summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-11-12 09:50:58 -0500
committerAdam Jackson <ajax@redhat.com>2009-11-12 09:50:58 -0500
commit6fb5733ca06477bdab2d2070c4692ff45e09be61 (patch)
tree9849dbfae7127c517b9bfac62d223bb7c80c78af
parentcc0682924e84006662d77557876123a88f76afa0 (diff)
Don't mess with the blender unit on chips that don't have it
Where your typical x86 machine silently ignores writes to non-existing registers, UltraSPARC machines generate a bus error. So we shouldn't write to the alpha blender setup register on the Imagine 1 and Imagine 2 that don't seem to have the blender unit. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mark Kettenis <mark.kettenis@xs4all.nl>
-rw-r--r--src/i128accel.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/i128accel.c b/src/i128accel.c
index 37d6353..6fb8c0f 100644
--- a/src/i128accel.c
+++ b/src/i128accel.c
@@ -508,7 +508,9 @@ I128XaaInit(ScreenPtr pScreen)
pI128->mem.rbase_a[PCTRL] = 0x00000000; /* for lines */
pI128->mem.rbase_a[CLPTL] = 0x00000000;
pI128->mem.rbase_a[CLPBR] = (4095<<16) | 2047 ;
- pI128->mem.rbase_a[ACNTRL] = 0x00000000;
+ if (pI128->Chipset == PCI_CHIP_I128_T2R ||
+ pI128->Chipset == PCI_CHIP_I128_T2R4)
+ pI128->mem.rbase_a[ACNTRL] = 0x00000000;
pI128->mem.rbase_a[INTM] = 0x03;
if (pI128->Debug) {