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

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / devinit / nv1a.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv1a.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv1a.c
index 9f36fff..fefafec 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv1a.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv1a.c
@@ -26,15 +26,17 @@
 #include <subdev/bios.h>
 #include <subdev/bios/init.h>
 
-struct nvkm_oclass *
-nv1a_devinit_oclass = &(struct nvkm_devinit_impl) {
-       .base.handle = NV_SUBDEV(DEVINIT, 0x1a),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = nv04_devinit_ctor,
-               .dtor = nv04_devinit_dtor,
-               .init = nv04_devinit_init,
-               .fini = nv04_devinit_fini,
-       },
+static const struct nvkm_devinit_func
+nv1a_devinit = {
+       .dtor = nv04_devinit_dtor,
+       .preinit = nv04_devinit_preinit,
+       .post = nv04_devinit_post,
        .pll_set = nv04_devinit_pll_set,
-       .post = nvbios_init,
-}.base;
+};
+
+int
+nv1a_devinit_new(struct nvkm_device *device, int index,
+                struct nvkm_devinit **pinit)
+{
+       return nv04_devinit_new_(&nv1a_devinit, device, index, pinit);
+}