diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-11-09 11:36:33 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 19:01:33 +1000 |
| commit | 2a44e4997c5fee8e1da1589ff57e0bd1c53f03ce (patch) | |
| tree | 26fa7eb5269183d1fbc5314db7cad4f4a8abc720 /drivers/gpu/drm/nouveau/nouveau_display.c | |
| parent | d2edab4acffb35a6e24259886d377774efd37e6e (diff) | |
| download | talos-obmc-linux-2a44e4997c5fee8e1da1589ff57e0bd1c53f03ce.tar.gz talos-obmc-linux-2a44e4997c5fee8e1da1589ff57e0bd1c53f03ce.zip | |
drm/nouveau/disp: introduce proper init/fini, separate from create/destroy
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 38623a25d0b1..803248d467fb 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -262,7 +262,10 @@ nouveau_display_create(struct drm_device *dev) if (ret) return ret; - return 0; + ret = disp->init(dev); + if (ret) + disp->destroy(dev); + return ret; } void @@ -271,6 +274,7 @@ nouveau_display_destroy(struct drm_device *dev) struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_display_engine *disp = &dev_priv->engine.display; + disp->fini(dev); disp->destroy(dev); drm_mode_config_cleanup(dev); } |
