These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / core / subdev.c
index c5fb3a7..7de9847 100644 (file)
 #include <core/device.h>
 #include <core/option.h>
 
-struct nvkm_subdev *
-nvkm_subdev(void *obj, int idx)
-{
-       struct nvkm_object *object = nv_object(obj);
-       while (object && !nv_iclass(object, NV_SUBDEV_CLASS))
-               object = object->parent;
-       if (object == NULL || nv_subidx(nv_subdev(object)) != idx)
-               object = nv_device(obj)->subdev[idx];
-       return object ? nv_subdev(object) : NULL;
-}
+static struct lock_class_key nvkm_subdev_lock_class[NVKM_SUBDEV_NR];
+
+const char *
+nvkm_subdev_name[NVKM_SUBDEV_NR] = {
+       [NVKM_SUBDEV_BAR    ] = "bar",
+       [NVKM_SUBDEV_VBIOS  ] = "bios",
+       [NVKM_SUBDEV_BUS    ] = "bus",
+       [NVKM_SUBDEV_CLK    ] = "clk",
+       [NVKM_SUBDEV_DEVINIT] = "devinit",
+       [NVKM_SUBDEV_FB     ] = "fb",
+       [NVKM_SUBDEV_FUSE   ] = "fuse",
+       [NVKM_SUBDEV_GPIO   ] = "gpio",
+       [NVKM_SUBDEV_I2C    ] = "i2c",
+       [NVKM_SUBDEV_IBUS   ] = "priv",
+       [NVKM_SUBDEV_INSTMEM] = "imem",
+       [NVKM_SUBDEV_LTC    ] = "ltc",
+       [NVKM_SUBDEV_MC     ] = "mc",
+       [NVKM_SUBDEV_MMU    ] = "mmu",
+       [NVKM_SUBDEV_MXM    ] = "mxm",
+       [NVKM_SUBDEV_PCI    ] = "pci",
+       [NVKM_SUBDEV_PMU    ] = "pmu",
+       [NVKM_SUBDEV_THERM  ] = "therm",
+       [NVKM_SUBDEV_TIMER  ] = "tmr",
+       [NVKM_SUBDEV_VOLT   ] = "volt",
+       [NVKM_ENGINE_BSP    ] = "bsp",
+       [NVKM_ENGINE_CE0    ] = "ce0",
+       [NVKM_ENGINE_CE1    ] = "ce1",
+       [NVKM_ENGINE_CE2    ] = "ce2",
+       [NVKM_ENGINE_CIPHER ] = "cipher",
+       [NVKM_ENGINE_DISP   ] = "disp",
+       [NVKM_ENGINE_DMAOBJ ] = "dma",
+       [NVKM_ENGINE_FIFO   ] = "fifo",
+       [NVKM_ENGINE_GR     ] = "gr",
+       [NVKM_ENGINE_IFB    ] = "ifb",
+       [NVKM_ENGINE_ME     ] = "me",
+       [NVKM_ENGINE_MPEG   ] = "mpeg",
+       [NVKM_ENGINE_MSENC  ] = "msenc",
+       [NVKM_ENGINE_MSPDEC ] = "mspdec",
+       [NVKM_ENGINE_MSPPP  ] = "msppp",
+       [NVKM_ENGINE_MSVLD  ] = "msvld",
+       [NVKM_ENGINE_PM     ] = "pm",
+       [NVKM_ENGINE_SEC    ] = "sec",
+       [NVKM_ENGINE_SW     ] = "sw",
+       [NVKM_ENGINE_VIC    ] = "vic",
+       [NVKM_ENGINE_VP     ] = "vp",
+};
 
 void
-nvkm_subdev_reset(struct nvkm_object *subdev)
+nvkm_subdev_intr(struct nvkm_subdev *subdev)
 {
-       nv_trace(subdev, "resetting...\n");
-       nv_ofuncs(subdev)->fini(subdev, false);
-       nv_debug(subdev, "reset\n");
+       if (subdev->func->intr)
+               subdev->func->intr(subdev);
 }
 
 int
-nvkm_subdev_init(struct nvkm_subdev *subdev)
+nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend)
 {
-       int ret = nvkm_object_init(&subdev->object);
-       if (ret)
-               return ret;
+       struct nvkm_device *device = subdev->device;
+       const char *action = suspend ? "suspend" : "fini";
+       u32 pmc_enable = subdev->pmc_enable;
+       s64 time;
 
-       nvkm_subdev_reset(&subdev->object);
-       return 0;
-}
+       nvkm_trace(subdev, "%s running...\n", action);
+       time = ktime_to_us(ktime_get());
 
-int
-_nvkm_subdev_init(struct nvkm_object *object)
-{
-       return nvkm_subdev_init(nv_subdev(object));
-}
+       if (subdev->func->fini) {
+               int ret = subdev->func->fini(subdev, suspend);
+               if (ret) {
+                       nvkm_error(subdev, "%s failed, %d\n", action, ret);
+                       if (suspend)
+                               return ret;
+               }
+       }
 
