mirror of
https://github.com/torvalds/linux
synced 2024-10-08 20:34:15 +00:00
drm/i915: Call i915_globals_exit() if pci_register_device() fails
In the unlikely event that pci_register_device() fails, we were tearing down our PMU setup but not globals. This leaves a bunch of memory slabs lying around. Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> Fixes:32eb6bcfdd
("drm/i915: Make request allocation caches global") [danvet: Fix conflicts against removal of the globals_flush infrastructure.] Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20210721152358.2893314-3-jason@jlekstrand.net (cherry picked from commitdb484889d1
) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> [Fixed small conflict while cherry picking]
This commit is contained in:
parent
9c9c6d0ab0
commit
1354d830cb
|
@ -148,7 +148,7 @@ static void __exit __i915_globals_flush(void)
|
|||
atomic_dec(&active);
|
||||
}
|
||||
|
||||
void __exit i915_globals_exit(void)
|
||||
void i915_globals_exit(void)
|
||||
{
|
||||
GEM_BUG_ON(atomic_read(&active));
|
||||
|
||||
|
|
|
@ -1195,6 +1195,7 @@ static int __init i915_init(void)
|
|||
err = pci_register_driver(&i915_pci_driver);
|
||||
if (err) {
|
||||
i915_pmu_exit();
|
||||
i915_globals_exit();
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue