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

Commit e1fc44fb authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/pmu/gk110: implement gr power-up magic like PGOB on earlier chips 



Turns out the PTHERM part of this dance is bracketed by the same PMU
fiddling that occurs on GK104/6, let's assume it's also PGOB.

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

drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ extern struct nvkm_oclass *gt215_pmu_oclass; 
extern struct nvkm_oclass *gf100_pmu_oclass;

extern struct nvkm_oclass *gf110_pmu_oclass;

extern struct nvkm_oclass *gk104_pmu_oclass;

extern struct nvkm_oclass *gk110_pmu_oclass;

extern struct nvkm_oclass *gk208_pmu_oclass;

extern struct nvkm_oclass *gk20a_pmu_oclass;

drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &gf100_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  gf110_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  gk110_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
@@ -236,7 +236,7 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_MMU    ] = &gf100_mmu_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  gf110_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  gk110_pmu_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;

drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h

+0 −3
Original line number Diff line number Diff line
@@ -124,11 +124,8 @@ void gf100_gr_dtor(struct nvkm_object *); 
int  gf100_gr_init(struct nvkm_object *);

void gf100_gr_zbc_init(struct gf100_gr_priv *);



int  gk104_gr_fini(struct nvkm_object *, bool);

int  gk104_gr_init(struct nvkm_object *);



int  gk110_gr_fini(struct nvkm_object *, bool);



extern struct nvkm_ofuncs gf100_fermi_ofuncs;



extern struct nvkm_oclass gf100_gr_sclass[];

drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c

+1 −38
Original line number Diff line number Diff line
@@ -173,43 +173,6 @@ gk110_gr_pack_mmio[] = { 
 * PGRAPH engine/subdev functions

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



int

gk110_gr_fini(struct nvkm_object *object, bool suspend)

{

	struct gf100_gr_priv *priv = (void *)object;

	static const struct {

		u32 addr;

		u32 data;

	} magic[] = {

		{ 0x020520, 0xfffffffc },

		{ 0x020524, 0xfffffffe },

		{ 0x020524, 0xfffffffc },

		{ 0x020524, 0xfffffff8 },

		{ 0x020524, 0xffffffe0 },

		{ 0x020530, 0xfffffffe },

		{ 0x02052c, 0xfffffffa },

		{ 0x02052c, 0xfffffff0 },

		{ 0x02052c, 0xffffffc0 },

		{ 0x02052c, 0xffffff00 },

		{ 0x02052c, 0xfffffc00 },

		{ 0x02052c, 0xfffcfc00 },

		{ 0x02052c, 0xfff0fc00 },

		{ 0x02052c, 0xff80fc00 },

		{ 0x020528, 0xfffffffe },

		{ 0x020528, 0xfffffffc },

	};

	int i;



	nv_mask(priv, 0x000200, 0x08001000, 0x00000000);

	nv_mask(priv, 0x0206b4, 0x00000000, 0x00000000);

	for (i = 0; i < ARRAY_SIZE(magic); i++) {

		nv_wr32(priv, magic[i].addr, magic[i].data);

		nv_wait(priv, magic[i].addr, 0x80000000, 0x00000000);

	}



	return nvkm_gr_fini(&priv->base, suspend);

}



#include "fuc/hubgk110.fuc3.h"



struct gf100_gr_ucode
@@ -237,7 +200,7 @@ gk110_gr_oclass = &(struct gf100_gr_oclass) { 
		.ctor = gf100_gr_ctor,

		.dtor = gf100_gr_dtor,

		.init = gk104_gr_init,

		.fini = gk110_gr_fini,

		.fini = _nvkm_gr_fini,

	},

	.cclass = &gk110_grctx_oclass,

	.sclass =  gk110_gr_sclass,

drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ gk110b_gr_oclass = &(struct gf100_gr_oclass) { 
		.ctor = gf100_gr_ctor,

		.dtor = gf100_gr_dtor,

		.init = gk104_gr_init,

		.fini = gk110_gr_fini,

		.fini = _nvkm_gr_fini,

	},

	.cclass = &gk110b_grctx_oclass,

	.sclass =  gk110_gr_sclass,