drm/radeon/kms: cleanup structure and module if initialization fails

This would allow us to properly unload others module like TTM if
initialization fails after we initiliazed TTM structure.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 20 insertions, 22 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index ba128621057a..f23b05606eb5 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -30,10 +30,19 @@
 #include "radeon.h"
 #include "radeon_drm.h"
 
+int radeon_driver_unload_kms(struct drm_device *dev)
+{
+        struct radeon_device *rdev = dev->dev_private;
+
+        if (rdev == NULL)
+                return 0;
+        radeon_modeset_fini(rdev);
+        radeon_device_fini(rdev);
+        kfree(rdev);
+        dev->dev_private = NULL;
+        return 0;
+}
 
-/*
- * Driver load/unload
- */
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
 {
         struct radeon_device *rdev;
@@ -62,31 +71,20 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
          */
         r = radeon_device_init(rdev, dev, dev->pdev, flags);
         if (r) {
-                DRM_ERROR("Fatal error while trying to initialize radeon.\n");
-                return r;
+                dev_err(&dev->pdev->dev, "Fatal error during GPU init\n");
+                goto out;
         }
         /* Again modeset_init should fail only on fatal error
          * otherwise it should provide enough functionalities
          * for shadowfb to run
          */
         r = radeon_modeset_init(rdev);
-        if (r) {
-                return r;
-        }
-        return 0;
-}
-
-int radeon_driver_unload_kms(struct drm_device *dev)
-{
-        struct radeon_device *rdev = dev->dev_private;
-
-        if (rdev == NULL)
-                return 0;
-        radeon_modeset_fini(rdev);
-        radeon_device_fini(rdev);
-        kfree(rdev);
-        dev->dev_private = NULL;
-        return 0;
+        if (r)
+                dev_err(&dev->pdev->dev, "Fatal error during modeset init\n");
+out:
+        if (r)
+                radeon_driver_unload_kms(dev);
+        return r;
 }