GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 08:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Takashi Iwai 2018-03-30 22:45:11 +02:00 • committed by Alex Deucher
parent 41212e2fe7
commit c60e22f719
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
View file

@ -922,6 +922,11 @@ static int __init amdgpu_init(void)
{ {
int r; int r;
if (vgacon_text_force()) {
DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");
return -EINVAL;
}
r = amdgpu_sync_init(); r = amdgpu_sync_init();
if (r) if (r)
goto error_sync; goto error_sync;
@ -930,10 +935,6 @@ static int __init amdgpu_init(void)
if (r) if (r)
goto error_fence; 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 kernel modesetting enabled.\n");
driver = &kms_driver; driver = &kms_driver;
pdriver = &amdgpu_kms_pci_driver; pdriver = &amdgpu_kms_pci_driver;