drm/amdgpu: Fix memory leaks at amdgpu_init() error path

amdgpu driver checks vgacon_text_force() after some initializations
but without cleaning up.  This will result in leaks.

Move the check of vgacon_text_force() to the beginning of
amdgpu_init() for fixing it and also for optimization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 7379aa5a6849..0b19482b36b8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -922,6 +922,11 @@ static int __init amdgpu_init(void)
 {
         int r;
 
+        if (vgacon_text_force()) {
+                DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");
+                return -EINVAL;
+        }
+
         r = amdgpu_sync_init();
         if (r)
                 goto error_sync;
@@ -930,10 +935,6 @@ static int __init amdgpu_init(void)
         if (r)
                 goto error_fence;
 
-        if (vgacon_text_force()) {
-                DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");
-                return -EINVAL;
-        }
         DRM_INFO("amdgpu kernel modesetting enabled.\n");
         driver = &kms_driver;
         pdriver = &amdgpu_kms_pci_driver;