geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow drivers to override reclaim_buffers in an OS-independent way by 

passing drm_device_t* as first parameter, like in the BSD version.
main
Felix Kuehling 2004-10-31 15:16:44 +00:00
parent 8264e2c8aa
commit 5128542814
14 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-core/drmP.h
View File

@ -536,7 +536,7 @@ struct drm_driver {
void (*irq_preinstall) (struct drm_device * dev);
void (*irq_postinstall) (struct drm_device * dev);
void (*irq_uninstall) (struct drm_device * dev);
void (*reclaim_buffers) (struct file * filp);
void (*reclaim_buffers) (struct drm_device *dev, struct file * filp);
unsigned long (*get_map_ofs) (drm_map_t * map);
unsigned long (*get_reg_ofs) (struct drm_device * dev);
void (*set_version) (struct drm_device * dev, drm_set_version_t * sv);
@ -866,7 +866,7 @@ extern int drm_order(unsigned long size);
extern int drm_dma_setup(drm_device_t * dev);
extern void drm_dma_takedown(drm_device_t * dev);
extern void drm_free_buffer(drm_device_t * dev, drm_buf_t * buf);
extern void drm_core_reclaim_buffers(struct file *filp);
extern void drm_core_reclaim_buffers(drm_device_t *dev, struct file *filp);
/* IRQ support (drm_irq.h) */
extern int drm_control(struct inode *inode, struct file *filp,

4
linux-core/drm_dma.c
View File

@ -154,10 +154,8 @@ void drm_free_buffer(drm_device_t * dev, drm_buf_t * buf)
*
* Frees each buffer associated with \p filp not already on the hardware.
*/
void drm_core_reclaim_buffers(struct file *filp)
void drm_core_reclaim_buffers(drm_device_t *dev, struct file *filp)
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma;
int i;

2
linux-core/drm_fops.c
View File

@ -393,7 +393,7 @@ int drm_release(struct inode *inode, struct file *filp)
}
if (drm_core_check_feature(dev, DRIVER_HAVE_DMA)) {
dev->driver->reclaim_buffers(filp);
dev->driver->reclaim_buffers(dev, filp);
}
drm_fasync(-1, filp, 0);

6
linux-core/i810_dma.c
View File

@ -972,10 +972,8 @@ static int i810_flush_queue(drm_device_t * dev)
}
/* Must be called with the lock held */
void i810_reclaim_buffers(struct file *filp)
void i810_reclaim_buffers(drm_device_t *dev, struct file *filp)
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma;
int i;
@ -1366,7 +1364,7 @@ void i810_driver_pretakedown(drm_device_t * dev)
void i810_driver_release(drm_device_t * dev, struct file *filp)
{
i810_reclaim_buffers(filp);
i810_reclaim_buffers(dev, filp);
}
int i810_driver_dma_quiescent(drm_device_t * dev)

2
linux-core/i810_drv.h
View File

