diff options
author | Matthieu Castet <castet.matthieu@free.fr> | 2007-10-06 12:00:08 +0200 |
---|---|---|
committer | Matthieu Castet <castet.matthieu@free.fr> | 2007-10-06 12:01:02 +0200 |
commit | 18952a167014f21545e3fda28ed2c09b09789323 (patch) | |
tree | d085f6943fea6673e0283ceb2de974c4f50c7b36 /shared-core | |
parent | 19b7cc34443889fc73de2e10462e1c0f9fa38041 (diff) |
nouveau : print correct value in nouveau_graph_dump_trap_info for nv04
Diffstat (limited to 'shared-core')
-rw-r--r-- | shared-core/nouveau_irq.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/shared-core/nouveau_irq.c b/shared-core/nouveau_irq.c index 45ae6edf..506e8052 100644 --- a/shared-core/nouveau_irq.c +++ b/shared-core/nouveau_irq.c @@ -303,7 +303,11 @@ nouveau_graph_dump_trap_info(struct drm_device *dev) } nsource = NV_READ(NV03_PGRAPH_NSOURCE); nstatus = NV_READ(NV03_PGRAPH_NSTATUS); - if (dev_priv->card_type < NV_50) { + if (dev_priv->card_type < NV_10) { + class = NV_READ(0x400180 + subc*4) & 0xFF; + } else if (dev_priv->card_type < NV_40) { + class = NV_READ(0x400160 + subc*4) & 0xFFF; + } else if (dev_priv->card_type < NV_50) { class = NV_READ(0x400160 + subc*4) & 0xFFFF; } else { class = NV_READ(0x400814); |