Skip to content

Commit

Permalink
drm/i915/selftests: Free mock_i915->drm.mode_config
Browse files Browse the repository at this point in the history
Even for the mock i915 device, we need to initialise the
drm.mode_config, as we may ultimately query whether there are any KMS
users deep in the bowels of some paths (e.g. eviction). As we initialise
drm.mode_config we must cleanup after ourselves!

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171209210835.32609-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Dec 11, 2017
1 parent 8516673 commit 19553d5
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/gpu/drm/i915/selftests/mock_gem_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ static void mock_device_release(struct drm_device *dev)

i915_gemfs_fini(i915);

drm_mode_config_cleanup(&i915->drm);

drm_dev_fini(&i915->drm);
put_device(&i915->drm.pdev->dev);
}
Expand Down Expand Up @@ -187,7 +189,7 @@ struct drm_i915_private *mock_gem_device(void)

i915->wq = alloc_ordered_workqueue("mock", 0);
if (!i915->wq)
goto put_device;
goto err_drv;

mock_init_contexts(i915);

Expand Down Expand Up @@ -266,6 +268,9 @@ struct drm_i915_private *mock_gem_device(void)
kmem_cache_destroy(i915->objects);
err_wq:
destroy_workqueue(i915->wq);
err_drv:
drm_mode_config_cleanup(&i915->drm);
drm_dev_fini(&i915->drm);
put_device:
put_device(&pdev->dev);
err:
Expand Down

0 comments on commit 19553d5

Please sign in to comment.