@ -121,7 +121,7 @@ extern int i810_dma_init(struct inode *inode, struct file *filp,
extern int i810_dma_cleanup(drm_device_t * dev);
extern int i810_flush_ioctl(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern void i810_reclaim_buffers(struct file *filp);
extern void i810_reclaim_buffers(drm_device_t *dev, struct file *filp);
extern int i810_getage(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma);

6
linux-core/i830_dma.c
View File

@ -1252,10 +1252,8 @@ static int i830_flush_queue(drm_device_t * dev)
}
/* Must be called with the lock held */
void i830_reclaim_buffers(struct file *filp)
void i830_reclaim_buffers(drm_device_t *dev, struct file *filp)
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma;
int i;
@ -1556,7 +1554,7 @@ void i830_driver_pretakedown(drm_device_t * dev)
void i830_driver_release(drm_device_t * dev, struct file *filp)
{
i830_reclaim_buffers(filp);
i830_reclaim_buffers(dev, filp);
}
int i830_driver_dma_quiescent(drm_device_t * dev)

2
linux-core/i830_drv.h
View File

@ -129,7 +129,7 @@ extern int i830_dma_init(struct inode *inode, struct file *filp,
extern int i830_dma_cleanup(drm_device_t * dev);
extern int i830_flush_ioctl(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern void i830_reclaim_buffers(struct file *filp);
extern void i830_reclaim_buffers(drm_device_t *dev, struct file *filp);
extern int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
unsigned long arg);
extern int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma);

4
linux/drmP.h
View File

@ -528,7 +528,7 @@ struct drm_driver_fn {
void (*irq_preinstall)(struct drm_device *dev);
void (*irq_postinstall)(struct drm_device *dev);
void (*irq_uninstall)(struct drm_device *dev);
void (*reclaim_buffers)(struct file *filp);
void (*reclaim_buffers)(struct drm_device *dev, struct file *filp);
unsigned long (*get_map_ofs)(drm_map_t *map);
unsigned long (*get_reg_ofs)(struct drm_device *dev);
void (*set_version)(struct drm_device *dev, drm_set_version_t *sv);
@ -870,7 +870,7 @@ extern int DRM(mapbufs)( struct inode *inode, struct file *filp,
extern int DRM(dma_setup)(drm_device_t *dev);
extern void DRM(dma_takedown)(drm_device_t *dev);
extern void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf);
extern void DRM(reclaim_buffers)( struct file *filp );
extern void DRM(core_reclaim_buffers)(drm_device_t *dev, struct file *filp);
/* IRQ support (drm_irq.h) */
extern int DRM(control)( struct inode *inode, struct file *filp,

4
linux/drm_dma.h
View File

@ -154,10 +154,8 @@ void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf)
*
* Frees each buffer associated with \p filp not already on the hardware.
*/
void DRM(core_reclaim_buffers)( struct file *filp )
void DRM(core_reclaim_buffers)( drm_device_t *dev, struct file *filp )
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
drm_device_dma_t *dma = dev->dma;
int i;

2
linux/drm_drv.h
View File

@ -857,7 +857,7 @@ int DRM(release)( struct inode *inode, struct file *filp )
if (drm_core_check_feature(dev, DRIVER_HAVE_DMA))
{
dev->fn_tbl.reclaim_buffers(filp);
dev->fn_tbl.reclaim_buffers(dev, filp);
}
DRM(fasync)( -1, filp, 0 );

6
linux/i810_dma.c
View File

@ -996,10 +996,8 @@ static int i810_flush_queue(drm_device_t *dev)
}
/* Must be called with the lock held */
void i810_reclaim_buffers(struct file *filp)
void i810_reclaim_buffers(drm_device_t *dev, struct file *filp)
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
drm_device_dma_t *dma = dev->dma;
int i;
@ -1395,7 +1393,7 @@ static void i810_driver_pretakedown(drm_device_t *dev)
static void i810_driver_release(drm_device_t *dev, struct file *filp)
{
i810_reclaim_buffers(filp);
i810_reclaim_buffers(dev, filp);
}
static int i810_driver_dma_quiescent(drm_device_t *dev)

2
linux/i810_drv.h
View File

@ -99,7 +99,7 @@ extern int i810_dma_init(struct inode *inode, struct file *filp,
extern int i810_dma_cleanup(drm_device_t *dev);
extern int i810_flush_ioctl(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern void i810_reclaim_buffers(struct file *filp);
extern void i810_reclaim_buffers(drm_device_t *dev, struct file *filp);
extern int i810_getage(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma);

6
linux/i830_dma.c
View File

@ -1285,10 +1285,8 @@ static int i830_flush_queue(drm_device_t *dev)
}
/* Must be called with the lock held */
void i830_reclaim_buffers( struct file *filp )
void i830_reclaim_buffers( drm_device_t *dev, struct file *filp )
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
drm_device_dma_t *dma = dev->dma;
int i;
@ -1590,7 +1588,7 @@ static void i830_driver_pretakedown(drm_device_t *dev)
static void i830_driver_release(drm_device_t *dev, struct file *filp)
{
i830_reclaim_buffers(filp);
i830_reclaim_buffers(dev, filp);
}
static int i830_driver_dma_quiescent(drm_device_t *dev)

2
linux/i830_drv.h
View File

@ -99,7 +99,7 @@ extern int i830_dma_init(struct inode *inode, struct file *filp,
extern int i830_dma_cleanup(drm_device_t *dev);
extern int i830_flush_ioctl(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern void i830_reclaim_buffers(struct file *filp);
extern void i830_reclaim_buffers(drm_device_t *dev, struct file *filp);
extern int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
unsigned long arg);
extern int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma);