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

Commit 7f2062e9 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50: remove execution engine context saves on suspend 



Now triggered automagically by the GPU on PFIFO takedown.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 03bd6efa

drivers/gpu/drm/nouveau/nv50_graph.c

+0 −6
Original line number Diff line number Diff line
@@ -210,12 +210,6 @@ nv50_graph_init(struct drm_device *dev, int engine) 
static int

nv50_graph_fini(struct drm_device *dev, int engine, bool suspend)

{

	nv_mask(dev, 0x400500, 0x00010001, 0x00000000);

	if (!nv_wait(dev, 0x400700, ~0, 0) && suspend) {

		nv_mask(dev, 0x400500, 0x00010001, 0x00010001);

		return -EBUSY;

	}

	nv50_graph_unload_context(dev);

	nv_wr32(dev, 0x40013c, 0x00000000);

	return 0;

}

drivers/gpu/drm/nouveau/nv50_mpeg.c

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ nv50_mpeg_init(struct drm_device *dev, int engine) 
static int

nv50_mpeg_fini(struct drm_device *dev, int engine, bool suspend)

{

	/*XXX: context save for s/r */

	nv_mask(dev, 0x00b32c, 0x00000001, 0x00000000);

	nv_wr32(dev, 0x00b140, 0x00000000);

	return 0;

drivers/gpu/drm/nouveau/nva3_copy.c

+0 −7
Original line number Diff line number Diff line
@@ -143,13 +143,6 @@ static int 
nva3_copy_fini(struct drm_device *dev, int engine, bool suspend)

{

	nv_mask(dev, 0x104048, 0x00000003, 0x00000000);



	/* trigger fuc context unload */

	nv_wait(dev, 0x104008, 0x0000000c, 0x00000000);

	nv_mask(dev, 0x104054, 0x40000000, 0x00000000);

	nv_wr32(dev, 0x104000, 0x00000008);

	nv_wait(dev, 0x104008, 0x00000008, 0x00000000);



	nv_wr32(dev, 0x104014, 0xffffffff);

	return 0;

}