drm/nouveau/core: can now assume client/device object tree based on object.engine

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/core/printk.c b/drivers/gpu/drm/nouveau/core/core/printk.c
index 1060e3a..81f5596 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/core/printk.c
+++ b/drivers/gpu/drm/nouveau/core/core/printk.c
@@ -64,11 +64,13 @@ nv_printk_(struct nouveau_object *object, int level, const char *fmt, ...)
                struct nouveau_object *subdev;
                char obuf[64], *ofmt = "";
 
-               subdev = object;
-               while (subdev && !nv_iclass(subdev, NV_SUBDEV_CLASS))
-                       subdev = subdev->parent;
-               if (!subdev)
+               if (object->engine == NULL) {
+                       subdev = object;
+                       while (subdev && !nv_iclass(subdev, NV_SUBDEV_CLASS))
+                               subdev = subdev->parent;
+               } else {
                        subdev = object->engine;
+               }
 
                device = subdev;
                if (device->parent)

diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c
index 7c0cbcd..0a6abc2 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/core/engine/device/base.c
@@ -512,9 +512,10 @@ struct nouveau_device *
 nv_device(void *obj)
 {
        struct nouveau_object *device = nv_object(obj);
-       while (device && device->parent)
-               device = device->parent;
-       if (!nv_iclass(device, NV_ENGINE_CLASS)) {
+       if (device->engine == NULL) {
+               while (device && device->parent)
+                       device = device->parent;
+       } else {
                device = nv_object(obj)->engine;
                if (device && device->parent)
                        device = device->parent;