From 0527a04fe837d66f2d1f8606d625a59d4a1c52cd Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 5 Dec 2014 11:03:18 +1000 Subject: [PATCH] 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 --- drivers/gpu/drm/nouveau/core/core/printk.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/nouveau/core/core/printk.c b/drivers/gpu/drm/nouveau/core/core/printk.c index d6c4d90..1060e3a 100644 --- a/drivers/gpu/drm/nouveau/core/core/printk.c +++ b/drivers/gpu/drm/nouveau/core/core/printk.c @@ -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; -- 2.7.4