diff options
| author | Leif Delgass <ldelgass@users.sourceforge.net> | 2002-06-04 20:00:59 +0000 |
|---|---|---|
| committer | Leif Delgass <ldelgass@users.sourceforge.net> | 2002-06-04 20:00:59 +0000 |
| commit | c7f975325e87cdead26c4f92cfd6ac79f7164cd4 (patch) | |
| tree | 033df76114fd647eb761efb2393ba5adde86bfc3 /linux | |
| parent | 49a9928507aaaf346c369ce00dbd7bf6cae11d33 (diff) | |
Don't release all buffers in the pending list in do_dma_idle for the
NO_BATCH_DISPATCH path, in case the ring hasn't been flushed before
calling the function.
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/mach64_dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/mach64_dma.c b/linux/mach64_dma.c index e7c21d8c..92e78155 100644 --- a/linux/mach64_dma.c +++ b/linux/mach64_dma.c @@ -220,10 +220,12 @@ int mach64_do_dma_idle( drm_mach64_private_t *dev_priv ) { /* Disable bus-mastering, but keep block 1 registers enabled */ MACH64_WRITE( MACH64_BUS_CNTL, reg | MACH64_BUS_MASTER_DIS | MACH64_BUS_EXT_REG_EN ); MACH64_WRITE( MACH64_SRC_CNTL, 0 ); -#endif + return 0; +#else /* clean up after pass */ mach64_do_release_used_buffers( dev_priv ); return 0; +#endif } /* Reset the engine. This will stop the DMA if it is running. |