diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:19 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:40 +0300 |
| commit | 0ce41e3c66ca8958dec427f1c46f64efdda90f30 (patch) | |
| tree | d2fbfbe40841488bfc8985af87d2ef7f663025eb /drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h | |
| parent | 2a7909c0ade08c66690e6115ae49765dc47873e6 (diff) | |
| download | linux-0ce41e3c66ca8958dec427f1c46f64efdda90f30.tar.xz | |
drm/nouveau/disp: convert user classes to new-style nvkm_object
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h index 9ae4bf927065..5b2c903ce9ee 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h @@ -1,36 +1,43 @@ #ifndef __NV50_DISP_ROOT_H__ #define __NV50_DISP_ROOT_H__ +#define nv50_disp_root(p) container_of((p), struct nv50_disp_root, object) #include "nv50.h" #include "channv50.h" #include "dmacnv50.h" -#include <core/parent.h> - -#include <nvif/class.h> struct nv50_disp_root { - struct nvkm_parent base; + const struct nv50_disp_root_func *func; + struct nv50_disp *disp; + struct nvkm_object object; + + struct nvkm_gpuobj *instmem; struct nvkm_ramht *ramht; - u32 chan; }; -extern struct nvkm_oclass nv50_disp_root_oclass[]; -extern struct nvkm_oclass nv50_disp_sclass[]; -extern struct nvkm_oclass g84_disp_root_oclass[]; -extern struct nvkm_oclass g84_disp_sclass[]; -extern struct nvkm_oclass g94_disp_root_oclass[]; -extern struct nvkm_oclass g94_disp_sclass[]; -extern struct nvkm_oclass gt200_disp_root_oclass[]; -extern struct nvkm_oclass gt200_disp_sclass[]; -extern struct nvkm_oclass gt215_disp_root_oclass[]; -extern struct nvkm_oclass gt215_disp_sclass[]; -extern struct nvkm_oclass gf119_disp_root_oclass[]; -extern struct nvkm_oclass gf119_disp_sclass[]; -extern struct nvkm_oclass gk104_disp_root_oclass[]; -extern struct nvkm_oclass gk104_disp_sclass[]; -extern struct nvkm_oclass gk110_disp_root_oclass[]; -extern struct nvkm_oclass gk110_disp_sclass[]; -extern struct nvkm_oclass gm107_disp_root_oclass[]; -extern struct nvkm_oclass gm107_disp_sclass[]; -extern struct nvkm_oclass gm204_disp_root_oclass[]; -extern struct nvkm_oclass gm204_disp_sclass[]; +struct nv50_disp_root_func { + int (*init)(struct nv50_disp_root *); + void (*fini)(struct nv50_disp_root *); + const struct nv50_disp_dmac_oclass *dmac[3]; + const struct nv50_disp_pioc_oclass *pioc[2]; +}; + +int nv50_disp_root_new_(const struct nv50_disp_root_func *, struct nvkm_disp *, + const struct nvkm_oclass *, void *data, u32 size, + struct nvkm_object **); +int nv50_disp_root_init(struct nv50_disp_root *); +void nv50_disp_root_fini(struct nv50_disp_root *); + +int gf119_disp_root_init(struct nv50_disp_root *); +void gf119_disp_root_fini(struct nv50_disp_root *); + +extern const struct nvkm_disp_oclass nv50_disp_root_oclass; +extern const struct nvkm_disp_oclass g84_disp_root_oclass; +extern const struct nvkm_disp_oclass g94_disp_root_oclass; +extern const struct nvkm_disp_oclass gt200_disp_root_oclass; +extern const struct nvkm_disp_oclass gt215_disp_root_oclass; +extern const struct nvkm_disp_oclass gf119_disp_root_oclass; +extern const struct nvkm_disp_oclass gk104_disp_root_oclass; +extern const struct nvkm_disp_oclass gk110_disp_root_oclass; +extern const struct nvkm_disp_oclass gm107_disp_root_oclass; +extern const struct nvkm_disp_oclass gm204_disp_root_oclass; #endif |