diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-11-02 20:18:04 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-03 00:11:32 -0500 |
| commit | 2cbd4c818578ef8f2e486dc77267ead1e503c637 (patch) | |
| tree | 15bebf560673a717f294f4ff420851170685c7f4 /drivers/gpu/drm/nouveau/nouveau_irq.c | |
| parent | d7facf9dc50acff69de9688088caa78b3cf69ebb (diff) | |
drm/nv50: move GPIO ISR to nv50_gpio.c
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_irq.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_irq.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c index bdaf8ae44476..061bae33b6e0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_irq.c +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c | |||
| @@ -1238,11 +1238,9 @@ nouveau_irq_handler(DRM_IRQ_ARGS) | |||
| 1238 | status &= ~NV_PMC_INTR_0_CRTCn_PENDING; | 1238 | status &= ~NV_PMC_INTR_0_CRTCn_PENDING; |
| 1239 | } | 1239 | } |
| 1240 | 1240 | ||
| 1241 | if (status & (NV_PMC_INTR_0_NV50_DISPLAY_PENDING | | 1241 | if (status & NV_PMC_INTR_0_NV50_DISPLAY_PENDING) { |
| 1242 | NV_PMC_INTR_0_NV50_I2C_PENDING)) { | ||
| 1243 | nv50_display_irq_handler(dev); | 1242 | nv50_display_irq_handler(dev); |
| 1244 | status &= ~(NV_PMC_INTR_0_NV50_DISPLAY_PENDING | | 1243 | status &= ~NV_PMC_INTR_0_NV50_DISPLAY_PENDING; |
| 1245 | NV_PMC_INTR_0_NV50_I2C_PENDING); | ||
| 1246 | } | 1244 | } |
| 1247 | 1245 | ||
| 1248 | for (i = 0; i < 32 && status; i++) { | 1246 | for (i = 0; i < 32 && status; i++) { |