projects
/
platform
/
upstream
/
libdrm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19b7cc3
)
nouveau : print correct value in nouveau_graph_dump_trap_info for nv04
author
Matthieu Castet
<castet.matthieu@free.fr>
Sat, 6 Oct 2007 10:00:08 +0000
(12:00 +0200)
committer
Matthieu Castet
<castet.matthieu@free.fr>
Sat, 6 Oct 2007 10:01:02 +0000
(12:01 +0200)
shared-core/nouveau_irq.c
patch
|
blob
|
history
diff --git
a/shared-core/nouveau_irq.c
b/shared-core/nouveau_irq.c
index
45ae6ed
..
506e805
100644
(file)
--- 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);