Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c60e22f7 authored by Takashi Iwai's avatar Takashi Iwai Committed by Alex Deucher
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 41212e2f

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+5 −4
Original line number Diff line number Diff line
@@ -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;