-int
-nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend)
-{
-       if (subdev->unit) {
-               nv_mask(subdev, 0x000200, subdev->unit, 0x00000000);
-               nv_mask(subdev, 0x000200, subdev->unit, subdev->unit);
+       if (pmc_enable) {
+               nvkm_mask(device, 0x000200, pmc_enable, 0x00000000);
+               nvkm_mask(device, 0x000200, pmc_enable, pmc_enable);
+               nvkm_rd32(device, 0x000200);
        }
 
-       return nvkm_object_fini(&subdev->object, suspend);
+       time = ktime_to_us(ktime_get()) - time;
+       nvkm_trace(subdev, "%s completed in %lldus\n", action, time);
+       return 0;
 }
 
 int
-_nvkm_subdev_fini(struct nvkm_object *object, bool suspend)
+nvkm_subdev_preinit(struct nvkm_subdev *subdev)
 {
-       return nvkm_subdev_fini(nv_subdev(object), suspend);
-}
+       s64 time;
 
-void
-nvkm_subdev_destroy(struct nvkm_subdev *subdev)
-{
-       int subidx = nv_hclass(subdev) & 0xff;
-       nv_device(subdev)->subdev[subidx] = NULL;
-       nvkm_object_destroy(&subdev->object);
-}
+       nvkm_trace(subdev, "preinit running...\n");
+       time = ktime_to_us(ktime_get());
 
-void
-_nvkm_subdev_dtor(struct nvkm_object *object)
-{
-       nvkm_subdev_destroy(nv_subdev(object));
+       if (subdev->func->preinit) {
+               int ret = subdev->func->preinit(subdev);
+               if (ret) {
+                       nvkm_error(subdev, "preinit failed, %d\n", ret);
+                       return ret;
+               }
+       }
+
+       time = ktime_to_us(ktime_get()) - time;
+       nvkm_trace(subdev, "preinit completed in %lldus\n", time);
+       return 0;
 }
 
 int
-nvkm_subdev_create_(struct nvkm_object *parent, struct nvkm_object *engine,
-                   struct nvkm_oclass *oclass, u32 pclass,
-                   const char *subname, const char *sysname,
-                   int size, void **pobject)
+nvkm_subdev_init(struct nvkm_subdev *subdev)
 {
-       struct nvkm_subdev *subdev;
+       s64 time;
        int ret;
 
-       ret = nvkm_object_create_(parent, engine, oclass, pclass |
-                                 NV_SUBDEV_CLASS, size, pobject);
-       subdev = *pobject;
-       if (ret)
-               return ret;
+       nvkm_trace(subdev, "init running...\n");
+       time = ktime_to_us(ktime_get());
+
+       if (subdev->func->oneinit && !subdev->oneinit) {
+               s64 time;
+               nvkm_trace(subdev, "one-time init running...\n");
+               time = ktime_to_us(ktime_get());
+               ret = subdev->func->oneinit(subdev);
+               if (ret) {
+                       nvkm_error(subdev, "one-time init failed, %d\n", ret);
+                       return ret;
+               }
 
-       __mutex_init(&subdev->mutex, subname, &oclass->lock_class_key);
-       subdev->name = subname;
+               subdev->oneinit = true;
+               time = ktime_to_us(ktime_get()) - time;
+               nvkm_trace(subdev, "one-time init completed in %lldus\n", time);
+       }
 
-       if (parent) {
-               struct nvkm_device *device = nv_device(parent);
-               subdev->debug = nvkm_dbgopt(device->dbgopt, subname);
-               subdev->mmio  = nv_subdev(device)->mmio;
+       if (subdev->func->init) {
+               ret = subdev->func->init(subdev);
+               if (ret) {
+                       nvkm_error(subdev, "init failed, %d\n", ret);
+                       return ret;
+               }
        }
 
+       time = ktime_to_us(ktime_get()) - time;
+       nvkm_trace(subdev, "init completed in %lldus\n", time);
        return 0;
 }
+
+void
+nvkm_subdev_del(struct nvkm_subdev **psubdev)
+{
+       struct nvkm_subdev *subdev = *psubdev;
+       s64 time;
+
+       if (subdev && !WARN_ON(!subdev->func)) {
+               nvkm_trace(subdev, "destroy running...\n");
+               time = ktime_to_us(ktime_get());
+               if (subdev->func->dtor)
+                       *psubdev = subdev->func->dtor(subdev);
+               time = ktime_to_us(ktime_get()) - time;
+               nvkm_trace(subdev, "destroy completed in %lldus\n", time);
+               kfree(*psubdev);
+               *psubdev = NULL;
+       }
+}
+
+void
+nvkm_subdev_ctor(const struct nvkm_subdev_func *func,
+                struct nvkm_device *device, int index, u32 pmc_enable,
+                struct nvkm_subdev *subdev)
+{
+       const char *name = nvkm_subdev_name[index];
+       subdev->func = func;
+       subdev->device = device;
+       subdev->index = index;
+       subdev->pmc_enable = pmc_enable;
+
+       __mutex_init(&subdev->mutex, name, &nvkm_subdev_lock_class[index]);
+       subdev->debug = nvkm_dbgopt(device->dbgopt, name);
+}