drm/nv50/disp: fix evo for create/init + destroy/fini split
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 7a57c30..a3d28a1 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -347,7 +347,7 @@
struct dcb_table *dcb = &dev_priv->vbios.dcb;
struct drm_connector *connector, *ct;
struct nv50_display *priv;
- int i;
+ int ret, i;
NV_DEBUG_KMS(dev, "\n");
@@ -400,6 +400,13 @@
tasklet_init(&priv->tasklet, nv50_display_bh, (unsigned long)dev);
nouveau_irq_register(dev, 26, nv50_display_isr);
+
+ ret = nv50_evo_create(dev);
+ if (ret) {
+ nv50_display_destroy(dev);
+ return ret;
+ }
+
return 0;
}
@@ -410,6 +417,7 @@
NV_DEBUG_KMS(dev, "\n");
+ nv50_evo_destroy(dev);
nouveau_irq_unregister(dev, 26);
kfree(disp);
}