drm/nouveau: port all engines to new engine module format

[deliverable/linux.git] / drivers / gpu / drm / nouveau / core / subdev / instmem / nv04.h

diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h
index b2f82f9e4e7feccd8ef1542cf46a5559b48d4634..7983d8d9b3585b2932a5fa29bc40355847f9c448 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h
@@ -2,6 +2,7 @@
 #define __NV04_INSTMEM_H__
 
 #include <core/gpuobj.h>
+#include <core/ramht.h>
 #include <core/mm.h>
 
 #include <subdev/instmem.h>
@@ -14,11 +15,17 @@ struct nv04_instmem_priv {
        struct nouveau_mm heap;
 
        struct nouveau_gpuobj *vbios;
-       struct nouveau_gpuobj *ramht;
+       struct nouveau_ramht  *ramht;
        struct nouveau_gpuobj *ramro;
        struct nouveau_gpuobj *ramfc;
 };
 
+static inline struct nv04_instmem_priv *
+nv04_instmem(void *obj)
+{
+       return (void *)nouveau_instmem(obj);
+}
+
 struct nv04_instobj_priv {
        struct nouveau_instobj base;
        struct nouveau_mm_node *mem;