diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/include/engine')
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/engine/disp.h b/drivers/gpu/drm/nouveau/core/include/engine/disp.h index fc307f1317ff..626508d8da40 100644 --- a/drivers/gpu/drm/nouveau/core/include/engine/disp.h +++ b/drivers/gpu/drm/nouveau/core/include/engine/disp.h @@ -18,7 +18,7 @@ struct nouveau_disp { static inline struct nouveau_disp * nouveau_disp(void *obj) { - return (void *)nv_device(obj)->subdev[NVDEV_ENGINE_DISP]; + return (void *)nouveau_engine(obj, NVDEV_ENGINE_DISP); } extern struct nouveau_oclass *nv04_disp_oclass; diff --git a/drivers/gpu/drm/nouveau/core/include/engine/fifo.h b/drivers/gpu/drm/nouveau/core/include/engine/fifo.h index 2007453f6fce..c52b939f52f0 100644 --- a/drivers/gpu/drm/nouveau/core/include/engine/fifo.h +++ b/drivers/gpu/drm/nouveau/core/include/engine/fifo.h @@ -85,7 +85,7 @@ struct nouveau_fifo { static inline struct nouveau_fifo * nouveau_fifo(void *obj) { - return (void *)nv_device(obj)->subdev[NVDEV_ENGINE_FIFO]; + return (void *)nouveau_engine(obj, NVDEV_ENGINE_FIFO); } #define nouveau_fifo_create(o,e,c,fc,lc,d) \ diff --git a/drivers/gpu/drm/nouveau/core/include/engine/graph.h b/drivers/gpu/drm/nouveau/core/include/engine/graph.h index d5055570d01b..d61dcb7d6d5f 100644 --- a/drivers/gpu/drm/nouveau/core/include/engine/graph.h +++ b/drivers/gpu/drm/nouveau/core/include/engine/graph.h @@ -35,7 +35,7 @@ struct nouveau_graph { static inline struct nouveau_graph * nouveau_graph(void *obj) { - return (void *)nv_device(obj)->subdev[NVDEV_ENGINE_GR]; + return (void *)nouveau_engine(obj, NVDEV_ENGINE_GR); } #define nouveau_graph_create(p,e,c,y,d) \ diff --git a/drivers/gpu/drm/nouveau/core/include/engine/perfmon.h b/drivers/gpu/drm/nouveau/core/include/engine/perfmon.h index 88cc812baaa3..251c8545ca58 100644 --- a/drivers/gpu/drm/nouveau/core/include/engine/perfmon.h +++ b/drivers/gpu/drm/nouveau/core/include/engine/perfmon.h @@ -24,7 +24,7 @@ struct nouveau_perfmon { static inline struct nouveau_perfmon * nouveau_perfmon(void *obj) { - return (void *)nv_device(obj)->subdev[NVDEV_ENGINE_PERFMON]; + return (void *)nouveau_engine(obj, NVDEV_ENGINE_PERFMON); } extern struct nouveau_oclass *nv40_perfmon_oclass; |