From f1bb3c5f5ff40e89004064d8ac8e13a3798b9afb Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Thu, 7 Sep 2000 12:40:41 +0000 Subject: Merged tdfx-2-1-branch --- linux/mga_dma.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'linux/mga_dma.c') 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) | -- cgit v1.2.3