tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm: Kill DRM_IRQ_ARGS
I've killed them a long time ago in drm/i915, let's get rid of this
remnant of shared drm core days for good.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
authored by
Daniel Vetter
and committed by
Dave Airlie
e9f0d76f
bfd8303a
+24
-27
+1
-1
drivers/gpu/drm/cirrus/cirrus_drv.h
+1
-1
drivers/gpu/drm/cirrus/cirrus_drv.h
···
222
222
void cirrus_driver_irq_preinstall(struct drm_device *dev);
223
223
int cirrus_driver_irq_postinstall(struct drm_device *dev);
224
224
void cirrus_driver_irq_uninstall(struct drm_device *dev);
225
-
irqreturn_t cirrus_driver_irq_handler(DRM_IRQ_ARGS);
225
+
irqreturn_t cirrus_driver_irq_handler(int irq, void *arg);
226
226
227
227
/* cirrus_kms.c */
228
228
int cirrus_driver_load(struct drm_device *dev, unsigned long flags);
+1
-1
drivers/gpu/drm/gma500/psb_drv.h
+1
-1
drivers/gpu/drm/gma500/psb_drv.h
···
769
769
*psb_irq.c
770
770
*/
771
771
772
-
extern irqreturn_t psb_irq_handler(DRM_IRQ_ARGS);
772
+
extern irqreturn_t psb_irq_handler(int irq, void *arg);
773
773
extern int psb_irq_enable_dpst(struct drm_device *dev);
774
774
extern int psb_irq_disable_dpst(struct drm_device *dev);
775
775
extern void psb_irq_preinstall(struct drm_device *dev);
+1
-1
drivers/gpu/drm/gma500/psb_irq.c
+1
-1
drivers/gpu/drm/gma500/psb_irq.c
+1
-1
drivers/gpu/drm/gma500/psb_irq.h
+1
-1
drivers/gpu/drm/gma500/psb_irq.h
···
32
32
void psb_irq_preinstall(struct drm_device *dev);
33
33
int psb_irq_postinstall(struct drm_device *dev);
34
34
void psb_irq_uninstall(struct drm_device *dev);
35
-
irqreturn_t psb_irq_handler(DRM_IRQ_ARGS);
35
+
irqreturn_t psb_irq_handler(int irq, void *arg);
36
36
37
37
int psb_irq_enable_dpst(struct drm_device *dev);
38
38
int psb_irq_disable_dpst(struct drm_device *dev);
+1
-1
drivers/gpu/drm/mga/mga_drv.h
+1
-1
drivers/gpu/drm/mga/mga_drv.h
···
186
186
extern u32 mga_get_vblank_counter(struct drm_device *dev, int crtc);
187
187
extern int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence);
188
188
extern int mga_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence);
189
-
extern irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS);
189
+
extern irqreturn_t mga_driver_irq_handler(int irq, void *arg);
190
190
extern void mga_driver_irq_preinstall(struct drm_device *dev);
191
191
extern int mga_driver_irq_postinstall(struct drm_device *dev);
192
192
extern void mga_driver_irq_uninstall(struct drm_device *dev);
+1
-1
drivers/gpu/drm/mga/mga_irq.c
+1
-1
drivers/gpu/drm/mga/mga_irq.c
+1
-1
drivers/gpu/drm/msm/msm_drv.c
+1
-1
drivers/gpu/drm/msm/msm_drv.c
+1
-1
drivers/gpu/drm/omapdrm/omap_drv.h
+1
-1
drivers/gpu/drm/omapdrm/omap_drv.h
···
141
141
142
142
int omap_irq_enable_vblank(struct drm_device *dev, int crtc_id);
143
143
void omap_irq_disable_vblank(struct drm_device *dev, int crtc_id);
144
-
irqreturn_t omap_irq_handler(DRM_IRQ_ARGS);
144
+
irqreturn_t omap_irq_handler(int irq, void *arg);
145
145
void omap_irq_preinstall(struct drm_device *dev);
146
146
int omap_irq_postinstall(struct drm_device *dev);
147
147
void omap_irq_uninstall(struct drm_device *dev);
+1
-1
drivers/gpu/drm/omapdrm/omap_irq.c
+1
-1
drivers/gpu/drm/omapdrm/omap_irq.c
+1
-1
drivers/gpu/drm/qxl/qxl_drv.h
+1
-1
drivers/gpu/drm/qxl/qxl_drv.h
+1
-1
drivers/gpu/drm/qxl/qxl_irq.c
+1
-1
drivers/gpu/drm/qxl/qxl_irq.c
+1
-1
drivers/gpu/drm/r128/r128_drv.h
+1
-1
drivers/gpu/drm/r128/r128_drv.h
···
154
154
extern int r128_enable_vblank(struct drm_device *dev, int crtc);
155
155
extern void r128_disable_vblank(struct drm_device *dev, int crtc);
156
156
extern u32 r128_get_vblank_counter(struct drm_device *dev, int crtc);
157
-
extern irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS);
157
+
extern irqreturn_t r128_driver_irq_handler(int irq, void *arg);
158
158
extern void r128_driver_irq_preinstall(struct drm_device *dev);
159
159
extern int r128_driver_irq_postinstall(struct drm_device *dev);
160
160
extern void r128_driver_irq_uninstall(struct drm_device *dev);
+1
-1
drivers/gpu/drm/r128/r128_irq.c
+1
-1
drivers/gpu/drm/r128/r128_irq.c
···
44
44
return atomic_read(&dev_priv->vbl_received);
45
45
}
46
46
47
-
irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
47
+
irqreturn_t r128_driver_irq_handler(int irq, void *arg)
48
48
{
49
49
struct drm_device *dev = (struct drm_device *) arg;
50
50
drm_r128_private_t *dev_priv = (drm_r128_private_t *) dev->dev_private;
+1
-1
drivers/gpu/drm/radeon/radeon_drv.c
+1
-1
drivers/gpu/drm/radeon/radeon_drv.c
···
101
101
void radeon_driver_irq_preinstall_kms(struct drm_device *dev);
102
102
int radeon_driver_irq_postinstall_kms(struct drm_device *dev);
103
103
void radeon_driver_irq_uninstall_kms(struct drm_device *dev);
104
-
irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS);
104
+
irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg);
105
105
void radeon_gem_object_free(struct drm_gem_object *obj);
106
106
int radeon_gem_object_open(struct drm_gem_object *obj,
107
107
struct drm_file *file_priv);
+1
-1
drivers/gpu/drm/radeon/radeon_drv.h
+1
-1
drivers/gpu/drm/radeon/radeon_drv.h
···
405
405
extern u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc);
406
406
extern int radeon_enable_vblank(struct drm_device *dev, int crtc);
407
407
extern void radeon_disable_vblank(struct drm_device *dev, int crtc);
408
-
extern irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS);
408
+
extern irqreturn_t radeon_driver_irq_handler(int irq, void *arg);
409
409
extern void radeon_driver_irq_preinstall(struct drm_device * dev);
410
410
extern int radeon_driver_irq_postinstall(struct drm_device *dev);
411
411
extern void radeon_driver_irq_uninstall(struct drm_device * dev);
+1
-1
drivers/gpu/drm/radeon/radeon_irq.c
+1
-1
drivers/gpu/drm/radeon/radeon_irq.c
···
181
181
* tied to dma at all, this is just a hangover from dri prehistory.
182
182
*/
183
183
184
-
irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)
184
+
irqreturn_t radeon_driver_irq_handler(int irq, void *arg)
185
185
{
186
186
struct drm_device *dev = (struct drm_device *) arg;
187
187
drm_radeon_private_t *dev_priv =
+2
-2
drivers/gpu/drm/radeon/radeon_irq_kms.c
+2
-2
drivers/gpu/drm/radeon/radeon_irq_kms.c
···
39
39
/**
40
40
* radeon_driver_irq_handler_kms - irq handler for KMS
41
41
*
42
-
* @DRM_IRQ_ARGS: args
42
+
* @int irq, void *arg: args
43
43
*
44
44
* This is the irq handler for the radeon KMS driver (all asics).
45
45
* radeon_irq_process is a macro that points to the per-asic
46
46
* irq handler callback.
47
47
*/
48
-
irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS)
48
+
irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg)
49
49
{
50
50
struct drm_device *dev = (struct drm_device *) arg;
51
51
struct radeon_device *rdev = dev->dev_private;
+1
-1
drivers/gpu/drm/tilcdc/tilcdc_drv.c
+1
-1
drivers/gpu/drm/tilcdc/tilcdc_drv.c
+1
-1
drivers/gpu/drm/via/via_drv.h
+1
-1
drivers/gpu/drm/via/via_drv.h
···
138
138
extern int via_enable_vblank(struct drm_device *dev, int crtc);
139
139
extern void via_disable_vblank(struct drm_device *dev, int crtc);
140
140
141
-
extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS);
141
+
extern irqreturn_t via_driver_irq_handler(int irq, void *arg);
142
142
extern void via_driver_irq_preinstall(struct drm_device *dev);
143
143
extern int via_driver_irq_postinstall(struct drm_device *dev);
144
144
extern void via_driver_irq_uninstall(struct drm_device *dev);
+1
-1
drivers/gpu/drm/via/via_irq.c
+1
-1
drivers/gpu/drm/via/via_irq.c
···
104
104
return atomic_read(&dev_priv->vbl_received);
105
105
}
106
106
107
-
irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
107
+
irqreturn_t via_driver_irq_handler(int irq, void *arg)
108
108
{
109
109
struct drm_device *dev = (struct drm_device *) arg;
110
110
drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+1
-1
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+1
-1
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
···
701
701
* IRQs and wating - vmwgfx_irq.c
702
702
*/
703
703
704
-
extern irqreturn_t vmw_irq_handler(DRM_IRQ_ARGS);
704
+
extern irqreturn_t vmw_irq_handler(int irq, void *arg);
705
705
extern int vmw_wait_seqno(struct vmw_private *dev_priv, bool lazy,
706
706
uint32_t seqno, bool interruptible,
707
707
unsigned long timeout);
+1
-1
drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+1
-1
drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+1
-1
include/drm/drmP.h
+1
-1
include/drm/drmP.h
···
915
915
916
916
/* these have to be filled in */
917
917
918
-
irqreturn_t(*irq_handler) (DRM_IRQ_ARGS);
918
+
irqreturn_t(*irq_handler) (int irq, void *arg);
919
919
void (*irq_preinstall) (struct drm_device *dev);
920
920
int (*irq_postinstall) (struct drm_device *dev);
921
921
void (*irq_uninstall) (struct drm_device *dev);
-3
include/drm/drm_os_linux.h
-3
include/drm/drm_os_linux.h
···
48
48
/** Read/write memory barrier */
49
49
#define DRM_MEMORYBARRIER() mb()
50
50
51
-
/** IRQ handler arguments and return type and values */
52
-
#define DRM_IRQ_ARGS int irq, void *arg
53
-
54
51
/** Other copying of data to kernel space */
55
52
#define DRM_COPY_FROM_USER(arg1, arg2, arg3) \
56
53
copy_from_user(arg1, arg2, arg3)