diff options
| author | Rik Faith <faith@alephnull.com> | 2000-09-29 01:47:11 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-09-29 01:47:11 +0000 |
| commit | 39a659e87718d8b6bbf138510e83de7a1e95d855 (patch) | |
| tree | 5d7ed3ac4e9f3d08e8abb94f46fe2db2d0a764d8 /linux/mga_dma.c | |
| parent | b0a7efb5a959a6105486d303d25d06d69d5d569e (diff) | |
Audit calls to schedule() Remove tags from files shared with Linux kernel
tree Remove debugging statements to make debugging more useful Other
minor cleanups in preparation for sync with Linux 2.4.0-test9-pre7
Diffstat (limited to 'linux/mga_dma.c')
| -rw-r--r-- | linux/mga_dma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linux/mga_dma.c b/linux/mga_dma.c index 9f12a2be..6adffb8a 100644 --- a/linux/mga_dma.c +++ b/linux/mga_dma.c @@ -29,7 +29,6 @@ * Keith Whitwell <keithw@valinux.com> * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c,v 1.5 2000/08/28 02:43:15 tsi Exp $ */ #define __NO_VERSION__ #include "drmP.h" @@ -84,7 +83,7 @@ static void mga_delay(void) static int mga_freelist_init(drm_device_t *dev) { - drm_device_dma_t *dma = dev->dma; + drm_device_dma_t *dma = dev->dma; drm_buf_t *buf; drm_mga_buf_priv_t *buf_priv; drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private; @@ -766,8 +765,7 @@ static int mga_dma_initialize(drm_device_t *dev, drm_mga_init_t *init) { MGA_WRITE(MGAREG_PRIMEND, ((phys_head + num_dwords * 4) | PDEA_pagpxfer_enable)); - /* Do we need a looping check? */ - while(MGA_READ(MGAREG_DWGSYNC) != 0x0100); + while(MGA_READ(MGAREG_DWGSYNC) != 0x0100) ; } if(mga_freelist_init(dev) != 0) { |