diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:21 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:37:43 +1000 |
commit | 52dfa496d6633f9d2980cbfa5b70019d38558971 (patch) | |
tree | bf7502504cbaebca612e37cadf5527ead376d084 /drm/nouveau/include/nvkm | |
parent | 86fb3ede78f6074545141be9b170da6f50824046 (diff) | |
download | nouveau-52dfa496d6633f9d2980cbfa5b70019d38558971.tar.gz |
xtensa: convert to new-style nvkm_engine
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/include/nvkm')
-rw-r--r-- | drm/nouveau/include/nvkm/engine/bsp.h | 2 | ||||
-rw-r--r-- | drm/nouveau/include/nvkm/engine/vp.h | 2 | ||||
-rw-r--r-- | drm/nouveau/include/nvkm/engine/xtensa.h | 26 |
3 files changed, 10 insertions, 20 deletions
diff --git a/drm/nouveau/include/nvkm/engine/bsp.h b/drm/nouveau/include/nvkm/engine/bsp.h index af2134586..904820558 100644 --- a/drm/nouveau/include/nvkm/engine/bsp.h +++ b/drm/nouveau/include/nvkm/engine/bsp.h @@ -1,5 +1,5 @@ #ifndef __NVKM_BSP_H__ #define __NVKM_BSP_H__ #include <engine/xtensa.h> -extern struct nvkm_oclass g84_bsp_oclass; +int g84_bsp_new(struct nvkm_device *, int, struct nvkm_engine **); #endif diff --git a/drm/nouveau/include/nvkm/engine/vp.h b/drm/nouveau/include/nvkm/engine/vp.h index 145216d31..616ea91e0 100644 --- a/drm/nouveau/include/nvkm/engine/vp.h +++ b/drm/nouveau/include/nvkm/engine/vp.h @@ -1,5 +1,5 @@ #ifndef __NVKM_VP_H__ #define __NVKM_VP_H__ #include <engine/xtensa.h> -extern struct nvkm_oclass g84_vp_oclass; +int g84_vp_new(struct nvkm_device *, int, struct nvkm_engine **); #endif diff --git a/drm/nouveau/include/nvkm/engine/xtensa.h b/drm/nouveau/include/nvkm/engine/xtensa.h index 6a53812c0..3128d21a5 100644 --- a/drm/nouveau/include/nvkm/engine/xtensa.h +++ b/drm/nouveau/include/nvkm/engine/xtensa.h @@ -4,30 +4,20 @@ #include <core/engine.h> struct nvkm_xtensa { - struct nvkm_engine engine; const struct nvkm_xtensa_func *func; - u32 addr; + struct nvkm_engine engine; + struct nvkm_memory *gpu_fw; - u32 fifo_val; - u32 unkd28; }; +int nvkm_xtensa_new_(const struct nvkm_xtensa_func *, struct nvkm_device *, + int index, bool enable, u32 addr, struct nvkm_engine **); + struct nvkm_xtensa_func { - void (*init)(struct nvkm_xtensa *); + u32 pmc_enable; + u32 fifo_val; + u32 unkd28; struct nvkm_sclass sclass[]; }; - -#define nvkm_xtensa_create(p,e,c,b,d,i,f,r) \ - nvkm_xtensa_create_((p), (e), (c), (b), (d), (i), (f), \ - sizeof(**r),(void **)r) - -int nvkm_xtensa_create_(struct nvkm_object *, - struct nvkm_object *, - struct nvkm_oclass *, u32, bool, - const char *, const char *, - int, void **); -#define _nvkm_xtensa_dtor _nvkm_engine_dtor -int _nvkm_xtensa_init(struct nvkm_object *); -int _nvkm_xtensa_fini(struct nvkm_object *, bool); #endif |