diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-01-25 13:30:46 -0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-01-25 13:30:46 -0800 |
| commit | 3886b7e62925a6eb7ca05e3ab23f3d4781439d06 (patch) | |
| tree | 529c661c969dbaf23f2dcd75c940a892a3f37d0e /shared-core/nouveau_irq.c | |
| parent | 9f5cda44dbf5b8f3c7cc00b8a58eee2690a864e6 (diff) | |
| parent | 90ae39d2f07058dd128d2fb19ffad712ee75c9a0 (diff) | |
Merge branch 'master' into crestline
Diffstat (limited to 'shared-core/nouveau_irq.c')
| -rw-r--r-- | shared-core/nouveau_irq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shared-core/nouveau_irq.c b/shared-core/nouveau_irq.c index a92b8168..ac88b684 100644 --- a/shared-core/nouveau_irq.c +++ b/shared-core/nouveau_irq.c @@ -295,10 +295,10 @@ static void nouveau_pgraph_irq_handler(drm_device_t *dev) nstatus = NV_READ(0x00400104); nsource = NV_READ(0x00400108); - DRM_DEBUG("nsource:0x%08x\tnstatus:0x%08x\n", nsource, nstatus); + DRM_ERROR("nsource:0x%08x\tnstatus:0x%08x\n", nsource, nstatus); instance = NV_READ(0x00400158); - DRM_DEBUG("instance:0x%08x\n", instance); + DRM_ERROR("instance:0x%08x\n", instance); address = NV_READ(0x400704); data = NV_READ(0x400708); @@ -330,6 +330,7 @@ static void nouveau_pgraph_irq_handler(drm_device_t *dev) nouveau_nv10_context_switch(dev); break; case NV_20: + case NV_30: nouveau_nv20_context_switch(dev); break; default: |