Commit 1eed206f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/ce: switch to subdev printk macros 



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

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

+1 −2
Original line number Diff line number Diff line
@@ -64,11 +64,10 @@ gk104_ce_intr(struct nvkm_subdev *subdev) 
{

	struct nvkm_device *device = subdev->device;

	const int idx = nv_subidx(subdev) - NVDEV_ENGINE_CE0;

	struct nvkm_engine *ce = (void *)subdev;

	u32 stat = nvkm_rd32(device, 0x104908 + (idx * 0x1000));



	if (stat) {

		nv_warn(ce, "unhandled intr 0x%08x\n", stat);

		nvkm_warn(subdev, "intr %08x\n", stat);

		nvkm_wr32(device, 0x104908 + (idx * 0x1000), stat);

	}

}

drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c

+1 −2
Original line number Diff line number Diff line
@@ -64,11 +64,10 @@ gm204_ce_intr(struct nvkm_subdev *subdev) 
{

	struct nvkm_device *device = subdev->device;

	const int idx = nv_subidx(subdev) - NVDEV_ENGINE_CE0;

	struct nvkm_engine *ce = (void *)subdev;

	u32 stat = nvkm_rd32(device, 0x104908 + (idx * 0x1000));



	if (stat) {

		nv_warn(ce, "unhandled intr 0x%08x\n", stat);

		nvkm_warn(subdev, "intr %08x\n", stat);

		nvkm_wr32(device, 0x104908 + (idx * 0x1000), stat);

	}

}

drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c

+8 −6
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ gt215_ce_intr(struct nvkm_subdev *subdev) 
	struct nvkm_engine *engine = nv_engine(subdev);

	struct nvkm_falcon *falcon = (void *)subdev;

	struct nvkm_object *engctx;

	const struct nvkm_enum *en;

	u32 dispatch = nv_ro32(falcon, 0x01c);

	u32 stat = nv_ro32(falcon, 0x008) & dispatch & ~(dispatch >> 16);

	u64 inst = nv_ro32(falcon, 0x050) & 0x3fffffff;
@@ -90,17 +91,18 @@ gt215_ce_intr(struct nvkm_subdev *subdev) 
	chid   = fifo->chid(fifo, engctx);



	if (stat & 0x00000040) {

		nv_error(falcon, "DISPATCH_ERROR [");

		nvkm_enum_print(gt215_ce_isr_error_name, ssta);

		pr_cont("] ch %d [0x%010llx %s] subc %d mthd 0x%04x data 0x%08x\n",

		       chid, inst << 12, nvkm_client_name(engctx), subc,

		       mthd, data);

		en = nvkm_enum_find(gt215_ce_isr_error_name, ssta);

		nvkm_error(subdev, "DISPATCH_ERROR %04x [%s] "

				   "ch %d [%010llx %s] subc %d "

				   "mthd %04x data %08x\n",

			   ssta, en ? en->name : "", chid, inst << 12,

			   nvkm_client_name(engctx), subc, mthd, data);

		nv_wo32(falcon, 0x004, 0x00000040);

		stat &= ~0x00000040;

	}



	if (stat) {

		nv_error(falcon, "unhandled intr 0x%08x\n", stat);

		nvkm_error(subdev, "intr %08x\n", stat);

		nv_wo32(falcon, 0x004, stat);

	}