diff options
Diffstat (limited to 'drivers/gpu/drm/via/via_irq.c')
| -rw-r--r-- | drivers/gpu/drm/via/via_irq.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c index 34079f251cd..d391f48ef87 100644 --- a/drivers/gpu/drm/via/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c | |||
| @@ -141,11 +141,10 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) | |||
| 141 | atomic_inc(&cur_irq->irq_received); | 141 | atomic_inc(&cur_irq->irq_received); |
| 142 | DRM_WAKEUP(&cur_irq->irq_queue); | 142 | DRM_WAKEUP(&cur_irq->irq_queue); |
| 143 | handled = 1; | 143 | handled = 1; |
| 144 | if (dev_priv->irq_map[drm_via_irq_dma0_td] == i) { | 144 | if (dev_priv->irq_map[drm_via_irq_dma0_td] == i) |
| 145 | via_dmablit_handler(dev, 0, 1); | 145 | via_dmablit_handler(dev, 0, 1); |
| 146 | } else if (dev_priv->irq_map[drm_via_irq_dma1_td] == i) { | 146 | else if (dev_priv->irq_map[drm_via_irq_dma1_td] == i) |
| 147 | via_dmablit_handler(dev, 1, 1); | 147 | via_dmablit_handler(dev, 1, 1); |
| 148 | } | ||
| 149 | } | 148 | } |
| 150 | cur_irq++; | 149 | cur_irq++; |
| 151 | } | 150 | } |
| @@ -160,7 +159,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) | |||
| 160 | return IRQ_NONE; | 159 | return IRQ_NONE; |
| 161 | } | 160 | } |
| 162 | 161 | ||
| 163 | static __inline__ void viadrv_acknowledge_irqs(drm_via_private_t * dev_priv) | 162 | static __inline__ void viadrv_acknowledge_irqs(drm_via_private_t *dev_priv) |
| 164 | { | 163 | { |
| 165 | u32 status; | 164 | u32 status; |
| 166 | 165 | ||
| @@ -207,7 +206,7 @@ void via_disable_vblank(struct drm_device *dev, int crtc) | |||
| 207 | } | 206 | } |
| 208 | 207 | ||
| 209 | static int | 208 | static int |
| 210 | via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequence, | 209 | via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence, |
| 211 | unsigned int *sequence) | 210 | unsigned int *sequence) |
| 212 | { | 211 | { |
| 213 | drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; | 212 | drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; |
| @@ -260,7 +259,7 @@ via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequenc | |||
| 260 | * drm_dma.h hooks | 259 | * drm_dma.h hooks |
| 261 | */ | 260 | */ |
| 262 | 261 | ||
| 263 | void via_driver_irq_preinstall(struct drm_device * dev) | 262 | void via_driver_irq_preinstall(struct drm_device *dev) |
| 264 | { | 263 | { |
| 265 | drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; | 264 | drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; |
| 266 | u32 status; | 265 | u32 status; |
| @@ -329,7 +328,7 @@ int via_driver_irq_postinstall(struct drm_device *dev) | |||
| 329 | return 0; | 328 | return 0; |
| 330 | } | 329 | } |
| 331 | 330 | ||
| 332 | void via_driver_irq_uninstall(struct drm_device * dev) | 331 | void via_driver_irq_uninstall(struct drm_device *dev) |
| 333 | { | 332 | { |
| 334 | drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; | 333 | drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; |
| 335 | u32 status; | 334 | u32 status; |
