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

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



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

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

+5 −5
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ struct nvkm_mc { 
	struct nvkm_subdev subdev;

};



void nvkm_mc_intr(struct nvkm_mc *, bool *handled);

void nvkm_mc_intr_unarm(struct nvkm_mc *);

void nvkm_mc_intr_rearm(struct nvkm_mc *);

void nvkm_mc_reset(struct nvkm_mc *, enum nvkm_devidx);

void nvkm_mc_unk260(struct nvkm_mc *, u32 data);

void nvkm_mc_intr(struct nvkm_device *, bool *handled);

void nvkm_mc_intr_unarm(struct nvkm_device *);

void nvkm_mc_intr_rearm(struct nvkm_device *);

void nvkm_mc_reset(struct nvkm_device *, enum nvkm_devidx);

void nvkm_mc_unk260(struct nvkm_device *, u32 data);



int nv04_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int nv11_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

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

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend) 
		}

	}



	nvkm_mc_reset(device->mc, subdev->index);

	nvkm_mc_reset(device, subdev->index);



	time = ktime_to_us(ktime_get()) - time;

	nvkm_trace(subdev, "%s completed in %lldus\n", action, time);

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

+4 −6
Original line number Diff line number Diff line
@@ -191,13 +191,11 @@ static irqreturn_t 
nvkm_device_tegra_intr(int irq, void *arg)

{

	struct nvkm_device_tegra *tdev = arg;

	struct nvkm_mc *mc = tdev->device.mc;

	struct nvkm_device *device = &tdev->device;

	bool handled = false;

	if (likely(mc)) {

		nvkm_mc_intr_unarm(mc);

		nvkm_mc_intr(mc, &handled);

		nvkm_mc_intr_rearm(mc);

	}

	nvkm_mc_intr_unarm(device);

	nvkm_mc_intr(device, &handled);

	nvkm_mc_intr_rearm(device);

	return handled ? IRQ_HANDLED : IRQ_NONE;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -1240,7 +1240,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	const struct gf100_grctx_func *grctx = gr->func->grctx;

	u32 idle_timeout;



	nvkm_mc_unk260(device->mc, 0);

	nvkm_mc_unk260(device, 0);



	gf100_gr_mmio(gr, grctx->hub);

	gf100_gr_mmio(gr, grctx->gpc);
@@ -1264,7 +1264,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	gf100_gr_icmd(gr, grctx->icmd);

	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_mthd(gr, grctx->mthd);

	nvkm_mc_unk260(device->mc, 1);

	nvkm_mc_unk260(device, 1);

}



int

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

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	u32 idle_timeout;

	int i;



	nvkm_mc_unk260(device->mc, 0);

	nvkm_mc_unk260(device, 0);



	gf100_gr_mmio(gr, grctx->hub);

	gf100_gr_mmio(gr, grctx->gpc);
@@ -253,7 +253,7 @@ gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	gf100_gr_icmd(gr, grctx->icmd);

	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_mthd(gr, grctx->mthd);

	nvkm_mc_unk260(device->mc, 1);

	nvkm_mc_unk260(device, 1);

}



const struct gf100_grctx_func