diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 04:54:18 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 02:40:39 (GMT) |
| commit | 24bd0930bedea1182aaadc52757897d2b9b3ca99 (patch) | |
| tree | 80e8673ff62805d8f53f8f304436fbb54f505474 /drivers/gpu/drm/nouveau/nvkm/engine | |
| parent | 6157091177102638c7d94ffc159c0b157a1c9b56 (diff) | |
| download | linux-24bd0930bedea1182aaadc52757897d2b9b3ca99.tar.xz | |
drm/nouveau/client: convert to new-style nvkm_object
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index b3f3336..a59a8e5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -1988,7 +1988,7 @@ nv_device(void *obj) if (device->engine == NULL) { while (device && device->parent) { if (!nv_iclass(device, NV_SUBDEV_CLASS) && - device->parent == &nvkm_client(device)->namedb.parent.object) { + device->parent == &nvkm_client(device)->object) { struct { struct nvkm_parent base; struct nvkm_device *device; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c index 0df54c6..59b28cb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c @@ -24,6 +24,7 @@ #include "priv.h" #include <core/client.h> +#include <core/parent.h> #include <subdev/fb.h> #include <subdev/instmem.h> #include <subdev/timer.h> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c index b3ae0d9..ae84db1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c @@ -25,6 +25,7 @@ #include <core/client.h> #include <core/option.h> +#include <core/parent.h> #include <nvif/class.h> #include <nvif/ioctl.h> |