diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-10 19:27:04 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-10 19:27:04 +1000 |
| commit | 836cf0465c422ee6d654060edd7c620d9cf0c09c (patch) | |
| tree | 622ed9a2ca774818084ffdcfbf1622ef1735bb74 /drivers/char/drm/drmP.h | |
| parent | d01cff408057fa925b2f766fa1fd5a305fd1acbf (diff) | |
| download | linux-836cf0465c422ee6d654060edd7c620d9cf0c09c.tar.gz linux-836cf0465c422ee6d654060edd7c620d9cf0c09c.tar.bz2 linux-836cf0465c422ee6d654060edd7c620d9cf0c09c.zip | |
drm: cleanup buffer/map code
This is a patch from DRM CVS that cleans up some code that was in CVS
that I never moved to the kernel, this patch produces the result of the
cleanups and puts it into the kernel drm.
From: Eric Anholt <anholt@freebsd.org>, Jon Smirl, Dave Airlie
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drmP.h')
| -rw-r--r-- | drivers/char/drm/drmP.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index a7fdcece6129..fb2af9279148 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h @@ -908,10 +908,11 @@ extern int drm_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request); extern int drm_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request); extern int drm_addmap(drm_device_t *dev, unsigned int offset, unsigned int size, drm_map_type_t type, - drm_map_flags_t flags, drm_map_t **map_ptr); + drm_map_flags_t flags, drm_local_map_t **map_ptr); extern int drm_addmap_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); -extern int drm_rmmap(drm_device_t *dev, void *handle); +extern int drm_rmmap(drm_device_t *dev, drm_local_map_t *map); +extern int drm_rmmap_locked(drm_device_t *dev, drm_local_map_t *map); extern int drm_rmmap_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); @@ -926,6 +927,10 @@ extern int drm_freebufs( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg ); extern int drm_mapbufs( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg ); +extern unsigned long drm_get_resource_start(drm_device_t *dev, + unsigned int resource); +extern unsigned long drm_get_resource_len(drm_device_t *dev, + unsigned int resource); /* DMA support (drm_dma.h) */ extern int drm_dma_setup(drm_device_t *dev); |