diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-08-23 01:14:21 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-02 23:13:07 -0400 |
commit | 757833cc9f0c334ecf739836f4e052c11bf81264 (patch) | |
tree | 8bb6b6170887febd4595ce1c6bd9668248d827c4 /drivers/gpu | |
parent | 5b8a43aeb9cbf6b965f67f6c850382788076325a (diff) |
drm/nouveau/sw: trap and clear PMC_INTR_0_SOFTWARE
Came in useful for debugging another issue earlier, so keep it around.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
5 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/software/nv04.c b/drivers/gpu/drm/nouveau/core/engine/software/nv04.c index f48da7577cc6..3ca4c3aa90b7 100644 --- a/drivers/gpu/drm/nouveau/core/engine/software/nv04.c +++ b/drivers/gpu/drm/nouveau/core/engine/software/nv04.c | |||
@@ -110,6 +110,12 @@ nv04_software_cclass = { | |||
110 | * software engine/subdev functions | 110 | * software engine/subdev functions |
111 | ******************************************************************************/ | 111 | ******************************************************************************/ |
112 | 112 | ||
113 | void | ||
114 | nv04_software_intr(struct nouveau_subdev *subdev) | ||
115 | { | ||
116 | nv_mask(subdev, 0x000100, 0x80000000, 0x00000000); | ||
117 | } | ||
118 | |||
113 | static int | 119 | static int |
114 | nv04_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, | 120 | nv04_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, |
115 | struct nouveau_oclass *oclass, void *data, u32 size, | 121 | struct nouveau_oclass *oclass, void *data, u32 size, |
@@ -125,6 +131,7 @@ nv04_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, | |||
125 | 131 | ||
126 | nv_engine(priv)->cclass = &nv04_software_cclass; | 132 | nv_engine(priv)->cclass = &nv04_software_cclass; |
127 | nv_engine(priv)->sclass = nv04_software_sclass; | 133 | nv_engine(priv)->sclass = nv04_software_sclass; |
134 | nv_subdev(priv)->intr = nv04_software_intr; | ||
128 | return 0; | 135 | return 0; |
129 | } | 136 | } |
130 | 137 | ||
diff --git a/drivers/gpu/drm/nouveau/core/engine/software/nv10.c b/drivers/gpu/drm/nouveau/core/engine/software/nv10.c index 46dada53d272..6e699afbfdb7 100644 --- a/drivers/gpu/drm/nouveau/core/engine/software/nv10.c +++ b/drivers/gpu/drm/nouveau/core/engine/software/nv10.c | |||
@@ -113,6 +113,7 @@ nv10_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, | |||
113 | 113 | ||
114 | nv_engine(priv)->cclass = &nv10_software_cclass; | 114 | nv_engine(priv)->cclass = &nv10_software_cclass; |
115 | nv_engine(priv)->sclass = nv10_software_sclass; | 115 | nv_engine(priv)->sclass = nv10_software_sclass; |
116 | nv_subdev(priv)->intr = nv04_software_intr; | ||
116 | return 0; | 117 | return 0; |
117 | } | 118 | } |
118 | 119 | ||
diff --git a/drivers/gpu/drm/nouveau/core/engine/software/nv50.c b/drivers/gpu/drm/nouveau/core/engine/software/nv50.c index 6b889713480d..a2edcd38544a 100644 --- a/drivers/gpu/drm/nouveau/core/engine/software/nv50.c +++ b/drivers/gpu/drm/nouveau/core/engine/software/nv50.c | |||
@@ -183,6 +183,7 @@ nv50_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, | |||
183 | 183 | ||
184 | nv_engine(priv)->cclass = &nv50_software_cclass; | 184 | nv_engine(priv)->cclass = &nv50_software_cclass; |
185 | nv_engine(priv)->sclass = nv50_software_sclass; | 185 | nv_engine(priv)->sclass = nv50_software_sclass; |
186 | nv_subdev(priv)->intr = nv04_software_intr; | ||
186 | return 0; | 187 | return 0; |
187 | } | 188 | } |
188 | 189 | ||
diff --git a/drivers/gpu/drm/nouveau/core/engine/software/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/software/nvc0.c index e3be78f3a5d8..b7b0d7e330d6 100644 --- a/drivers/gpu/drm/nouveau/core/engine/software/nvc0.c +++ b/drivers/gpu/drm/nouveau/core/engine/software/nvc0.c | |||
@@ -165,6 +165,7 @@ nvc0_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, | |||
165 | 165 | ||
166 | nv_engine(priv)->cclass = &nvc0_software_cclass; | 166 | nv_engine(priv)->cclass = &nvc0_software_cclass; |
167 | nv_engine(priv)->sclass = nvc0_software_sclass; | 167 | nv_engine(priv)->sclass = nvc0_software_sclass; |
168 | nv_subdev(priv)->intr = nv04_software_intr; | ||
168 | return 0; | 169 | return 0; |
169 | } | 170 | } |
170 | 171 | ||
diff --git a/drivers/gpu/drm/nouveau/core/include/engine/software.h b/drivers/gpu/drm/nouveau/core/include/engine/software.h index 8d740793cf8a..c945691c8564 100644 --- a/drivers/gpu/drm/nouveau/core/include/engine/software.h +++ b/drivers/gpu/drm/nouveau/core/include/engine/software.h | |||
@@ -55,4 +55,6 @@ extern struct nouveau_oclass nv10_software_oclass; | |||
55 | extern struct nouveau_oclass nv50_software_oclass; | 55 | extern struct nouveau_oclass nv50_software_oclass; |
56 | extern struct nouveau_oclass nvc0_software_oclass; | 56 | extern struct nouveau_oclass nvc0_software_oclass; |
57 | 57 | ||
58 | void nv04_software_intr(struct nouveau_subdev *); | ||
59 | |||
58 | #endif | 60 | #endif |