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

drm/nouveau/devinit: switch to subdev printk macros 



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

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ gf100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq) 
		nvkm_wr32(device, info.reg + 0x10, fN << 16);

		break;

	default:

		nv_warn(init, "0x%08x/%dKhz unimplemented\n", type, freq);

		nvkm_warn(subdev, "%08x/%dKhz unimplemented\n", type, freq);

		ret = -EINVAL;

		break;

	}

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c

+5 −4
Original line number Diff line number Diff line
@@ -81,11 +81,12 @@ static int 
pmu_load(struct nv50_devinit *init, u8 type, bool post,

	 u32 *init_addr_pmu, u32 *args_addr_pmu)

{

	struct nvkm_bios *bios = nvkm_bios(init);

	struct nvkm_subdev *subdev = &init->base.subdev;

	struct nvkm_bios *bios = subdev->device->bios;

	struct nvbios_pmuR pmu;



	if (!nvbios_pmuRm(bios, type, &pmu)) {

		nv_error(init, "VBIOS PMU fuc %02x not found\n", type);

		nvkm_error(subdev, "VBIOS PMU fuc %02x not found\n", type);

		return -EINVAL;

	}
@@ -109,7 +110,7 @@ static int 
gm204_devinit_post(struct nvkm_subdev *subdev, bool post)

{

	struct nv50_devinit *init = (void *)nvkm_devinit(subdev);

	struct nvkm_device *device = init->base.subdev.device;

	struct nvkm_device *device = subdev->device;

	struct nvkm_bios *bios = device->bios;

	struct bit_entry bit_I;

	u32 exec, args;
@@ -117,7 +118,7 @@ gm204_devinit_post(struct nvkm_subdev *subdev, bool post) 


	if (bit_entry(bios, 'I', &bit_I) || bit_I.version != 1 ||

					    bit_I.length < 0x1c) {

		nv_error(init, "VBIOS PMU init data not found\n");

		nvkm_error(subdev, "VBIOS PMU init data not found\n");

		return -EINVAL;

	}

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ gt215_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq) 
		nvkm_wr32(device, info.reg + 8, fN);

		break;

	default:

		nv_warn(init, "0x%08x/%dKhz unimplemented\n", type, freq);

		nvkm_warn(subdev, "%08x/%dKhz unimplemented\n", type, freq);

		ret = -EINVAL;

		break;

	}

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c

+5 −3
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 
static void

nv04_devinit_meminit(struct nvkm_devinit *init)

{

	struct nvkm_device *device = init->subdev.device;

	struct nvkm_subdev *subdev = &init->subdev;

	struct nvkm_device *device = subdev->device;

	u32 patt = 0xdeadbeef;

	struct io_mapping *fb;

	int i;
@@ -43,7 +44,7 @@ nv04_devinit_meminit(struct nvkm_devinit *init) 
	/* Map the framebuffer aperture */

	fb = fbmem_init(device);

	if (!fb) {

		nv_error(init, "failed to map fb\n");

		nvkm_error(subdev, "failed to map fb\n");

		return;

	}
@@ -414,6 +415,7 @@ int 
nv04_devinit_init(struct nvkm_object *object)

{

	struct nv04_devinit *init = (void *)object;

	struct nvkm_subdev *subdev = &init->base.subdev;



	if (!init->base.post) {

		u32 htotal = nv_rdvgac(init, 0, 0x06);
@@ -422,7 +424,7 @@ nv04_devinit_init(struct nvkm_object *object) 
		htotal |= (nv_rdvgac(init, 0, 0x25) & 0x01) << 10;

		htotal |= (nv_rdvgac(init, 0, 0x41) & 0x01) << 11;

		if (!htotal) {

			nv_info(init, "adaptor not initialised\n");

			nvkm_debug(subdev, "adaptor not initialised\n");

			init->base.post = true;

		}

	}

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c

+3 −2
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ nv05_devinit_meminit(struct nvkm_devinit *init) 
		{ 0x06, 0x00 },

		{ 0x00, 0x00 }

	};

	struct nvkm_device *device = init->subdev.device;

	struct nvkm_subdev *subdev = &init->subdev;

	struct nvkm_device *device = subdev->device;

	struct nvkm_bios *bios = device->bios;

	struct io_mapping *fb;

	u32 patt = 0xdeadbeef;
@@ -55,7 +56,7 @@ nv05_devinit_meminit(struct nvkm_devinit *init) 
	/* Map the framebuffer aperture */

	fb = fbmem_init(device);

	if (!fb) {

		nv_error(init, "failed to map fb\n");

		nvkm_error(subdev, "failed to map fb\n");

		return;

	}