Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/nouveau/core/engine/software/nv04.c

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,12 @@ nv04_software_cclass = { 
 * software engine/subdev functions

 ******************************************************************************/



void

nv04_software_intr(struct nouveau_subdev *subdev)

{

	nv_mask(subdev, 0x000100, 0x80000000, 0x00000000);

}



static int

nv04_software_ctor(struct nouveau_object *parent, struct nouveau_object *engine,

	      struct nouveau_oclass *oclass, void *data, u32 size,
@@ -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)->sclass = nv04_software_sclass;

	nv_subdev(priv)->intr = nv04_software_intr;

	return 0;

}

drivers/gpu/drm/nouveau/core/engine/software/nv10.c

+1 −0
Original line number Diff line number Diff line
@@ -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)->sclass = nv10_software_sclass;

	nv_subdev(priv)->intr = nv04_software_intr;

	return 0;

}

drivers/gpu/drm/nouveau/core/engine/software/nv50.c

+1 −0
Original line number Diff line number Diff line
@@ -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)->sclass = nv50_software_sclass;

	nv_subdev(priv)->intr = nv04_software_intr;

	return 0;

}

drivers/gpu/drm/nouveau/core/engine/software/nvc0.c

+1 −0
Original line number Diff line number Diff line
@@ -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)->sclass = nvc0_software_sclass;

	nv_subdev(priv)->intr = nv04_software_intr;

	return 0;

}

drivers/gpu/drm/nouveau/core/include/engine/software.h

+2 −0
Original line number Diff line number Diff line
@@ -55,4 +55,6 @@ extern struct nouveau_oclass nv10_software_oclass; 
extern struct nouveau_oclass nv50_software_oclass;

extern struct nouveau_oclass nvc0_software_oclass;



void nv04_software_intr(struct nouveau_subdev *);



#endif