drm/amdgpu: add some error hanbdling to amdgpu_init
Subsystems (2)
PATCH 1/1 drm/amdgpu: add some error hanbdling to amdgpu_init
From: Christian König <[email protected]>
Just to be clean should we ever run into -ENOMEM during module init.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +23 -3
@@ -746,9 +746,20 @@ static struct pci_driver amdgpu_kms_pci_driver = {static int __init amdgpu_init (void ) { -amdgpu_sync_init (); -amdgpu_fence_slab_init (); -amd_sched_fence_slab_init (); +int r; + + r =amdgpu_sync_init (); +if (r) + goto error_sync; + + r =amdgpu_fence_slab_init (); +if (r) + goto error_fence; + + r =amd_sched_fence_slab_init (); +if (r) + goto error_sched; +if (vgacon_text_force ()) {DRM_ERROR ("VGACON disables amdgpu kernel modesetting.\n" );return -EINVAL ;
@@ -760,6 +771,15 @@ static int __init amdgpu_init(void)amdgpu_register_atpx_handler ();/* let modprobe override vga console setting */ return drm_pci_init (driver, pdriver); + +error_sched: +amdgpu_fence_slab_fini (); + +error_fence: +amdgpu_sync_fini (); + +error_sync: +return r; } static void __exit amdgpu_exit(void)
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1477669187-6294-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 7 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Friday, October 28, 2016 11:40 AM
To: [email protected]
Subject: [PATCH] drm/amdgpu: add some error hanbdling toamdgpu_init
Quoted 5 lines
From: Christian König <[email protected]>
Just to be clean should we ever run into
-ENOMEMduring module init.Signed-off-by Christian König <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +14
-3@@ -746,9 +746,20 @@ static struct pci_driver amdgpu_kms_pci_driver = {static int __init amdgpu_init (void ) { -amdgpu_sync_init (); -amdgpu_fence_slab_init (); -amd_sched_fence_slab_init (); +int r; + + r =amdgpu_sync_init (); +if (r) + goto error_sync; + + r =amdgpu_fence_slab_init (); +if (r) + goto error_fence; + + r =amd_sched_fence_slab_init (); +if (r) + goto error_sched; +if (vgacon_text_force ()) { DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +9
-1return -EINVAL ;@@ -760,6 +771,15 @@ static int __init amdgpu_init(void)amdgpu_register_atpx_handler ();/* let modprobe override vga console setting */ return drm_pci_init (driver, pdriver); + +error_sched: +amdgpu_fence_slab_fini (); + +error_fence: +amdgpu_sync_fini (); + +error_sync: +return r; } static void __exit amdgpu_exit(void) --2.5.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx