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

Commit 1914f673 authored by Samuel Pitoiset's avatar Samuel Pitoiset Committed by Ben Skeggs
Browse files

drm/nouveau/pm/gk104: re-use gf100_pm_ctor() 



gk104_pm_ctor() is equal to gf100_pm_ctor().

Signed-off-by: default avatarSamuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 261d678d

drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,6 @@ extern struct nvkm_oclass *gt215_pm_oclass; 
extern struct nvkm_oclass *gf100_pm_oclass;

extern struct nvkm_oclass *gf108_pm_oclass;

extern struct nvkm_oclass *gf117_pm_oclass;

extern struct nvkm_oclass gk104_pm_oclass;

extern struct nvkm_oclass *gk104_pm_oclass;

extern struct nvkm_oclass gk110_pm_oclass;

#endif

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

+4 −4
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &gk104_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = gk104_pm_oclass;

		break;

	case 0xe7:

		device->cname = "GK107";
@@ -125,7 +125,7 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &gk104_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = gk104_pm_oclass;

		break;

	case 0xe6:

		device->cname = "GK106";
@@ -159,7 +159,7 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_MSVLD  ] = &gk104_msvld_oclass;

		device->oclass[NVDEV_ENGINE_MSPDEC ] = &gk104_mspdec_oclass;

		device->oclass[NVDEV_ENGINE_MSPPP  ] = &gf100_msppp_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &gk104_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = gk104_pm_oclass;

		break;

	case 0xea:

		device->cname = "GK20A";
@@ -179,7 +179,7 @@ gk104_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_SW     ] =  gf100_sw_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gk20a_gr_oclass;

		device->oclass[NVDEV_ENGINE_CE2    ] = &gk104_ce2_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = &gk104_pm_oclass;

		device->oclass[NVDEV_ENGINE_PM     ] = gk104_pm_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &gk20a_volt_oclass;

		device->oclass[NVDEV_SUBDEV_PMU    ] =  gk20a_pmu_oclass;

		break;

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

+9 −51
Original line number Diff line number Diff line
@@ -85,58 +85,16 @@ gk104_pm_part[] = { 
	{}

};



static int

gk104_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine,

	      struct nvkm_oclass *oclass, void *data, u32 size,

	      struct nvkm_object **pobject)

{

	struct gf100_pm_priv *priv;

	u32 mask;

	int ret;



	ret = nvkm_pm_create(parent, engine, oclass, &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;



	/* HUB */

	ret = nvkm_perfdom_new(&priv->base, "hub", 0, 0x1b0000, 0, 0x200,

			       gk104_pm_hub);

	if (ret)

		return ret;



	/* GPC */

	mask  = (1 << nv_rd32(priv, 0x022430)) - 1;

	mask &= ~nv_rd32(priv, 0x022504);

	mask &= ~nv_rd32(priv, 0x022584);



	ret = nvkm_perfdom_new(&priv->base, "gpc", mask, 0x180000,

			       0x1000, 0x200, gk104_pm_gpc);

	if (ret)

		return ret;



	/* PART */

	mask  = (1 << nv_rd32(priv, 0x022438)) - 1;

	mask &= ~nv_rd32(priv, 0x022548);

	mask &= ~nv_rd32(priv, 0x0225c8);



	ret = nvkm_perfdom_new(&priv->base, "part", mask, 0x1a0000,

			       0x1000, 0x200, gk104_pm_part);

	if (ret)

		return ret;



	nv_engine(priv)->cclass = &nvkm_pm_cclass;

	nv_engine(priv)->sclass =  nvkm_pm_sclass;

	return 0;

}



struct nvkm_oclass

gk104_pm_oclass = {

	.handle = NV_ENGINE(PM, 0xe0),

	.ofuncs = &(struct nvkm_ofuncs) {

		.ctor = gk104_pm_ctor,

struct nvkm_oclass *

gk104_pm_oclass = &(struct gf100_pm_oclass) {

	.base.handle = NV_ENGINE(PM, 0xe0),

	.base.ofuncs = &(struct nvkm_ofuncs) {

		.ctor = gf100_pm_ctor,

		.dtor = _nvkm_pm_dtor,

		.init = _nvkm_pm_init,

		.fini = gf100_pm_fini,

	},

};
 
	.doms_gpc  = gk104_pm_gpc,

	.doms_hub  = gk104_pm_hub,

	.doms_part = gk104_pm_part,

}.base;