diff options
Diffstat (limited to 'drivers/char/drm/radeon_irq.c')
-rw-r--r-- | drivers/char/drm/radeon_irq.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c index a4be86e38121..ad8a0ac7182e 100644 --- a/drivers/char/drm/radeon_irq.c +++ b/drivers/char/drm/radeon_irq.c | |||
@@ -64,7 +64,7 @@ static __inline__ u32 radeon_acknowledge_irqs(drm_radeon_private_t * dev_priv, | |||
64 | 64 | ||
65 | irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) | 65 | irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) |
66 | { | 66 | { |
67 | drm_device_t *dev = (drm_device_t *) arg; | 67 | struct drm_device *dev = (struct drm_device *) arg; |
68 | drm_radeon_private_t *dev_priv = | 68 | drm_radeon_private_t *dev_priv = |
69 | (drm_radeon_private_t *) dev->dev_private; | 69 | (drm_radeon_private_t *) dev->dev_private; |
70 | u32 stat; | 70 | u32 stat; |
@@ -109,7 +109,7 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) | |||
109 | return IRQ_HANDLED; | 109 | return IRQ_HANDLED; |
110 | } | 110 | } |
111 | 111 | ||
112 | static int radeon_emit_irq(drm_device_t * dev) | 112 | static int radeon_emit_irq(struct drm_device * dev) |
113 | { | 113 | { |
114 | drm_radeon_private_t *dev_priv = dev->dev_private; | 114 | drm_radeon_private_t *dev_priv = dev->dev_private; |
115 | unsigned int ret; | 115 | unsigned int ret; |
@@ -127,7 +127,7 @@ static int radeon_emit_irq(drm_device_t * dev) | |||
127 | return ret; | 127 | return ret; |
128 | } | 128 | } |
129 | 129 | ||
130 | static int radeon_wait_irq(drm_device_t * dev, int swi_nr) | 130 | static int radeon_wait_irq(struct drm_device * dev, int swi_nr) |
131 | { | 131 | { |
132 | drm_radeon_private_t *dev_priv = | 132 | drm_radeon_private_t *dev_priv = |
133 | (drm_radeon_private_t *) dev->dev_private; | 133 | (drm_radeon_private_t *) dev->dev_private; |
@@ -144,7 +144,7 @@ static int radeon_wait_irq(drm_device_t * dev, int swi_nr) | |||
144 | return ret; | 144 | return ret; |
145 | } | 145 | } |
146 | 146 | ||
147 | int radeon_driver_vblank_do_wait(drm_device_t * dev, unsigned int *sequence, | 147 | int radeon_driver_vblank_do_wait(struct drm_device * dev, unsigned int *sequence, |
148 | int crtc) | 148 | int crtc) |
149 | { | 149 | { |
150 | drm_radeon_private_t *dev_priv = | 150 | drm_radeon_private_t *dev_priv = |
@@ -184,12 +184,12 @@ int radeon_driver_vblank_do_wait(drm_device_t * dev, unsigned int *sequence, | |||
184 | return ret; | 184 | return ret; |
185 | } | 185 | } |
186 | 186 | ||
187 | int radeon_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence) | 187 | int radeon_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence) |
188 | { | 188 | { |
189 | return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC1); | 189 | return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC1); |
190 | } | 190 | } |
191 | 191 | ||
192 | int radeon_driver_vblank_wait2(drm_device_t *dev, unsigned int *sequence) | 192 | int radeon_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence) |
193 | { | 193 | { |
194 | return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC2); | 194 | return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC2); |
195 | } | 195 | } |
@@ -242,7 +242,7 @@ int radeon_irq_wait(DRM_IOCTL_ARGS) | |||
242 | return radeon_wait_irq(dev, irqwait.irq_seq); | 242 | return radeon_wait_irq(dev, irqwait.irq_seq); |
243 | } | 243 | } |
244 | 244 | ||
245 | static void radeon_enable_interrupt(drm_device_t *dev) | 245 | static void radeon_enable_interrupt(struct drm_device *dev) |
246 | { | 246 | { |
247 | drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; | 247 | drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; |
248 | 248 | ||
@@ -259,7 +259,7 @@ static void radeon_enable_interrupt(drm_device_t *dev) | |||
259 | 259 | ||
260 | /* drm_dma.h hooks | 260 | /* drm_dma.h hooks |
261 | */ | 261 | */ |
262 | void radeon_driver_irq_preinstall(drm_device_t * dev) | 262 | void radeon_driver_irq_preinstall(struct drm_device * dev) |
263 | { | 263 | { |
264 | drm_radeon_private_t *dev_priv = | 264 | drm_radeon_private_t *dev_priv = |
265 | (drm_radeon_private_t *) dev->dev_private; | 265 | (drm_radeon_private_t *) dev->dev_private; |
@@ -273,7 +273,7 @@ void radeon_driver_irq_preinstall(drm_device_t * dev) | |||
273 | RADEON_CRTC2_VBLANK_STAT)); | 273 | RADEON_CRTC2_VBLANK_STAT)); |
274 | } | 274 | } |
275 | 275 | ||
276 | void radeon_driver_irq_postinstall(drm_device_t * dev) | 276 | void radeon_driver_irq_postinstall(struct drm_device * dev) |
277 | { | 277 | { |
278 | drm_radeon_private_t *dev_priv = | 278 | drm_radeon_private_t *dev_priv = |
279 | (drm_radeon_private_t *) dev->dev_private; | 279 | (drm_radeon_private_t *) dev->dev_private; |
@@ -284,7 +284,7 @@ void radeon_driver_irq_postinstall(drm_device_t * dev) | |||
284 | radeon_enable_interrupt(dev); | 284 | radeon_enable_interrupt(dev); |
285 | } | 285 | } |
286 | 286 | ||
287 | void radeon_driver_irq_uninstall(drm_device_t * dev) | 287 | void radeon_driver_irq_uninstall(struct drm_device * dev) |
288 | { | 288 | { |
289 | drm_radeon_private_t *dev_priv = | 289 | drm_radeon_private_t *dev_priv = |
290 | (drm_radeon_private_t *) dev->dev_private; | 290 | (drm_radeon_private_t *) dev->dev_private; |
@@ -298,7 +298,7 @@ void radeon_driver_irq_uninstall(drm_device_t * dev) | |||
298 | } | 298 | } |
299 | 299 | ||
300 | 300 | ||
301 | int radeon_vblank_crtc_get(drm_device_t *dev) | 301 | int radeon_vblank_crtc_get(struct drm_device *dev) |
302 | { | 302 | { |
303 | drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; | 303 | drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; |
304 | u32 flag; | 304 | u32 flag; |
@@ -315,7 +315,7 @@ int radeon_vblank_crtc_get(drm_device_t *dev) | |||
315 | return value; | 315 | return value; |
316 | } | 316 | } |
317 | 317 | ||
318 | int radeon_vblank_crtc_set(drm_device_t *dev, int64_t value) | 318 | int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value) |
319 | { | 319 | { |
320 | drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; | 320 | drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; |
321 | if (value & ~(DRM_RADEON_VBLANK_CRTC1 | DRM_RADEON_VBLANK_CRTC2)) { | 321 | if (value & ~(DRM_RADEON_VBLANK_CRTC1 | DRM_RADEON_VBLANK_CRTC2)) { |