redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
hifive-unleashed-5.1
Ben Skeggs 2014-12-05 12:21:34 +10:00
parent bdda4703f1
commit 8000fb2191
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/core/core/printk.c
View File

@ -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)

7
drivers/gpu/drm/nouveau/core/engine/device/base.c
View File

@ -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;