Merge drm/drm-next into drm-intel-gt-next

[sfrench/cifs-2.6.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 9c31a16f8380004c09809df0de7b67463106bb0f..f6a7c0bd2955cf39493bda8bab0a9e060d967531 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -67,7 +67,6 @@ static void mock_device_release(struct drm_device *dev)
        intel_gt_driver_remove(to_gt(i915));
 
        i915_gem_drain_workqueue(i915);
-       i915_gem_drain_freed_objects(i915);
 
        mock_fini_ggtt(to_gt(i915)->ggtt);
        destroy_workqueue(i915->wq);
@@ -115,6 +114,7 @@ static struct dev_pm_domain pm_domain = {
 static void mock_gt_probe(struct drm_i915_private *i915)
 {
        i915->gt[0] = &i915->gt0;
+       i915->gt[0]->name = "Mock GT";
 }
 
 struct drm_i915_private *mock_gem_device(void)
@@ -172,14 +172,14 @@ struct drm_i915_private *mock_gem_device(void)
        /* Using the global GTT may ask questions about KMS users, so prepare */
        drm_mode_config_init(&i915->drm);
 
-       mkwrite_device_info(i915)->graphics.ver = -1;
+       RUNTIME_INFO(i915)->graphics.ip.ver = -1;
 
-       mkwrite_device_info(i915)->page_sizes =
+       RUNTIME_INFO(i915)->page_sizes =
                I915_GTT_PAGE_SIZE_4K |
                I915_GTT_PAGE_SIZE_64K |
                I915_GTT_PAGE_SIZE_2M;
 
-       mkwrite_device_info(i915)->memory_regions = REGION_SMEM;
+       RUNTIME_INFO(i915)->memory_regions = REGION_SMEM;
        intel_memory_regions_hw_probe(i915);
 
        spin_lock_init(&i915->gpu_error.lock);
@@ -209,7 +209,7 @@ struct drm_i915_private *mock_gem_device(void)
        mock_init_ggtt(to_gt(i915));
        to_gt(i915)->vm = i915_vm_get(&to_gt(i915)->ggtt->vm);
 
-       mkwrite_device_info(i915)->platform_engine_mask = BIT(0);
+       RUNTIME_INFO(i915)->platform_engine_mask = BIT(0);
        to_gt(i915)->info.engine_mask = BIT(0);
 
        to_gt(i915)->engine[RCS0] = mock_engine(i915, "mock", RCS0);