summaryrefslogtreecommitdiff
path: root/linux/mga_dma.c
diff options
context:
space:
mode:
authorGareth Hughes <gareth@users.sourceforge.net>2000-09-07 20:42:32 +0000
committerGareth Hughes <gareth@users.sourceforge.net>2000-09-07 20:42:32 +0000
commit5f2cfc5bd8132d1bd4dabd78848acd0ee038ea92 (patch)
tree2d138907062adadb7ce341cab4583d54b30f738d /linux/mga_dma.c
parentf1bb3c5f5ff40e89004064d8ac8e13a3798b9afb (diff)
Merge of tdfx branch undid the changes from the 2.4.0-test8-pre5 kernel
sync, so apply them again.
Diffstat (limited to 'linux/mga_dma.c')
-rw-r--r--linux/mga_dma.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/mga_dma.c b/linux/mga_dma.c
index ca35a9f4..f80fb489 100644
--- a/linux/mga_dma.c
+++ b/linux/mga_dma.c
@@ -416,9 +416,7 @@ 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);
@@ -815,10 +813,8 @@ 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) |