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

Commit 56d06fa2 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/core: remove pmc_enable argument from subdev ctor 



These are now specified directly in the MC subdev.

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

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

+2 −4
Original line number Diff line number Diff line
@@ -38,11 +38,9 @@ struct nvkm_engine_func { 
};



int nvkm_engine_ctor(const struct nvkm_engine_func *, struct nvkm_device *,

		     int index, u32 pmc_enable, bool enable,

		     struct nvkm_engine *);

		     int index, bool enable, struct nvkm_engine *);

int nvkm_engine_new_(const struct nvkm_engine_func *, struct nvkm_device *,

		     int index, u32 pmc_enable, bool enable,

		     struct nvkm_engine **);

		     int index, bool enable, struct nvkm_engine **);

struct nvkm_engine *nvkm_engine_ref(struct nvkm_engine *);

void nvkm_engine_unref(struct nvkm_engine **);

void nvkm_engine_tile(struct nvkm_engine *, int region);

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

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ struct nvkm_subdev { 
	const struct nvkm_subdev_func *func;

	struct nvkm_device *device;

	enum nvkm_devidx index;

	u32 pmc_enable;

	struct mutex mutex;

	u32 debug;
@@ -24,7 +23,7 @@ struct nvkm_subdev_func { 


extern const char *nvkm_subdev_name[NVKM_SUBDEV_NR];

void nvkm_subdev_ctor(const struct nvkm_subdev_func *, struct nvkm_device *,

		      int index, u32 pmc_enable, struct nvkm_subdev *);

		      int index, struct nvkm_subdev *);

void nvkm_subdev_del(struct nvkm_subdev **);

int  nvkm_subdev_preinit(struct nvkm_subdev *);

int  nvkm_subdev_init(struct nvkm_subdev *);

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

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct nvkm_falcon_func { 
		u32 *data;

		u32  size;

	} data;

	u32 pmc_enable;

	void (*init)(struct nvkm_falcon *);

	void (*intr)(struct nvkm_falcon *, struct nvkm_fifo_chan *);

	struct nvkm_sclass sclass[];

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

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ int nvkm_xtensa_new_(const struct nvkm_xtensa_func *, struct nvkm_device *, 
		     int index, bool enable, u32 addr, struct nvkm_engine **);



struct nvkm_xtensa_func {

	u32 pmc_enable;

	u32 fifo_val;

	u32 unkd28;

	struct nvkm_sclass sclass[];

drivers/gpu/drm/nouveau/nvkm/core/engine.c

+6 −8
Original line number Diff line number Diff line
@@ -137,11 +137,10 @@ nvkm_engine_func = { 


int

nvkm_engine_ctor(const struct nvkm_engine_func *func,

		 struct nvkm_device *device, int index, u32 pmc_enable,

		 bool enable, struct nvkm_engine *engine)

		 struct nvkm_device *device, int index, bool enable,

		 struct nvkm_engine *engine)

{

	nvkm_subdev_ctor(&nvkm_engine_func, device, index,

			 pmc_enable, &engine->subdev);

	nvkm_subdev_ctor(&nvkm_engine_func, device, index, &engine->subdev);

	engine->func = func;



	if (!nvkm_boolopt(device->cfgopt, nvkm_subdev_name[index], enable)) {
@@ -155,11 +154,10 @@ nvkm_engine_ctor(const struct nvkm_engine_func *func, 


int

nvkm_engine_new_(const struct nvkm_engine_func *func,

		 struct nvkm_device *device, int index, u32 pmc_enable,

		 bool enable, struct nvkm_engine **pengine)

		 struct nvkm_device *device, int index, bool enable,

		 struct nvkm_engine **pengine)

{

	if (!(*pengine = kzalloc(sizeof(**pengine), GFP_KERNEL)))

		return -ENOMEM;

	return nvkm_engine_ctor(func, device, index, pmc_enable,

				enable, *pengine);

	return nvkm_engine_ctor(func, device, index, enable, *pengine);

}