iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nv04-nv40: register vblank isr

Browse Source 
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2010-11-03 11:36:09 +10:00
parent 8cbe71a6e7
commit 25b85783da
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/nouveau/nouveau_irq.c
View File

@ -1131,20 +1131,6 @@ nv50_pgraph_irq_handler(struct drm_device *dev)
nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) & ~(1 << 31)); nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) & ~(1 << 31));
} }
static void
nouveau_crtc_irq_handler(struct drm_device *dev, int crtc)
{
if (crtc & 1) {
nv_wr32(dev, NV_CRTC0_INTSTAT, NV_CRTC_INTR_VBLANK);
drm_handle_vblank(dev, 0);
}
if (crtc & 2) {
nv_wr32(dev, NV_CRTC1_INTSTAT, NV_CRTC_INTR_VBLANK);
drm_handle_vblank(dev, 1);
}
}
irqreturn_t irqreturn_t
nouveau_irq_handler(DRM_IRQ_ARGS) nouveau_irq_handler(DRM_IRQ_ARGS)
{ {
@ -1174,11 +1160,6 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
status &= ~NV_PMC_INTR_0_PGRAPH_PENDING; status &= ~NV_PMC_INTR_0_PGRAPH_PENDING;
} }
if (status & NV_PMC_INTR_0_CRTCn_PENDING) {
nouveau_crtc_irq_handler(dev, (status>>24)&3);
status &= ~NV_PMC_INTR_0_CRTCn_PENDING;
}
for (i = 0; i < 32 && status; i++) { for (i = 0; i < 32 && status; i++) {
if (!(status & (1 << i)) || !dev_priv->irq_handler[i]) if (!(status & (1 << i)) || !dev_priv->irq_handler[i])
continue; continue;

18
drivers/gpu/drm/nouveau/nv04_display.c
View File

@ -32,6 +32,9 @@
#include "nouveau_encoder.h" #include "nouveau_encoder.h"
#include "nouveau_connector.h" #include "nouveau_connector.h"
static void nv04_vblank_crtc0_isr(struct drm_device *);
static void nv04_vblank_crtc1_isr(struct drm_device *);
static void static void
nv04_display_store_initial_head_owner(struct drm_device *dev) nv04_display_store_initial_head_owner(struct drm_device *dev)
{ {
@ -197,6 +200,8 @@ nv04_display_create(struct drm_device *dev)
func->save(encoder); func->save(encoder);
} }
nouveau_irq_register(dev, 24, nv04_vblank_crtc0_isr);
nouveau_irq_register(dev, 25, nv04_vblank_crtc1_isr);
return 0; return 0;
} }
@ -258,3 +263,16 @@ nv04_display_init(struct drm_device *dev)
return 0; return 0;
} }
static void
nv04_vblank_crtc0_isr(struct drm_device *dev)
{
nv_wr32(dev, NV_CRTC0_INTSTAT, NV_CRTC_INTR_VBLANK);
drm_handle_vblank(dev, 0);
}
static void
nv04_vblank_crtc1_isr(struct drm_device *dev)
{
nv_wr32(dev, NV_CRTC1_INTSTAT, NV_CRTC_INTR_VBLANK);
drm_handle_vblank(dev, 1);
}