From 5f2cfc5bd8132d1bd4dabd78848acd0ee038ea92 Mon Sep 17 00:00:00 2001 From: Gareth Hughes Date: Thu, 7 Sep 2000 20:42:32 +0000 Subject: Merge of tdfx branch undid the changes from the 2.4.0-test8-pre5 kernel sync, so apply them again. --- linux/mga_dma.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'linux/mga_dma.c') 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) | -- cgit v1.2.3