From 2b138a76f5410419fe22a86dc08f3c9efd4e5223 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 30 Mar 2018 22:45:11 +0200 Subject: [PATCH 3988/4131] 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 Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index cc63f52..3cf4e17 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -929,6 +929,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; @@ -937,11 +942,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"); DRM_INFO("amdgpu version: %s\n", AMDGPU_VERSION); driver = &kms_driver; -- 2.7.4