Commit 6b1277c8 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/pmu/gt215-: abstract detection of whether reset is needed 



GT215, GF100-GP100, and GP10x are all different.

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

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ nvkm_pmu_reset(struct nvkm_pmu *pmu) 
{

	struct nvkm_device *device = pmu->subdev.device;



	if (!(nvkm_rd32(device, 0x000200) & 0x00002000))

	if (!pmu->func->enabled(pmu))

		return 0;



	/* Inhibit interrupts, and wait for idle. */

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c

+7 −0
Original line number Diff line number Diff line
@@ -34,12 +34,19 @@ gf100_pmu_reset(struct nvkm_pmu *pmu) 
	nvkm_mc_enable(device, NVKM_SUBDEV_PMU);

}



bool

gf100_pmu_enabled(struct nvkm_pmu *pmu)

{

	return nvkm_mc_enabled(pmu->subdev.device, NVKM_SUBDEV_PMU);

}



static const struct nvkm_pmu_func

gf100_pmu = {

	.code.data = gf100_pmu_code,

	.code.size = sizeof(gf100_pmu_code),

	.data.data = gf100_pmu_data,

	.data.size = sizeof(gf100_pmu_data),

	.enabled = gf100_pmu_enabled,

	.reset = gf100_pmu_reset,

	.init = gt215_pmu_init,

	.fini = gt215_pmu_fini,

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ gf119_pmu = { 
	.code.size = sizeof(gf119_pmu_code),

	.data.data = gf119_pmu_data,

	.data.size = sizeof(gf119_pmu_data),

	.enabled = gf100_pmu_enabled,

	.reset = gf100_pmu_reset,

	.init = gt215_pmu_init,

	.fini = gt215_pmu_fini,

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ gk104_pmu = { 
	.code.size = sizeof(gk104_pmu_code),

	.data.data = gk104_pmu_data,

	.data.size = sizeof(gk104_pmu_data),

	.enabled = gf100_pmu_enabled,

	.reset = gf100_pmu_reset,

	.init = gt215_pmu_init,

	.fini = gt215_pmu_fini,

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ gk110_pmu = { 
	.code.size = sizeof(gk110_pmu_code),

	.data.data = gk110_pmu_data,

	.data.size = sizeof(gk110_pmu_data),

	.enabled = gf100_pmu_enabled,

	.reset = gf100_pmu_reset,

	.init = gt215_pmu_init,

	.fini = gt215_pmu_fini,

CRA Git | Maintained and supported by SUSTech CRA and CCSE