Rename drm_lists.h to gamma_lists.h
parent
700e880c3d
commit
73e20998b4
|
@ -833,20 +833,6 @@ extern void DRM(dma_immediate_bh)( void *dev );
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Buffer list support (drm_lists.h) */
|
|
||||||
#if __HAVE_DMA_WAITLIST
|
|
||||||
extern int DRM(waitlist_create)(drm_waitlist_t *bl, int count);
|
|
||||||
extern int DRM(waitlist_destroy)(drm_waitlist_t *bl);
|
|
||||||
extern int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf);
|
|
||||||
extern drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl);
|
|
||||||
#endif
|
|
||||||
#if __HAVE_DMA_FREELIST
|
|
||||||
extern int DRM(freelist_create)(drm_freelist_t *bl, int count);
|
|
||||||
extern int DRM(freelist_destroy)(drm_freelist_t *bl);
|
|
||||||
extern int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl,
|
|
||||||
drm_buf_t *buf);
|
|
||||||
extern drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block);
|
|
||||||
#endif
|
|
||||||
#endif /* __HAVE_DMA */
|
#endif /* __HAVE_DMA */
|
||||||
|
|
||||||
#if __REALLY_HAVE_AGP
|
#if __REALLY_HAVE_AGP
|
||||||
|
|
|
@ -49,7 +49,6 @@
|
||||||
#include "drm_init.h"
|
#include "drm_init.h"
|
||||||
#include "drm_ioctl.h"
|
#include "drm_ioctl.h"
|
||||||
#include "drm_lock.h"
|
#include "drm_lock.h"
|
||||||
#include "drm_lists.h"
|
|
||||||
#include "drm_memory.h"
|
#include "drm_memory.h"
|
||||||
#include "drm_proc.h"
|
#include "drm_proc.h"
|
||||||
#include "drm_vm.h"
|
#include "drm_vm.h"
|
||||||
|
|
|
@ -51,7 +51,6 @@
|
||||||
#include "drm_init.h"
|
#include "drm_init.h"
|
||||||
#include "drm_ioctl.h"
|
#include "drm_ioctl.h"
|
||||||
#include "drm_lock.h"
|
#include "drm_lock.h"
|
||||||
#include "drm_lists.h"
|
|
||||||
#include "drm_memory.h"
|
#include "drm_memory.h"
|
||||||
#include "drm_proc.h"
|
#include "drm_proc.h"
|
||||||
#include "drm_vm.h"
|
#include "drm_vm.h"
|
||||||
|
|
|
@ -41,7 +41,6 @@
|
||||||
#include "drm_fops.h"
|
#include "drm_fops.h"
|
||||||
#include "drm_init.h"
|
#include "drm_init.h"
|
||||||
#include "drm_ioctl.h"
|
#include "drm_ioctl.h"
|
||||||
#include "drm_lists.h"
|
|
||||||
#include "drm_lock.h"
|
#include "drm_lock.h"
|
||||||
#include "drm_memory.h"
|
#include "drm_memory.h"
|
||||||
#include "drm_proc.h"
|
#include "drm_proc.h"
|
||||||
|
|
14
linux/drmP.h
14
linux/drmP.h
|
@ -833,20 +833,6 @@ extern void DRM(dma_immediate_bh)( void *dev );
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Buffer list support (drm_lists.h) */
|
|
||||||
#if __HAVE_DMA_WAITLIST
|
|
||||||
extern int DRM(waitlist_create)(drm_waitlist_t *bl, int count);
|
|
||||||
extern int DRM(waitlist_destroy)(drm_waitlist_t *bl);
|
|
||||||
extern int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf);
|
|
||||||
extern drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl);
|
|
||||||
#endif
|
|
||||||
#if __HAVE_DMA_FREELIST
|
|
||||||
extern int DRM(freelist_create)(drm_freelist_t *bl, int count);
|
|
||||||
extern int DRM(freelist_destroy)(drm_freelist_t *bl);
|
|
||||||
extern int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl,
|
|
||||||
drm_buf_t *buf);
|
|
||||||
extern drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block);
|
|
||||||
#endif
|
|
||||||
#endif /* __HAVE_DMA */
|
#endif /* __HAVE_DMA */
|
||||||
|
|
||||||
#if __REALLY_HAVE_AGP
|
#if __REALLY_HAVE_AGP
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
#include "drm_fops.h"
|
#include "drm_fops.h"
|
||||||
#include "drm_init.h"
|
#include "drm_init.h"
|
||||||
#include "drm_ioctl.h"
|
#include "drm_ioctl.h"
|
||||||
#include "drm_lists.h"
|
#include "gamma_lists.h" /* NOTE */
|
||||||
#include "drm_lock.h"
|
#include "drm_lock.h"
|
||||||
#include "gamma_lock.h" /* NOTE */
|
#include "gamma_lock.h" /* NOTE */
|
||||||
#include "drm_memory.h"
|
#include "drm_memory.h"
|
||||||
|
|
|
@ -68,6 +68,19 @@ extern int DRM(dma_enqueue)(struct file *filp, drm_dma_t *dma);
|
||||||
extern int DRM(dma_get_buffers)(struct file *filp, drm_dma_t *dma);
|
extern int DRM(dma_get_buffers)(struct file *filp, drm_dma_t *dma);
|
||||||
|
|
||||||
|
|
||||||
|
/* Gamma-specific code pulled from drm_lists.h (now renamed gamma_lists.h):
|
||||||
|
*/
|
||||||
|
extern int DRM(waitlist_create)(drm_waitlist_t *bl, int count);
|
||||||
|
extern int DRM(waitlist_destroy)(drm_waitlist_t *bl);
|
||||||
|
extern int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf);
|
||||||
|
extern drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl);
|
||||||
|
extern int DRM(freelist_create)(drm_freelist_t *bl, int count);
|
||||||
|
extern int DRM(freelist_destroy)(drm_freelist_t *bl);
|
||||||
|
extern int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl,
|
||||||
|
drm_buf_t *buf);
|
||||||
|
extern drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define GLINT_DRI_BUF_COUNT 256
|
#define GLINT_DRI_BUF_COUNT 256
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,6 @@
|
||||||
#define __NO_VERSION__
|
#define __NO_VERSION__
|
||||||
#include "drmP.h"
|
#include "drmP.h"
|
||||||
|
|
||||||
#if __HAVE_DMA_WAITLIST
|
|
||||||
|
|
||||||
int DRM(waitlist_create)(drm_waitlist_t *bl, int count)
|
int DRM(waitlist_create)(drm_waitlist_t *bl, int count)
|
||||||
{
|
{
|
||||||
|
@ -104,11 +103,6 @@ drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl)
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __HAVE_DMA_WAITLIST */
|
|
||||||
|
|
||||||
|
|
||||||
#if __HAVE_DMA_FREELIST
|
|
||||||
|
|
||||||
int DRM(freelist_create)(drm_freelist_t *bl, int count)
|
int DRM(freelist_create)(drm_freelist_t *bl, int count)
|
||||||
{
|
{
|
||||||
atomic_set(&bl->count, 0);
|
atomic_set(&bl->count, 0);
|
||||||
|
@ -220,4 +214,3 @@ drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block)
|
||||||
return DRM(freelist_try)(bl);
|
return DRM(freelist_try)(bl);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __HAVE_DMA_FREELIST */
|
|
|
@ -49,7 +49,6 @@
|
||||||
#include "drm_init.h"
|
#include "drm_init.h"
|
||||||
#include "drm_ioctl.h"
|
#include "drm_ioctl.h"
|
||||||
#include "drm_lock.h"
|
#include "drm_lock.h"
|
||||||
#include "drm_lists.h"
|
|
||||||
#include "drm_memory.h"
|
#include "drm_memory.h"
|
||||||
#include "drm_proc.h"
|
#include "drm_proc.h"
|
||||||
#include "drm_vm.h"
|
#include "drm_vm.h"
|
||||||
|
|
|
@ -51,7 +51,6 @@
|
||||||
#include "drm_init.h"
|
#include "drm_init.h"
|
||||||
#include "drm_ioctl.h"
|
#include "drm_ioctl.h"
|
||||||
#include "drm_lock.h"
|
#include "drm_lock.h"
|
||||||
#include "drm_lists.h"
|
|
||||||
#include "drm_memory.h"
|
#include "drm_memory.h"
|
||||||
#include "drm_proc.h"
|
#include "drm_proc.h"
|
||||||
#include "drm_vm.h"
|
#include "drm_vm.h"
|
||||||
|
|
|
@ -41,7 +41,6 @@
|
||||||
#include "drm_fops.h"
|
#include "drm_fops.h"
|
||||||
#include "drm_init.h"
|
#include "drm_init.h"
|
||||||
#include "drm_ioctl.h"
|
#include "drm_ioctl.h"
|
||||||
#include "drm_lists.h"
|
|
||||||
#include "drm_lock.h"
|
#include "drm_lock.h"
|
||||||
#include "drm_memory.h"
|
#include "drm_memory.h"
|
||||||
#include "drm_proc.h"
|
#include "drm_proc.h"
|
||||||
|
|
Loading…
Reference in New Issue