Commit 60b29d20 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/bios: switch to subdev printk macros 



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

drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0203.c

+3 −2
Original line number Diff line number Diff line
@@ -103,12 +103,13 @@ u32 
nvbios_M0203Em(struct nvkm_bios *bios, u8 ramcfg, u8 *ver, u8 *hdr,

	       struct nvbios_M0203E *info)

{

	struct nvkm_subdev *subdev = &bios->subdev;

	struct nvbios_M0203T M0203T;

	u8  cnt, len, idx = 0xff;

	u32 data;



	if (!nvbios_M0203Tp(bios, ver, hdr, &cnt, &len, &M0203T)) {

		nv_warn(bios, "M0203T not found\n");

		nvkm_warn(subdev, "M0203T not found\n");

		return 0x00000000;

	}
@@ -119,7 +120,7 @@ nvbios_M0203Em(struct nvkm_bios *bios, u8 ramcfg, u8 *ver, u8 *hdr, 
				continue;

			return data;

		default:

			nv_warn(bios, "M0203T type %02x\n", M0203T.type);

			nvkm_warn(subdev, "M0203T type %02x\n", M0203T.type);

			return 0x00000000;

		}

	}

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

+7 −8
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ nvkm_bios_ctor(struct nvkm_object *parent, struct nvkm_object *engine, 
	bios->bmp_offset = nvbios_findstr(bios->data, bios->size,

					  "\xff\x7f""NV\0", 5);

	if (bios->bmp_offset) {

		nv_info(bios, "BMP version %x.%x\n",

		nvkm_debug(&bios->subdev, "BMP version %x.%x\n",

			   bmp_version(bios) >> 8,

			   bmp_version(bios) & 0xff);

	}
@@ -142,7 +142,7 @@ nvkm_bios_ctor(struct nvkm_object *parent, struct nvkm_object *engine, 
	bios->bit_offset = nvbios_findstr(bios->data, bios->size,

					  "\xff\xb8""BIT", 5);

	if (bios->bit_offset)

		nv_info(bios, "BIT signature found\n");

		nvkm_debug(&bios->subdev, "BIT signature found\n");



	/* determine the vbios version number */

	if (!bit_entry(bios, 'i', &bit_i) && bit_i.length >= 4) {
@@ -159,10 +159,9 @@ nvkm_bios_ctor(struct nvkm_object *parent, struct nvkm_object *engine, 
		bios->version.micro = nv_ro08(bios, bios->bmp_offset + 10);

	}



	nv_info(bios, "version %02x.%02x.%02x.%02x.%02x\n",

	nvkm_info(&bios->subdev, "version %02x.%02x.%02x.%02x.%02x\n",

		  bios->version.major, bios->version.chip,

		  bios->version.minor, bios->version.micro, bios->version.patch);



	return 0;

}

drivers/gpu/drm/nouveau/nvkm/subdev/bios/dcb.c

+6 −5
Original line number Diff line number Diff line
@@ -27,20 +27,21 @@ 
u16

dcb_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len)

{

	struct nvkm_device *device = nv_device(bios);

	struct nvkm_subdev *subdev = &bios->subdev;

	struct nvkm_device *device = subdev->device;

	u16 dcb = 0x0000;



	if (device->card_type > NV_04)

		dcb = nv_ro16(bios, 0x36);

	if (!dcb) {

		nv_warn(bios, "DCB table not found\n");

		nvkm_warn(subdev, "DCB table not found\n");

		return dcb;

	}



	*ver = nv_ro08(bios, dcb);



	if (*ver >= 0x42) {

		nv_warn(bios, "DCB version 0x%02x unknown\n", *ver);

		nvkm_warn(subdev, "DCB version 0x%02x unknown\n", *ver);

		return 0x0000;

	} else

	if (*ver >= 0x30) {
@@ -86,11 +87,11 @@ dcb_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len) 
		 *

		 * v1.1 (NV5+, maybe some NV4) is entirely unhelpful

		 */

		nv_warn(bios, "DCB contains no useful data\n");

		nvkm_debug(subdev, "DCB contains no useful data\n");

		return 0x0000;

	}



	nv_warn(bios, "DCB header validation failed\n");

	nvkm_warn(subdev, "DCB header validation failed\n");

	return 0x0000;

}

drivers/gpu/drm/nouveau/nvkm/subdev/bios/i2c.c

+3 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ dcb_i2c_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len) 
	}



	if (i2c && *ver >= 0x42) {

		nv_warn(bios, "ccb %02x not supported\n", *ver);

		nvkm_warn(&bios->subdev, "ccb %02x not supported\n", *ver);

		return 0x0000;

	}
@@ -70,6 +70,7 @@ dcb_i2c_entry(struct nvkm_bios *bios, u8 idx, u8 *ver, u8 *len) 
int

dcb_i2c_parse(struct nvkm_bios *bios, u8 idx, struct dcb_i2c_entry *info)

{

	struct nvkm_subdev *subdev = &bios->subdev;

	u8  ver, len;

	u16 ent = dcb_i2c_entry(bios, idx, &ver, &len);

	if (ent) {
@@ -126,7 +127,7 @@ dcb_i2c_parse(struct nvkm_bios *bios, u8 idx, struct dcb_i2c_entry *info) 
		case DCB_I2C_UNUSED:

			return 0;

		default:

			nv_warn(bios, "unknown i2c type %d\n", info->type);

			nvkm_warn(subdev, "unknown i2c type %d\n", info->type);

			info->type = DCB_I2C_UNUSED;

			return 0;

		}

drivers/gpu/drm/nouveau/nvkm/subdev/bios/image.c

+3 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
static bool

nvbios_imagen(struct nvkm_bios *bios, struct nvbios_image *image)

{

	struct nvkm_subdev *subdev = &bios->subdev;

	struct nvbios_pcirT pcir;

	struct nvbios_npdeT npde;

	u8  ver;
@@ -41,7 +42,7 @@ nvbios_imagen(struct nvkm_bios *bios, struct nvbios_image *image) 
	case 0x4e56: /* NV */

		break;

	default:

		nv_debug(bios, "%08x: ROM signature (%04x) unknown\n",

		nvkm_debug(subdev, "%08x: ROM signature (%04x) unknown\n",

			   image->base, data);

		return false;

	}