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

Commit 952eb819 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/top: take nvkm_device as argument to public functions 



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

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

+4 −4
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ struct nvkm_top { 
	struct list_head device;

};



u32 nvkm_top_reset(struct nvkm_top *, enum nvkm_devidx);

u32 nvkm_top_intr(struct nvkm_top *, u32 intr, u64 *subdevs);

enum nvkm_devidx nvkm_top_fault(struct nvkm_top *, int fault);

enum nvkm_devidx nvkm_top_engine(struct nvkm_top *, int, int *runl, int *engn);

u32 nvkm_top_reset(struct nvkm_device *, enum nvkm_devidx);

u32 nvkm_top_intr(struct nvkm_device *, u32 intr, u64 *subdevs);

enum nvkm_devidx nvkm_top_fault(struct nvkm_device *, int fault);

enum nvkm_devidx nvkm_top_engine(struct nvkm_device *, int, int *runl, int *engn);



int gk104_top_new(struct nvkm_device *, int, struct nvkm_top **);

#endif

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

+2 −3
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ gk104_fifo_intr_fault(struct gk104_fifo *fifo, int unit) 
	}



	if (eu == NULL) {

		enum nvkm_devidx engidx = nvkm_top_fault(device->top, unit);

		enum nvkm_devidx engidx = nvkm_top_fault(device, unit);

		if (engidx < NVKM_SUBDEV_NR) {

			const char *src = nvkm_subdev_name[engidx];

			char *dst = en;
@@ -589,7 +589,6 @@ gk104_fifo_oneinit(struct nvkm_fifo *base) 
	struct gk104_fifo *fifo = gk104_fifo(base);

	struct nvkm_subdev *subdev = &fifo->base.engine.subdev;

	struct nvkm_device *device = subdev->device;

	struct nvkm_top *top = device->top;

	int engn, runl, pbid, ret, i, j;

	enum nvkm_devidx engidx;

	u32 *map;
@@ -608,7 +607,7 @@ gk104_fifo_oneinit(struct nvkm_fifo *base) 


	/* Determine runlist configuration from topology device info. */

	i = 0;

	while ((int)(engidx = nvkm_top_engine(top, i++, &runl, &engn)) >= 0) {

	while ((int)(engidx = nvkm_top_engine(device, i++, &runl, &engn)) >= 0) {

		/* Determine which PBDMA handles requests for this engine. */

		for (j = 0, pbid = -1; j < fifo->pbdma_nr; j++) {

			if (map[j] & (1 << runl)) {

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

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ nvkm_mc_intr(struct nvkm_mc *mc, bool *handled) 
	u32 stat, intr = nvkm_mc_intr_mask(mc);

	u64 subdevs;



	stat = nvkm_top_intr(device->top, intr, &subdevs);

	stat = nvkm_top_intr(device, intr, &subdevs);

	while (subdevs) {

		enum nvkm_devidx subidx = __ffs64(subdevs);

		subdev = nvkm_device_subdev(device, subidx);
@@ -94,7 +94,7 @@ nvkm_mc_reset_(struct nvkm_mc *mc, enum nvkm_devidx devidx) 
	const struct nvkm_mc_map *map;

	u64 pmc_enable;



	if (!(pmc_enable = nvkm_top_reset(device->top, devidx))) {

	if (!(pmc_enable = nvkm_top_reset(device, devidx))) {

		for (map = mc->func->reset; map && map->stat; map++) {

			if (map->unit == devidx) {

				pmc_enable = map->stat;

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

+8 −4
Original line number Diff line number Diff line
@@ -41,8 +41,9 @@ nvkm_top_device_new(struct nvkm_top *top) 
}



u32

nvkm_top_reset(struct nvkm_top *top, enum nvkm_devidx index)

nvkm_top_reset(struct nvkm_device *device, enum nvkm_devidx index)

{

	struct nvkm_top *top = device->top;

	struct nvkm_top_device *info;



	if (top) {
@@ -56,8 +57,9 @@ nvkm_top_reset(struct nvkm_top *top, enum nvkm_devidx index) 
}



u32

nvkm_top_intr(struct nvkm_top *top, u32 intr, u64 *psubdevs)

nvkm_top_intr(struct nvkm_device *device, u32 intr, u64 *psubdevs)

{

	struct nvkm_top *top = device->top;

	struct nvkm_top_device *info;

	u64 subdevs = 0;

	u32 handled = 0;
@@ -78,8 +80,9 @@ nvkm_top_intr(struct nvkm_top *top, u32 intr, u64 *psubdevs) 
}



enum nvkm_devidx

nvkm_top_fault(struct nvkm_top *top, int fault)

nvkm_top_fault(struct nvkm_device *device, int fault)

{

	struct nvkm_top *top = device->top;

	struct nvkm_top_device *info;



	list_for_each_entry(info, &top->device, head) {
@@ -91,8 +94,9 @@ nvkm_top_fault(struct nvkm_top *top, int fault) 
}



enum nvkm_devidx

nvkm_top_engine(struct nvkm_top *top, int index, int *runl, int *engn)

nvkm_top_engine(struct nvkm_device *device, int index, int *runl, int *engn)

{

	struct nvkm_top *top = device->top;

	struct nvkm_top_device *info;

	int n = 0;