summaryrefslogtreecommitdiff
path: root/linux/drm_lists.h
diff options
context:
space:
mode:
authorGareth Hughes <gareth@users.sourceforge.net>2001-02-16 05:24:06 +0000
committerGareth Hughes <gareth@users.sourceforge.net>2001-02-16 05:24:06 +0000
commit01a14789edce0ce1cae0f3fd4328833399fae56d (patch)
tree455e6c689273e86516654df7b62e97a3131256d5 /linux/drm_lists.h
parent1d30ac11404c588e4a158d72f987c1fb3e478bea (diff)
- Clean up the way customization of the templates is done.
- Fix old-style DMA for gamma driver (please test). - Pull out IRQ handling into drm_dma.h (please test on i810, gamma). - Lots of general cleanups, remove compiler warnings etc.
Diffstat (limited to 'linux/drm_lists.h')
-rw-r--r--linux/drm_lists.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drm_lists.h b/linux/drm_lists.h
index b597ef77..f8dbaaa7 100644
--- a/linux/drm_lists.h
+++ b/linux/drm_lists.h
@@ -74,7 +74,7 @@ int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf)
buf->idx, buf->pid);
return -EINVAL;
}
-#if DRM_DMA_HISTOGRAM
+#if __HAVE_DMA_HISTOGRAM
buf->time_queued = get_cycles();
#endif
buf->list = DRM_LIST_WAIT;
@@ -106,6 +106,7 @@ drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl)
#endif /* __HAVE_DMA_WAITLIST */
+
#if __HAVE_DMA_FREELIST
int DRM(freelist_create)(drm_freelist_t *bl, int count)
@@ -142,7 +143,7 @@ int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl, drm_buf_t *buf)
buf->idx, buf->waiting, buf->pending, buf->list);
}
if (!bl) return 1;
-#if DRM_DMA_HISTOGRAM
+#if __HAVE_DMA_HISTOGRAM
buf->time_freed = get_cycles();
DRM(histogram_compute)(dev, buf);
#endif