diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-11-09 09:52:43 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 13:01:34 +0400 |
| commit | 1772fcc6f8af681a6e08f5cca15e86e710efe809 (patch) | |
| tree | 269ce8bc2acb30155f8752eeadab6af96a9466a1 /drivers/gpu/drm/nouveau/nv50_display.c | |
| parent | cf41d53bf5b95d77673b185cc3b20ae3257f79e2 (diff) | |
| download | linux-1772fcc6f8af681a6e08f5cca15e86e710efe809.tar.xz | |
drm/nv50/disp: fix evo for create/init + destroy/fini split
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 7a57c30e2728..a3d28a1e8bb2 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -347,7 +347,7 @@ nv50_display_create(struct drm_device *dev) 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 @@ nv50_display_create(struct drm_device *dev) 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 @@ nv50_display_destroy(struct drm_device *dev) NV_DEBUG_KMS(dev, "\n"); + nv50_evo_destroy(dev); nouveau_irq_unregister(dev, 26); kfree(disp); } |