Merge tag 'drm-misc-next-2020-04-14' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / selftests / mock_gem_device.c

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 754d0eb..9b105b8 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -25,6 +25,8 @@
 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 
+#include <drm/drm_managed.h>
+
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_requests.h"
 #include "gt/mock_engine.h"
@@ -55,6 +57,9 @@ static void mock_device_release(struct drm_device *dev)
 {
        struct drm_i915_private *i915 = to_i915(dev);
 
+       if (!i915->do_release)
+               goto out;
+
        mock_device_flush(i915);
        intel_gt_driver_remove(&i915->gt);
 
@@ -71,8 +76,9 @@ static void mock_device_release(struct drm_device *dev)
 
        drm_mode_config_cleanup(&i915->drm);
 
-       drm_dev_fini(&i915->drm);
+out:
        put_device(&i915->drm.pdev->dev);
+       i915->drm.pdev = NULL;
 }
 
 static struct drm_driver mock_driver = {
@@ -114,9 +120,14 @@ struct drm_i915_private *mock_gem_device(void)
        struct pci_dev *pdev;
        int err;
 
-       pdev = kzalloc(sizeof(*pdev) + sizeof(*i915), GFP_KERNEL);
+       pdev = kzalloc(sizeof(*pdev), GFP_KERNEL);
        if (!pdev)
-               goto err;
+               return NULL;
+       i915 = kzalloc(sizeof(*i915), GFP_KERNEL);
+       if (!i915) {
+               kfree(pdev);
+               return NULL;
+       }
 
        device_initialize(&pdev->dev);
        pdev->class = PCI_BASE_CLASS_DISPLAY << 16;
@@ -129,7 +140,6 @@ struct drm_i915_private *mock_gem_device(void)
        pdev->dev.archdata.iommu = (void *)-1;
 #endif
 
-       i915 = (struct drm_i915_private *)(pdev + 1);
        pci_set_drvdata(pdev, i915);
 
        dev_pm_domain_set(&pdev->dev, &pm_domain);
@@ -141,9 +151,13 @@ struct drm_i915_private *mock_gem_device(void)
        err = drm_dev_init(&i915->drm, &mock_driver, &pdev->dev);
        if (err) {
                pr_err("Failed to initialise mock GEM device: err=%d\n", err);
-               goto put_device;
+               put_device(&pdev->dev);
+               kfree(i915);
+
+               return NULL;
        }
        i915->drm.pdev = pdev;
+       drmm_add_final_kfree(&i915->drm, i915);
 
        intel_runtime_pm_init_early(&i915->runtime_pm);
 
@@ -178,16 +192,18 @@ struct drm_i915_private *mock_gem_device(void)
 
        mkwrite_device_info(i915)->engine_mask = BIT(0);
 
-       i915->engine[RCS0] = mock_engine(i915, "mock", RCS0);
-       if (!i915->engine[RCS0])
+       i915->gt.engine[RCS0] = mock_engine(i915, "mock", RCS0);
+       if (!i915->gt.engine[RCS0])
                goto err_unlock;
 
-       if (mock_engine_init(i915->engine[RCS0]))
+       if (mock_engine_init(i915->gt.engine[RCS0]))
                goto err_context;
 
        __clear_bit(I915_WEDGED, &i915->gt.reset.flags);
        intel_engines_driver_register(i915);
 
+       i915->do_release = true;
+
        return i915;
 
 err_context:
@@ -198,9 +214,7 @@ err_drv:
        intel_gt_driver_late_release(&i915->gt);
        intel_memory_regions_driver_release(i915);
        drm_mode_config_cleanup(&i915->drm);
-       drm_dev_fini(&i915->drm);
-put_device:
-       put_device(&pdev->dev);
-err:
+       drm_dev_put(&i915->drm);
+
        return NULL;
 }