drm/nouveau: remove symlinks, move core/ to nvkm/ (no code changes)

The symlinks were annoying some people, and they're not used anywhere
else in the kernel tree.  The include directory structure has been
changed so that symlinks aren't needed anymore.

NVKM has been moved from core/ to nvkm/ to make it more obvious as to
what the directory is for, and as some minor prep for when NVKM gets
split out into its own module (virt) at a later date.

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

1 files changed, 255 insertions, 0 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c
new file mode 100644
index 000000000000..7ad99b763f4c
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2011 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
+ */
+
+#include <subdev/bios.h>
+#include <subdev/bios/gpio.h>
+
+#include "priv.h"
+
+static int
+nouveau_gpio_drive(struct nouveau_gpio *gpio,
+                   int idx, int line, int dir, int out)
+{
+        const struct nouveau_gpio_impl *impl = (void *)nv_object(gpio)->oclass;
+        return impl->drive ? impl->drive(gpio, line, dir, out) : -ENODEV;
+}
+
+static int
+nouveau_gpio_sense(struct nouveau_gpio *gpio, int idx, int line)
+{
+        const struct nouveau_gpio_impl *impl = (void *)nv_object(gpio)->oclass;
+        return impl->sense ? impl->sense(gpio, line) : -ENODEV;
+}
+
+static int
+nouveau_gpio_find(struct nouveau_gpio *gpio, int idx, u8 tag, u8 line,
+                  struct dcb_gpio_func *func)
+{
+        struct nouveau_bios *bios = nouveau_bios(gpio);
+        u8  ver, len;
+        u16 data;
+
+        if (line == 0xff && tag == 0xff)
+                return -EINVAL;
+
+        data = dcb_gpio_match(bios, idx, tag, line, &ver, &len, func);
+        if (data)
+                return 0;
+
+        /* Apple iMac G4 NV18 */
+        if (nv_device_match(nv_object(gpio), 0x0189, 0x10de, 0x0010)) {
+                if (tag == DCB_GPIO_TVDAC0) {
+                        *func = (struct dcb_gpio_func) {
+                                .func = DCB_GPIO_TVDAC0,
+                                .line = 4,
+                                .log[0] = 0,
+                                .log[1] = 1,
+                        };
+                        return 0;
+                }
+        }
+
+        return -ENOENT;
+}
+
+static int
+nouveau_gpio_set(struct nouveau_gpio *gpio, int idx, u8 tag, u8 line, int state)
+{
+        struct dcb_gpio_func func;
+        int ret;
+
+        ret = nouveau_gpio_find(gpio, idx, tag, line, &func);
+        if (ret == 0) {
+                int dir = !!(func.log[state] & 0x02);
+                int out = !!(func.log[state] & 0x01);
+                ret = nouveau_gpio_drive(gpio, idx, func.line, dir, out);
+        }
+
+        return ret;
+}
+
+static int
+nouveau_gpio_get(struct nouveau_gpio *gpio, int idx, u8 tag, u8 line)
+{
+        struct dcb_gpio_func func;
+        int ret;
+
+        ret = nouveau_gpio_find(gpio, idx, tag, line, &func);
+        if (ret == 0) {
+                ret = nouveau_gpio_sense(gpio, idx, func.line);
+                if (ret >= 0)
+                        ret = (ret == (func.log[1] & 1));
+        }
+
+        return ret;
+}
+
+static void
+nouveau_gpio_intr_fini(struct nvkm_event *event, int type, int index)
+{
+        struct nouveau_gpio *gpio = container_of(event, typeof(*gpio), event);
+        const struct nouveau_gpio_impl *impl = (void *)nv_object(gpio)->oclass;
+        impl->intr_mask(gpio, type, 1 << index, 0);
+}
+
+static void
+nouveau_gpio_intr_init(struct nvkm_event *event, int type, int index)
+{
+        struct nouveau_gpio *gpio = container_of(event, typeof(*gpio), event);
+        const struct nouveau_gpio_impl *impl = (void *)nv_object(gpio)->oclass;
+        impl->intr_mask(gpio, type, 1 << index, 1 << index);
+}
+
+static int
+nouveau_gpio_intr_ctor(struct nouveau_object *object, void *data, u32 size,
+                       struct nvkm_notify *notify)
+{
+        struct nvkm_gpio_ntfy_req *req = data;
+        if (!WARN_ON(size != sizeof(*req))) {
+                notify->size  = sizeof(struct nvkm_gpio_ntfy_rep);
+                notify->types = req->mask;
+                notify->index = req->line;
+                return 0;
+        }
+        return -EINVAL;
+}
+
+static void
+nouveau_gpio_intr(struct nouveau_subdev *subdev)
+{
+        struct nouveau_gpio *gpio = nouveau_gpio(subdev);
+        const struct nouveau_gpio_impl *impl = (void *)nv_object(gpio)->oclass;
+        u32 hi, lo, i;
+
+        impl->intr_stat(gpio, &hi, &lo);
+
+        for (i = 0; (hi | lo) && i < impl->lines; i++) {
+                struct nvkm_gpio_ntfy_rep rep = {
+                        .mask = (NVKM_GPIO_HI * !!(hi & (1 << i))) |
+                                (NVKM_GPIO_LO * !!(lo & (1 << i))),
+                };
+                nvkm_event_send(&gpio->event, rep.mask, i, &rep, sizeof(rep));
+        }
+}
+
+static const struct nvkm_event_func
+nouveau_gpio_intr_func = {
+        .ctor = nouveau_gpio_intr_ctor,
+        .init = nouveau_gpio_intr_init,
+        .fini = nouveau_gpio_intr_fini,
+};
+
+int
+_nouveau_gpio_fini(struct nouveau_object *object, bool suspend)
+{
+        const struct nouveau_gpio_impl *impl = (void *)object->oclass;
+        struct nouveau_gpio *gpio = nouveau_gpio(object);
+        u32 mask = (1 << impl->lines) - 1;
+
+        impl->intr_mask(gpio, NVKM_GPIO_TOGGLED, mask, 0);
+        impl->intr_stat(gpio, &mask, &mask);
+
+        return nouveau_subdev_fini(&gpio->base, suspend);
+}
+
+static struct dmi_system_id gpio_reset_ids[] = {
+        {
+                .ident = "Apple Macbook 10,1",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro10,1"),
+                }
+        },
+        { }
+};
+
+int
+_nouveau_gpio_init(struct nouveau_object *object)
+{
+        struct nouveau_gpio *gpio = nouveau_gpio(object);
+        int ret;
+
+        ret = nouveau_subdev_init(&gpio->base);
+        if (ret)
+                return ret;
+
+        if (gpio->reset && dmi_check_system(gpio_reset_ids))
+                gpio->reset(gpio, DCB_GPIO_UNUSED);
+
+        return ret;
+}
+
+void
+_nouveau_gpio_dtor(struct nouveau_object *object)
+{
+        struct nouveau_gpio *gpio = (void *)object;
+        nvkm_event_fini(&gpio->event);
+        nouveau_subdev_destroy(&gpio->base);
+}
+
+int
+nouveau_gpio_create_(struct nouveau_object *parent,
+                     struct nouveau_object *engine,
+                     struct nouveau_oclass *oclass,
+                     int length, void **pobject)
+{
+        const struct nouveau_gpio_impl *impl = (void *)oclass;
+        struct nouveau_gpio *gpio;
+        int ret;
+
+        ret = nouveau_subdev_create_(parent, engine, oclass, 0, "GPIO", "gpio",
+                                     length, pobject);
+        gpio = *pobject;
+        if (ret)
+                return ret;
+
+        gpio->find = nouveau_gpio_find;
+        gpio->set  = nouveau_gpio_set;
+        gpio->get  = nouveau_gpio_get;
+        gpio->reset = impl->reset;
+
+        ret = nvkm_event_init(&nouveau_gpio_intr_func, 2, impl->lines,
+                              &gpio->event);
+        if (ret)
+                return ret;
+
+        nv_subdev(gpio)->intr = nouveau_gpio_intr;
+        return 0;
+}
+
+int
+_nouveau_gpio_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+                   struct nouveau_oclass *oclass, void *data, u32 size,
+                   struct nouveau_object **pobject)
+{
+        struct nouveau_gpio *gpio;
+        int ret;
+
+        ret = nouveau_gpio_create(parent, engine, oclass, &gpio);
+        *pobject = nv_object(gpio);
+        if (ret)
+                return ret;
+
+        return 0;
+}