Commit e37f5433 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/device: switch to dev_printk macros

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 65850a3b
...@@ -414,14 +414,11 @@ nvkm_devobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -414,14 +414,11 @@ nvkm_devobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
} }
if (ret) { if (ret) {
nv_error(device, "unknown chipset, 0x%08x\n", boot0); nvdev_error(device, "unknown chipset (%08x)\n", boot0);
return ret; return ret;
} }
nv_info(device, "BOOT0 : 0x%08x\n", boot0); nvdev_info(device, "NVIDIA %s (%08x)\n", device->cname, boot0);
nv_info(device, "Chipset: %s (NV%02X)\n",
device->cname, device->chipset);
nv_info(device, "Family : NV%02X\n", device->card_type);
/* determine frequency of timing crystal */ /* determine frequency of timing crystal */
if ( device->card_type <= NV_10 || device->chipset < 0x17 || if ( device->card_type <= NV_10 || device->chipset < 0x17 ||
...@@ -436,8 +433,6 @@ nvkm_devobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -436,8 +433,6 @@ nvkm_devobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
case 0x00400000: device->crystal = 27000; break; case 0x00400000: device->crystal = 27000; break;
case 0x00400040: device->crystal = 25000; break; case 0x00400040: device->crystal = 25000; break;
} }
nv_debug(device, "crystal freq: %dKHz\n", device->crystal);
} else } else
if ( (args->v0.disable & NV_DEVICE_V0_DISABLE_IDENTIFY)) { if ( (args->v0.disable & NV_DEVICE_V0_DISABLE_IDENTIFY)) {
device->cname = "NULL"; device->cname = "NULL";
...@@ -447,7 +442,7 @@ nvkm_devobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -447,7 +442,7 @@ nvkm_devobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
if (!(args->v0.disable & NV_DEVICE_V0_DISABLE_MMIO) && !device->pri) { if (!(args->v0.disable & NV_DEVICE_V0_DISABLE_MMIO) && !device->pri) {
device->pri = ioremap(mmio_base, mmio_size); device->pri = ioremap(mmio_base, mmio_size);
if (!device->pri) { if (!device->pri) {
nv_error(device, "unable to map device registers\n"); nvdev_error(device, "unable to map PRI\n");
return -ENOMEM; return -ENOMEM;
} }
} }
......
...@@ -350,7 +350,6 @@ gf100_identify(struct nvkm_device *device) ...@@ -350,7 +350,6 @@ gf100_identify(struct nvkm_device *device)
device->oclass[NVDEV_ENGINE_PM ] = gf117_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = gf117_pm_oclass;
break; break;
default: default:
nv_fatal(device, "unknown Fermi chipset\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -318,7 +318,6 @@ gk104_identify(struct nvkm_device *device) ...@@ -318,7 +318,6 @@ gk104_identify(struct nvkm_device *device)
device->oclass[NVDEV_ENGINE_MSPPP ] = &gf100_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &gf100_msppp_oclass;
break; break;
default: default:
nv_fatal(device, "unknown Kepler chipset\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -202,7 +202,6 @@ gm100_identify(struct nvkm_device *device) ...@@ -202,7 +202,6 @@ gm100_identify(struct nvkm_device *device)
device->oclass[NVDEV_ENGINE_CE2 ] = &gm204_ce2_oclass; device->oclass[NVDEV_ENGINE_CE2 ] = &gm204_ce2_oclass;
break; break;
default: default:
nv_fatal(device, "unknown Maxwell chipset\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -81,7 +81,6 @@ nv04_identify(struct nvkm_device *device) ...@@ -81,7 +81,6 @@ nv04_identify(struct nvkm_device *device)
device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass;
break; break;
default: default:
nv_fatal(device, "unknown RIVA chipset\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -196,7 +196,6 @@ nv10_identify(struct nvkm_device *device) ...@@ -196,7 +196,6 @@ nv10_identify(struct nvkm_device *device)
device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass;
break; break;
default: default:
nv_fatal(device, "unknown Celsius chipset\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -123,7 +123,6 @@ nv20_identify(struct nvkm_device *device) ...@@ -123,7 +123,6 @@ nv20_identify(struct nvkm_device *device)
device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass;
break; break;
default: default:
nv_fatal(device, "unknown Kelvin chipset\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -145,7 +145,6 @@ nv30_identify(struct nvkm_device *device) ...@@ -145,7 +145,6 @@ nv30_identify(struct nvkm_device *device)
device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass;
break; break;
default: default:
nv_fatal(device, "unknown Rankine chipset\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -419,7 +419,6 @@ nv40_identify(struct nvkm_device *device) ...@@ -419,7 +419,6 @@ nv40_identify(struct nvkm_device *device)
device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass;
break; break;
default: default:
nv_fatal(device, "unknown Curie chipset\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -470,7 +470,6 @@ nv50_identify(struct nvkm_device *device) ...@@ -470,7 +470,6 @@ nv50_identify(struct nvkm_device *device)
device->oclass[NVDEV_ENGINE_PM ] = gt215_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = gt215_pm_oclass;
break; break;
default: default:
nv_fatal(device, "unknown Tesla chipset\n");
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment