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

drm/nouveau/mpeg: switch to subdev printk macros 



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

drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c

+7 −5
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ nv31_mpeg_intr(struct nvkm_subdev *subdev) 
	nvkm_wr32(device, 0x00b230, 0x00000001);



	if (show) {

		nv_error(mpeg, "ch %d [%s] 0x%08x 0x%08x 0x%08x 0x%08x\n",

		nvkm_error(subdev, "ch %d [%s] %08x %08x %08x %08x\n",

			   fifo->chid(fifo, engctx),

			   nvkm_client_name(engctx), stat, type, mthd, data);

	}
@@ -263,7 +263,8 @@ nv31_mpeg_init(struct nvkm_object *object) 
{

	struct nvkm_engine *engine = nv_engine(object);

	struct nv31_mpeg *mpeg = (void *)object;

	struct nvkm_device *device = mpeg->base.engine.subdev.device;

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

	struct nvkm_device *device = subdev->device;

	struct nvkm_fb *fb = device->fb;

	int ret, i;
@@ -292,7 +293,8 @@ nv31_mpeg_init(struct nvkm_object *object) 
		if (!(nvkm_rd32(device, 0x00b200) & 0x00000001))

			break;

	) < 0) {

		nv_error(mpeg, "timeout 0x%08x\n", nvkm_rd32(device, 0x00b200));

		nvkm_error(subdev, "timeout %08x\n",

			   nvkm_rd32(device, 0x00b200));

		return -EBUSY;

	}

drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv40.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ nv40_mpeg_intr(struct nvkm_subdev *subdev) 
		nv31_mpeg_intr(subdev);



	if ((stat = nvkm_rd32(device, 0x00b800))) {

		nv_error(mpeg, "PMSRCH 0x%08x\n", stat);

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

		nvkm_wr32(device, 0x00b800, stat);

	}

}

drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c

+5 −5
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ nv44_mpeg_intr(struct nvkm_subdev *subdev) 
	nvkm_wr32(device, 0x00b230, 0x00000001);



	if (show) {

		nv_error(mpeg,

			 "ch %d [0x%08x %s] 0x%08x 0x%08x 0x%08x 0x%08x\n",

		nvkm_error(subdev,

			   "ch %d [%08x %s] %08x %08x %08x %08x\n",

			   chid, inst << 4, nvkm_client_name(engctx), stat,

			   type, mthd, data);

	}
@@ -146,7 +146,7 @@ nv44_mpeg_me_intr(struct nvkm_subdev *subdev) 
		nv44_mpeg_intr(subdev);



	if ((stat = nvkm_rd32(device, 0x00b800))) {

		nv_error(mpeg, "PMSRCH 0x%08x\n", stat);

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

		nvkm_wr32(device, 0x00b800, stat);

	}

}

drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c

+8 −7
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ nv50_mpeg_intr(struct nvkm_subdev *subdev) 
	}



	if (show) {

		nv_info(mpeg, "0x%08x 0x%08x 0x%08x 0x%08x\n",

		nvkm_info(subdev, "%08x %08x %08x %08x\n",

			  stat, type, mthd, data);

	}
@@ -146,15 +146,14 @@ nv50_mpeg_intr(struct nvkm_subdev *subdev) 
static void

nv50_vpe_intr(struct nvkm_subdev *subdev)

{

	struct nvkm_mpeg *mpeg = (void *)subdev;

	struct nvkm_device *device = mpeg->engine.subdev.device;

	struct nvkm_device *device = subdev->device;



	if (nvkm_rd32(device, 0x00b100))

		nv50_mpeg_intr(subdev);



	if (nvkm_rd32(device, 0x00b800)) {

		u32 stat = nvkm_rd32(device, 0x00b800);

		nv_info(mpeg, "PMSRCH: 0x%08x\n", stat);

		nvkm_info(subdev, "PMSRCH: %08x\n", stat);

		nvkm_wr32(device, 0xb800, stat);

	}

}
@@ -183,7 +182,8 @@ int 
nv50_mpeg_init(struct nvkm_object *object)

{

	struct nvkm_mpeg *mpeg = (void *)object;

	struct nvkm_device *device = mpeg->engine.subdev.device;

	struct nvkm_subdev *subdev = &mpeg->engine.subdev;

	struct nvkm_device *device = subdev->device;

	int ret;



	ret = nvkm_mpeg_init(mpeg);
@@ -208,7 +208,8 @@ nv50_mpeg_init(struct nvkm_object *object) 
		if (!(nvkm_rd32(device, 0x00b200) & 0x00000001))

			break;

	) < 0) {

		nv_error(mpeg, "timeout 0x%08x\n", nvkm_rd32(device, 0x00b200));

		nvkm_error(subdev, "timeout %08x\n",

			   nvkm_rd32(device, 0x00b200));

		return -EBUSY;

	}