Commit 28b5f3b6 authored by Zack Rusin's avatar Zack Rusin

drm/vmwgfx: Release ttm memory if probe fails

The ttm mem global state was leaking if the vmwgfx driver load failed.

In case of a driver load failure we have to make sure we also release
the ttm mem global state.
Signed-off-by: default avatarZack Rusin <zackr@vmware.com>
Reviewed-by: default avatarMartin Krastev <krastevm@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211105193845.258816-3-zackr@vmware.com
parent 826c387d
...@@ -1616,34 +1616,40 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1616,34 +1616,40 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver); ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
if (ret) if (ret)
return ret; goto out_error;
ret = pcim_enable_device(pdev); ret = pcim_enable_device(pdev);
if (ret) if (ret)
return ret; goto out_error;
vmw = devm_drm_dev_alloc(&pdev->dev, &driver, vmw = devm_drm_dev_alloc(&pdev->dev, &driver,
struct vmw_private, drm); struct vmw_private, drm);
if (IS_ERR(vmw)) if (IS_ERR(vmw)) {
return PTR_ERR(vmw); ret = PTR_ERR(vmw);
goto out_error;
}
pci_set_drvdata(pdev, &vmw->drm); pci_set_drvdata(pdev, &vmw->drm);
ret = ttm_mem_global_init(&ttm_mem_glob, &pdev->dev); ret = ttm_mem_global_init(&ttm_mem_glob, &pdev->dev);
if (ret) if (ret)
return ret; goto out_error;
ret = vmw_driver_load(vmw, ent->device); ret = vmw_driver_load(vmw, ent->device);
if (ret) if (ret)
return ret; goto out_release;
ret = drm_dev_register(&vmw->drm, 0); ret = drm_dev_register(&vmw->drm, 0);
if (ret) { if (ret)
vmw_driver_unload(&vmw->drm); goto out_unload;
return ret;
}
return 0; return 0;
out_unload:
vmw_driver_unload(&vmw->drm);
out_release:
ttm_mem_global_release(&ttm_mem_glob);
out_error:
return ret;
} }
static int __init vmwgfx_init(void) static int __init vmwgfx_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment