summaryrefslogtreecommitdiff
path: root/linux/mga_dma.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2000-09-07 12:40:41 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2000-09-07 12:40:41 +0000
commitf1bb3c5f5ff40e89004064d8ac8e13a3798b9afb (patch)
treeed597fa5e8a8282263e50868e29371c2c02a80f1 /linux/mga_dma.c
parent7db6449142ca24183f50e6f9dcf396b899b4113b (diff)
Merged tdfx-2-1-branchtdfx-2-1-20000907-merge
Diffstat (limited to 'linux/mga_dma.c')
-rw-r--r--linux/mga_dma.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/mga_dma.c b/linux/mga_dma.c
index f80fb489..ca35a9f4 100644
--- a/linux/mga_dma.c
+++ b/linux/mga_dma.c
@@ -416,7 +416,9 @@ void mga_fire_primary(drm_device_t *dev, drm_mga_prim_buf_t *prim)
}
}
+#ifdef __i386__
mga_flush_write_combine();
+#endif
atomic_inc(&dev_priv->pending_bufs);
MGA_WRITE(MGAREG_PRIMADDRESS, phys_head | TT_GENERAL);
MGA_WRITE(MGAREG_PRIMEND, (phys_head + num_dwords * 4) | use_agp);
@@ -813,8 +815,10 @@ static int mga_dma_initialize(drm_device_t *dev, drm_mga_init_t *init) {
/* Poll for the first buffer to insure that
* the status register will be correct
*/
-
+
+#ifdef __i386__
mga_flush_write_combine();
+#endif
MGA_WRITE(MGAREG_PRIMADDRESS, phys_head | TT_GENERAL);
MGA_WRITE(MGAREG_PRIMEND, ((phys_head + num_dwords * 4) |