drm/nouveau/top: initial implementation

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
index 4219adc4451c28c909171524f61ef883906ad242..5839ac748c5463431e1b8562969541c143a92351 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
@@ -3,6 +3,13 @@
 #include <core/subdev.h>
 
 struct nvkm_top {
+       const struct nvkm_top_func *func;
        struct nvkm_subdev subdev;
+       struct list_head device;
 };
+
+u32 nvkm_top_reset(struct nvkm_top *, enum nvkm_devidx);
+u32 nvkm_top_intr(struct nvkm_top *, u32 intr, u64 *subdevs);
+enum nvkm_devidx nvkm_top_fault(struct nvkm_top *, int fault);
+enum nvkm_devidx nvkm_top_engine(struct nvkm_top *, int, int *runl, int *engn);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild
index b197f87f72a20fcff5a0132e5d6933a3a40c7f74..477ce36d60eae15d700a5ade7ac09bb3c1091fab 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild
@@ -1 +1 @@
-#nvkm-y += nvkm/subdev/top/base.o
+nvkm-y += nvkm/subdev/top/base.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c
new file mode 100644 (file)
index 0000000..d8e9bfb
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2016 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs <bskeggs@redhat.com>
+ */
+#include "priv.h"
+
+struct nvkm_top_device *
+nvkm_top_device_new(struct nvkm_top *top)
+{
+       struct nvkm_top_device *info = kmalloc(sizeof(*info), GFP_KERNEL);
+       if (info) {
+               info->index = NVKM_SUBDEV_NR;
+               info->addr = 0;
+               info->fault = -1;
+               info->engine = -1;
+               info->runlist = -1;
+               info->reset = -1;
+               info->intr = -1;
+               list_add_tail(&info->head, &top->device);
+       }
+       return info;
+}
+
+u32
+nvkm_top_reset(struct nvkm_top *top, enum nvkm_devidx index)
+{
+       struct nvkm_top_device *info;
+
+       if (top) {
+               list_for_each_entry(info, &top->device, head) {
+                       if (info->index == index && info->reset >= 0)
+                               return BIT(info->reset);
+               }
+       }
+
+       return 0;
+}
+
+u32
+nvkm_top_intr(struct nvkm_top *top, u32 intr, u64 *psubdevs)
+{
+       struct nvkm_top_device *info;
+       u64 subdevs = 0;
+       u32 handled = 0;
+
+       if (top) {
+               list_for_each_entry(info, &top->device, head) {
+                       if (info->index != NVKM_SUBDEV_NR && info->intr >= 0) {
+                               if (intr & BIT(info->intr)) {
+                                       subdevs |= BIT_ULL(info->index);
+                                       handled |= BIT(info->intr);
+                               }
+                       }
+               }
+       }
+
+       *psubdevs = subdevs;
+       return intr & ~handled;
+}
+
+enum nvkm_devidx
+nvkm_top_fault(struct nvkm_top *top, int fault)
+{
+       struct nvkm_top_device *info;
+
+       list_for_each_entry(info, &top->device, head) {
+               if (info->fault == fault)
+                       return info->index;
+       }
+
+       return NVKM_SUBDEV_NR;
+}
+
+enum nvkm_devidx
+nvkm_top_engine(struct nvkm_top *top, int index, int *runl, int *engn)
+{
+       struct nvkm_top_device *info;
+       int n = 0;
+
+       list_for_each_entry(info, &top->device, head) {
+               if (info->engine >= 0 && info->runlist >= 0 && n++ == index) {
+                       *runl = info->runlist;
+                       *engn = info->engine;
+                       return info->index;
+               }
+       }
+
+       return -ENODEV;
+}
+
+static int
+nvkm_top_oneinit(struct nvkm_subdev *subdev)
+{
+       struct nvkm_top *top = nvkm_top(subdev);
+       return top->func->oneinit(top);
+}
+
+static void *
+nvkm_top_dtor(struct nvkm_subdev *subdev)
+{
+       struct nvkm_top *top = nvkm_top(subdev);
+       struct nvkm_top_device *info, *temp;
+
+       list_for_each_entry_safe(info, temp, &top->device, head) {
+               list_del(&info->head);
+               kfree(info);
+       }
+
+       return top;
+}
+
+static const struct nvkm_subdev_func
+nvkm_top = {
+       .dtor = nvkm_top_dtor,
+       .oneinit = nvkm_top_oneinit,
+};
+
+int
+nvkm_top_new_(const struct nvkm_top_func *func, struct nvkm_device *device,
+             int index, struct nvkm_top **ptop)
+{
+       struct nvkm_top *top;
+       if (!(top = *ptop = kzalloc(sizeof(*top), GFP_KERNEL)))
+               return -ENOMEM;
+       nvkm_subdev_ctor(&nvkm_top, device, index, 0, &top->subdev);
+       top->func = func;
+       INIT_LIST_HEAD(&top->device);
+       return 0;
+}

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h
index 2b63247273887ebcdd1ff5bce0f2d256802f6406..adb3ed03d937ebc8a7931d117de1972d26310b77 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h
@@ -2,4 +2,24 @@
 #define __NVKM_TOP_PRIV_H__
 #define nvkm_top(p) container_of((p), struct nvkm_top, subdev)
 #include <subdev/top.h>
+
+struct nvkm_top_func {
+       int (*oneinit)(struct nvkm_top *);
+};
+
+int nvkm_top_new_(const struct nvkm_top_func *, struct nvkm_device *,
+                 int, struct nvkm_top **);
+
+struct nvkm_top_device {
+       enum nvkm_devidx index;
+       u32 addr;
+       int fault;
+       int engine;
+       int runlist;
+       int reset;
+       int intr;
+       struct list_head head;
+};
+
+struct nvkm_top_device *nvkm_top_device_new(struct nvkm_top *);
 #endif