diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:22 +0300 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:47 +0300 |
commit | 7624fc011e56902a83e409b14d6c1efa75aa4a58 (patch) | |
tree | 921e2ddf533a69ccc6decd7b0e2a4da1a77c520b /drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h | |
parent | 6f41c7c56929b3a2ad943d5b6dd4d66d716e74d7 (diff) | |
download | linux-7624fc011e56902a83e409b14d6c1efa75aa4a58.tar.xz |
drm/nouveau/mpeg: convert to new-style nvkm_engine
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h index a2dae83fbc71..d3bb34fcdebf 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h @@ -1,12 +1,19 @@ #ifndef __NV31_MPEG_H__ #define __NV31_MPEG_H__ -#define nv31_mpeg(p) container_of((p), struct nv31_mpeg, base.engine) +#define nv31_mpeg(p) container_of((p), struct nv31_mpeg, engine) #include "priv.h" #include <engine/mpeg.h> struct nv31_mpeg { - struct nvkm_mpeg base; + const struct nv31_mpeg_func *func; + struct nvkm_engine engine; struct nv31_mpeg_chan *chan; +}; + +int nv31_mpeg_new_(const struct nv31_mpeg_func *, struct nvkm_device *, + int index, struct nvkm_engine **); + +struct nv31_mpeg_func { bool (*mthd_dma)(struct nvkm_device *, u32 mthd, u32 data); }; |