diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-12-05 02:37:19 (GMT) |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 02:14:54 (GMT) |
commit | ec0e55420de97aae9338cba081de03c7804375ce (patch) | |
tree | 991be9472e680602c8c88168fa7b6ebb254cbac7 /drivers/gpu/drm/nouveau/core/include | |
parent | 8000fb219179e0be23cef03588dcd6c00a2035f3 (diff) | |
download | linux-ec0e55420de97aae9338cba081de03c7804375ce.tar.xz |
drm/nouveau/core: object.engine is always a nouveau_engine now
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/include')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/include/core/engine.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/include/core/object.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/include/core/subdev.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/core/engine.h b/drivers/gpu/drm/nouveau/core/include/core/engine.h index be04250..d7ebd35 100644 --- a/drivers/gpu/drm/nouveau/core/include/core/engine.h +++ b/drivers/gpu/drm/nouveau/core/include/core/engine.h @@ -30,9 +30,9 @@ nv_engine(void *obj) } static inline int -nv_engidx(struct nouveau_object *object) +nv_engidx(struct nouveau_engine *engine) { - return nv_subidx(object); + return nv_subidx(&engine->subdev); } struct nouveau_engine *nouveau_engine(void *obj, int idx); diff --git a/drivers/gpu/drm/nouveau/core/include/core/object.h b/drivers/gpu/drm/nouveau/core/include/core/object.h index 2e2afa5..64c0038 100644 --- a/drivers/gpu/drm/nouveau/core/include/core/object.h +++ b/drivers/gpu/drm/nouveau/core/include/core/object.h @@ -17,7 +17,7 @@ struct nouveau_object { struct nouveau_oclass *oclass; struct nouveau_object *parent; - struct nouveau_object *engine; + struct nouveau_engine *engine; atomic_t refcount; atomic_t usecount; #if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA diff --git a/drivers/gpu/drm/nouveau/core/include/core/subdev.h b/drivers/gpu/drm/nouveau/core/include/core/subdev.h index d9739ae..68f1c41 100644 --- a/drivers/gpu/drm/nouveau/core/include/core/subdev.h +++ b/drivers/gpu/drm/nouveau/core/include/core/subdev.h @@ -28,9 +28,9 @@ nv_subdev(void *obj) } static inline int -nv_subidx(struct nouveau_object *object) +nv_subidx(struct nouveau_subdev *subdev) { - return nv_hclass(nv_subdev(object)) & 0xff; + return nv_hclass(subdev) & 0xff; } struct nouveau_subdev *nouveau_subdev(void *obj, int idx); |