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

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / pmu / gf119.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf110.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c
similarity index 73%
rename from kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf110.c
rename to kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c
index 6b3a238..fbc88d8 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf110.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c
@@ -22,19 +22,18 @@
  * Authors: Ben Skeggs
  */
 #include "priv.h"
-#include "fuc/gf110.fuc4.h"
+#include "fuc/gf119.fuc4.h"
 
-struct nvkm_oclass *
-gf110_pmu_oclass = &(struct nvkm_pmu_impl) {
-       .base.handle = NV_SUBDEV(PMU, 0xd0),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_pmu_ctor,
-               .dtor = _nvkm_pmu_dtor,
-               .init = _nvkm_pmu_init,
-               .fini = _nvkm_pmu_fini,
-       },
-       .code.data = gf110_pmu_code,
-       .code.size = sizeof(gf110_pmu_code),
-       .data.data = gf110_pmu_data,
-       .data.size = sizeof(gf110_pmu_data),
-}.base;
+static const struct nvkm_pmu_func
+gf119_pmu = {
+       .code.data = gf119_pmu_code,
+       .code.size = sizeof(gf119_pmu_code),
+       .data.data = gf119_pmu_data,
+       .data.size = sizeof(gf119_pmu_data),
+};
+
+int
+gf119_pmu_new(struct nvkm_device *device, int index, struct nvkm_pmu **ppmu)
+{
+       return nvkm_pmu_new_(&gf119_pmu, device, index, ppmu);
+}