Commit 2f4a58e8 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/subdev: always upcast through nouveau_subdev()/nouveau_engine() 



Has additional safeties for one.  For two, needed for an upcoming
commit that removes abuse of nouveau_object.engine.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 4534a2af

drivers/gpu/drm/nouveau/core/include/engine/disp.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/nouveau/core/include/engine/fifo.h

+1 −1
Original line number Diff line number Diff line
@@ -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)                                     \

drivers/gpu/drm/nouveau/core/include/engine/graph.h

+1 −1
Original line number Diff line number Diff line
@@ -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)                                        \

drivers/gpu/drm/nouveau/core/include/engine/perfmon.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/nouveau/core/include/subdev/bar.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ struct nouveau_bar { 
static inline struct nouveau_bar *

nouveau_bar(void *obj)

{

	return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_BAR];

	return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_BAR);

}



extern struct nouveau_oclass nv50_bar_oclass;

CRA Git | Maintained and supported by SUSTech CRA and CCSE