diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h b/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h index edebd9c30c0c..6608bf6c6842 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h @@ -1,35 +1,26 @@ #ifndef __NVKM_SW_CHAN_H__ #define __NVKM_SW_CHAN_H__ +#define nvkm_sw_chan(p) container_of((p), struct nvkm_sw_chan, object) #include "priv.h" -#include <core/engctx.h> #include <core/event.h> struct nvkm_sw_chan { - struct nvkm_engctx base; const struct nvkm_sw_chan_func *func; + struct nvkm_object object; + struct nvkm_sw *sw; struct nvkm_fifo_chan *fifo; struct list_head head; + struct nvkm_event event; }; struct nvkm_sw_chan_func { + void *(*dtor)(struct nvkm_sw_chan *); bool (*mthd)(struct nvkm_sw_chan *, int subc, u32 mthd, u32 data); }; +int nvkm_sw_chan_ctor(const struct nvkm_sw_chan_func *, struct nvkm_sw *, + struct nvkm_fifo_chan *, const struct nvkm_oclass *, + struct nvkm_sw_chan *); bool nvkm_sw_chan_mthd(struct nvkm_sw_chan *, int subc, u32 mthd, u32 data); - -#define nvkm_sw_context_create(f,p,e,c,d) \ - nvkm_sw_chan_ctor((f), (p), (e), (c), sizeof(**d), (void **)d) -int nvkm_sw_chan_ctor(const struct nvkm_sw_chan_func *, - struct nvkm_object *, struct nvkm_object *, - struct nvkm_oclass *, int, void **); -void nvkm_sw_chan_dtor(struct nvkm_object *); -#define nvkm_sw_context_init(d) \ - nvkm_engctx_init(&(d)->base) -#define nvkm_sw_context_fini(d,s) \ - nvkm_engctx_fini(&(d)->base, (s)) - -#define _nvkm_sw_context_dtor nvkm_sw_chan_dtor -#define _nvkm_sw_context_init _nvkm_engctx_init -#define _nvkm_sw_context_fini _nvkm_engctx_fini #endif |