These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / include / nvkm / core / client.h

diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/client.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/client.h
index a35b382..eaf5905 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/client.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/client.h
@@ -1,55 +1,52 @@
 #ifndef __NVKM_CLIENT_H__
 #define __NVKM_CLIENT_H__
-#include <core/namedb.h>
+#include <core/object.h>
 
 struct nvkm_client {
-       struct nvkm_namedb namedb;
-       struct nvkm_handle *root;
-       struct nvkm_object *device;
+       struct nvkm_object object;
        char name[32];
+       u64 device;
        u32 debug;
-       struct nvkm_vm *vm;
+
+       struct nvkm_client_notify *notify[16];
+       struct rb_root objroot;
+       struct rb_root dmaroot;
+
        bool super;
        void *data;
-
        int (*ntfy)(const void *, u32, const void *, u32);
-       struct nvkm_client_notify *notify[16];
+
+       struct nvkm_vm *vm;
 };
 
-static inline struct nvkm_client *
-nv_client(void *obj)
-{
-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-       if (unlikely(!nv_iclass(obj, NV_CLIENT_CLASS)))
-               nv_assert("BAD CAST -> NvClient, %08x", nv_hclass(obj));
-#endif
-       return obj;
-}
-
-static inline struct nvkm_client *
-nvkm_client(void *obj)
-{
-       struct nvkm_object *client = nv_object(obj);
-       while (client && !(nv_iclass(client, NV_CLIENT_CLASS)))
-               client = client->parent;
-       return (void *)client;
-}
-
-#define nvkm_client_create(n,c,oc,od,d)                                     \
-       nvkm_client_create_((n), (c), (oc), (od), sizeof(**d), (void **)d)
-
-int  nvkm_client_create_(const char *name, u64 device, const char *cfg,
-                           const char *dbg, int, void **);
-#define nvkm_client_destroy(p)                                              \
-       nvkm_namedb_destroy(&(p)->base)
+bool nvkm_client_insert(struct nvkm_client *, struct nvkm_object *);
+void nvkm_client_remove(struct nvkm_client *, struct nvkm_object *);
+struct nvkm_object *nvkm_client_search(struct nvkm_client *, u64 object);
 
+int  nvkm_client_new(const char *name, u64 device, const char *cfg,
+                    const char *dbg, struct nvkm_client **);
+void nvkm_client_del(struct nvkm_client **);
 int  nvkm_client_init(struct nvkm_client *);
 int  nvkm_client_fini(struct nvkm_client *, bool suspend);
-const char *nvkm_client_name(void *obj);
 
 int nvkm_client_notify_new(struct nvkm_object *, struct nvkm_event *,
                           void *data, u32 size);
 int nvkm_client_notify_del(struct nvkm_client *, int index);
 int nvkm_client_notify_get(struct nvkm_client *, int index);
 int nvkm_client_notify_put(struct nvkm_client *, int index);
+
+/* logging for client-facing objects */
+#define nvif_printk(o,l,p,f,a...) do {                                         \
+       struct nvkm_object *_object = (o);                                     \
+       struct nvkm_client *_client = _object->client;                         \
+       if (_client->debug >= NV_DBG_##l)                                      \
+               printk(KERN_##p "nouveau: %s:%08x:%08x: "f, _client->name,     \
+                      _object->handle, _object->oclass, ##a);                 \
+} while(0)
+#define nvif_fatal(o,f,a...) nvif_printk((o), FATAL, CRIT, f, ##a)
+#define nvif_error(o,f,a...) nvif_printk((o), ERROR,  ERR, f, ##a)
+#define nvif_debug(o,f,a...) nvif_printk((o), DEBUG, INFO, f, ##a)
+#define nvif_trace(o,f,a...) nvif_printk((o), TRACE, INFO, f, ##a)
+#define nvif_info(o,f,a...)  nvif_printk((o),  INFO, INFO, f, ##a)
+#define nvif_ioctl(o,f,a...) nvif_trace((o), "ioctl: "f, ##a)
 #endif