mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-07 09:56:39 +07:00
drm/nouveau/core: prepare printk for NULL engine pointer on device object tree
The [ SUBDEV] specified in log output will be a bit different for children of a subdev now. Previously this reports whatever subdev is specified by object.engine, now it reports the subdev that owns the object (so, up object.parent somewhere). Later patches will append object and class identifiers to messages, which will help clarify where it's coming from. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
e138c7d8fc
commit
0527a04fe8
@ -60,21 +60,26 @@ nv_printk_(struct nouveau_object *object, int level, const char *fmt, ...)
|
||||
}
|
||||
|
||||
if (object && !nv_iclass(object, NV_CLIENT_CLASS)) {
|
||||
struct nouveau_object *device = object;
|
||||
struct nouveau_object *subdev = object;
|
||||
struct nouveau_object *device;
|
||||
struct nouveau_object *subdev;
|
||||
char obuf[64], *ofmt = "";
|
||||
|
||||
if (object->engine) {
|
||||
subdev = object;
|
||||
while (subdev && !nv_iclass(subdev, NV_SUBDEV_CLASS))
|
||||
subdev = subdev->parent;
|
||||
if (!subdev)
|
||||
subdev = object->engine;
|
||||
|
||||
device = subdev;
|
||||
if (device->parent)
|
||||
device = device->parent;
|
||||
|
||||
if (object != subdev) {
|
||||
snprintf(obuf, sizeof(obuf), "[0x%08x]",
|
||||
nv_hclass(object));
|
||||
ofmt = obuf;
|
||||
subdev = object->engine;
|
||||
device = object->engine;
|
||||
}
|
||||
|
||||
if (subdev->parent)
|
||||
device = subdev->parent;
|
||||
|
||||
if (level > nv_subdev(subdev)->debug)
|
||||
return;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user