Messages in this thread Patch in this message | | | From | Vince Hsu <> | Subject | [PATCH nouveau 07/11] instmem: make nv50_instmem_priv public | Date | Tue, 23 Dec 2014 18:40:00 +0800 |
| |
The GK20A needs to create a dummy instemem subdev to avoid suspend/resume problem. So make the nv50_instmem_priv non-static for now.
Signed-off-by: Vince Hsu <vinceh@nvidia.com> --- drm/core/subdev/instmem/nv50.h | 1 + nvkm/subdev/instmem/nv50.c | 9 ++------- nvkm/subdev/instmem/nv50.h | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 7 deletions(-) create mode 120000 drm/core/subdev/instmem/nv50.h create mode 100644 nvkm/subdev/instmem/nv50.h
diff --git a/drm/core/subdev/instmem/nv50.h b/drm/core/subdev/instmem/nv50.h new file mode 120000 index 000000000000..043e22aee880 --- /dev/null +++ b/drm/core/subdev/instmem/nv50.h @@ -0,0 +1 @@ +../../../../nvkm/subdev/instmem/nv50.h \ No newline at end of file diff --git a/nvkm/subdev/instmem/nv50.c b/nvkm/subdev/instmem/nv50.c index 7cb3b098a08d..66428b1c2394 100644 --- a/nvkm/subdev/instmem/nv50.c +++ b/nvkm/subdev/instmem/nv50.c @@ -25,14 +25,9 @@ #include <subdev/fb.h> #include <core/mm.h> +#include "nv50.h" #include "priv.h" -struct nv50_instmem_priv { - struct nouveau_instmem base; - spinlock_t lock; - u64 addr; -}; - struct nv50_instobj_priv { struct nouveau_instobj base; struct nouveau_mem *mem; @@ -117,7 +112,7 @@ nv50_instobj_ctor(struct nouveau_object *parent, struct nouveau_object *engine, return 0; } -static struct nouveau_instobj_impl +struct nouveau_instobj_impl nv50_instobj_oclass = { .base.ofuncs = &(struct nouveau_ofuncs) { .ctor = nv50_instobj_ctor, diff --git a/nvkm/subdev/instmem/nv50.h b/nvkm/subdev/instmem/nv50.h new file mode 100644 index 000000000000..bff03e3807ea --- /dev/null +++ b/nvkm/subdev/instmem/nv50.h @@ -0,0 +1,14 @@ +#ifndef __NVKM_INSTMEM_NV50_H__ +#define __NVKM_INSTMEM_NV50_H__ + +#include "priv.h" + +struct nv50_instmem_priv { + struct nouveau_instmem base; + spinlock_t lock; + u64 addr; +}; + +extern struct nouveau_instobj_impl nv50_instobj_oclass; + +#endif -- 1.9.1
| |