Merge tag 'drm-intel-next-fixes-2020-10-22' of git://anongit.freedesktop.org/drm...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_drv.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index f3e2fbcfadfbb4983c4abe19a3a89a4c33527d72..c241317edee7813a8530336d43f319582b766ebe 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1164,25 +1164,20 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
        if (ret)
                return ret;
 
-       adev = kzalloc(sizeof(*adev), GFP_KERNEL);
-       if (!adev)
-               return -ENOMEM;
+       adev = devm_drm_dev_alloc(&pdev->dev, &kms_driver, typeof(*adev), ddev);
+       if (IS_ERR(adev))
+               return PTR_ERR(adev);
 
        adev->dev  = &pdev->dev;
        adev->pdev = pdev;
        ddev = adev_to_drm(adev);
-       ret = drm_dev_init(ddev, &kms_driver, &pdev->dev);
-       if (ret)
-               goto err_free;
-
-       drmm_add_final_kfree(ddev, adev);
 
        if (!supports_atomic)
                ddev->driver_features &= ~DRIVER_ATOMIC;
 
        ret = pci_enable_device(pdev);
        if (ret)
-               goto err_free;
+               return ret;
 
        ddev->pdev = pdev;
        pci_set_drvdata(pdev, ddev);
@@ -1210,8 +1205,6 @@ retry_init:
 
 err_pci:
        pci_disable_device(pdev);
-err_free:
-       drm_dev_put(ddev);
        return ret;
 }
 
@@ -1228,7 +1221,6 @@ amdgpu_pci_remove(struct pci_dev *pdev)
        amdgpu_driver_unload_kms(dev);
        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);
-       drm_dev_put(dev);
 }
 
 static void