diff options
author | Eric Anholt <eric@anholt.net> | 2007-08-25 06:23:09 -0400 |
---|---|---|
committer | Dave Airlie <airlied@optimus.(none)> | 2007-10-14 20:38:20 -0400 |
commit | 6c340eac0285f3d62406d2d902d0e96fbf2a5dc0 (patch) | |
tree | a92039951cb7eaced306cfff2bad6af0ac5257ad /drivers/char/drm/i830_drv.h | |
parent | 20caafa6ecb2487d9b223aa33e7cc704f912a758 (diff) |
drm: Replace filp in ioctl arguments with drm_file *file_priv.
As a fallout, replace filp storage with file_priv storage for "unique
identifier of a client" all over the DRM. There is a 1:1 mapping, so this
should be a noop. This could be a minor performance improvement, as everyth
on Linux dereferenced filp to get file_priv anyway, while only the mmap ioct
went the other direction.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i830_drv.h')
-rw-r--r-- | drivers/char/drm/i830_drv.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/char/drm/i830_drv.h b/drivers/char/drm/i830_drv.h index ddda67956dea..615bf9f4cb4a 100644 --- a/drivers/char/drm/i830_drv.h +++ b/drivers/char/drm/i830_drv.h | |||
@@ -126,9 +126,9 @@ extern drm_ioctl_desc_t i830_ioctls[]; | |||
126 | extern int i830_max_ioctl; | 126 | extern int i830_max_ioctl; |
127 | 127 | ||
128 | /* i830_irq.c */ | 128 | /* i830_irq.c */ |
129 | extern int i830_irq_emit(struct inode *inode, struct file *filp, | 129 | extern int i830_irq_emit(struct inode *inode, struct drm_file *file_priv, |
130 | unsigned int cmd, unsigned long arg); | 130 | unsigned int cmd, unsigned long arg); |
131 | extern int i830_irq_wait(struct inode *inode, struct file *filp, | 131 | extern int i830_irq_wait(struct inode *inode, struct drm_file *file_priv, |
132 | unsigned int cmd, unsigned long arg); | 132 | unsigned int cmd, unsigned long arg); |
133 | 133 | ||
134 | extern irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS); | 134 | extern irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS); |
@@ -136,10 +136,11 @@ extern void i830_driver_irq_preinstall(struct drm_device * dev); | |||
136 | extern void i830_driver_irq_postinstall(struct drm_device * dev); | 136 | extern void i830_driver_irq_postinstall(struct drm_device * dev); |
137 | extern void i830_driver_irq_uninstall(struct drm_device * dev); | 137 | extern void i830_driver_irq_uninstall(struct drm_device * dev); |
138 | extern int i830_driver_load(struct drm_device *, unsigned long flags); | 138 | extern int i830_driver_load(struct drm_device *, unsigned long flags); |
139 | extern void i830_driver_preclose(struct drm_device * dev, DRMFILE filp); | 139 | extern void i830_driver_preclose(struct drm_device * dev, |
140 | struct drm_file *file_priv); | ||
140 | extern void i830_driver_lastclose(struct drm_device * dev); | 141 | extern void i830_driver_lastclose(struct drm_device * dev); |
141 | extern void i830_driver_reclaim_buffers_locked(struct drm_device * dev, | 142 | extern void i830_driver_reclaim_buffers_locked(struct drm_device * dev, |
142 | struct file *filp); | 143 | struct drm_file *file_priv); |
143 | extern int i830_driver_dma_quiescent(struct drm_device * dev); | 144 | extern int i830_driver_dma_quiescent(struct drm_device * dev); |
144 | extern int i830_driver_device_is_agp(struct drm_device * dev); | 145 | extern int i830_driver_device_is_agp(struct drm_device * dev); |
145 | 146 | ||