gma500: unload fixes

Debugging the lid problem tested various error paths which were found
wanting so start fixing them up.

There is a ton of improvement work could be done here so that every bit
of functionality agrees if its _fini, _uninit, etc, and they agree who
is responsible for deciding if the clean up is needed.

That can come later.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 659ed3933b5b..8d77224afc34 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -800,15 +800,20 @@ void psb_modeset_init(struct drm_device *dev)
 
         if (dev_priv->ops->errata)
                 dev_priv->ops->errata(dev);
+
+        dev_priv->modeset = true;
 }
 
 void psb_modeset_cleanup(struct drm_device *dev)
 {
-        mutex_lock(&dev->struct_mutex);
+        struct drm_psb_private *dev_priv = dev->dev_private;
+        if (dev_priv->modeset) {
+                mutex_lock(&dev->struct_mutex);
 
-        drm_kms_helper_poll_fini(dev);
-        psb_fbdev_fini(dev);
-        drm_mode_config_cleanup(dev);
+                drm_kms_helper_poll_fini(dev);
+                psb_fbdev_fini(dev);
+                drm_mode_config_cleanup(dev);
 
-        mutex_unlock(&dev->struct_mutex);
+                mutex_unlock(&dev->struct_mutex);
+        }
 }