Commit 757833cc authored by Ben Skeggs's avatar Ben Skeggs

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: default avatarBen Skeggs <bskeggs@redhat.com>
parent 5b8a43ae
...@@ -110,6 +110,12 @@ nv04_software_cclass = { ...@@ -110,6 +110,12 @@ nv04_software_cclass = {
* software engine/subdev functions * software engine/subdev functions
******************************************************************************/ ******************************************************************************/
void
nv04_software_intr(struct nouveau_subdev *subdev)
{
nv_mask(subdev, 0x000100, 0x80000000, 0x00000000);
}
static int static int
nv04_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, nv04_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size, struct nouveau_oclass *oclass, void *data, u32 size,
...@@ -125,6 +131,7 @@ nv04_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, ...@@ -125,6 +131,7 @@ nv04_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
nv_engine(priv)->cclass = &nv04_software_cclass; nv_engine(priv)->cclass = &nv04_software_cclass;
nv_engine(priv)->sclass = nv04_software_sclass; nv_engine(priv)->sclass = nv04_software_sclass;
nv_subdev(priv)->intr = nv04_software_intr;
return 0; return 0;
} }
......
...@@ -113,6 +113,7 @@ nv10_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, ...@@ -113,6 +113,7 @@ nv10_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
nv_engine(priv)->cclass = &nv10_software_cclass; nv_engine(priv)->cclass = &nv10_software_cclass;
nv_engine(priv)->sclass = nv10_software_sclass; nv_engine(priv)->sclass = nv10_software_sclass;
nv_subdev(priv)->intr = nv04_software_intr;
return 0; return 0;
} }
......
...@@ -183,6 +183,7 @@ nv50_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, ...@@ -183,6 +183,7 @@ nv50_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
nv_engine(priv)->cclass = &nv50_software_cclass; nv_engine(priv)->cclass = &nv50_software_cclass;
nv_engine(priv)->sclass = nv50_software_sclass; nv_engine(priv)->sclass = nv50_software_sclass;
nv_subdev(priv)->intr = nv04_software_intr;
return 0; return 0;
} }
......
...@@ -165,6 +165,7 @@ nvc0_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine, ...@@ -165,6 +165,7 @@ nvc0_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
nv_engine(priv)->cclass = &nvc0_software_cclass; nv_engine(priv)->cclass = &nvc0_software_cclass;
nv_engine(priv)->sclass = nvc0_software_sclass; nv_engine(priv)->sclass = nvc0_software_sclass;
nv_subdev(priv)->intr = nv04_software_intr;
return 0; return 0;
} }
......
...@@ -55,4 +55,6 @@ extern struct nouveau_oclass nv10_software_oclass; ...@@ -55,4 +55,6 @@ extern struct nouveau_oclass nv10_software_oclass;
extern struct nouveau_oclass nv50_software_oclass; extern struct nouveau_oclass nv50_software_oclass;
extern struct nouveau_oclass nvc0_software_oclass; extern struct nouveau_oclass nvc0_software_oclass;
void nv04_software_intr(struct nouveau_subdev *);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment