Chris Wilson writes:
> When cleaning up the mock device, remember to flush the context worker
> to free the residual GEM contexts before shutting down the device.
>
> Closes: https://gitlab.freedesktop.org/drm/intel/issues/802
> Signed-off-by: Chris Wilson
> Cc: Matthew Auld
Reviewed-by: Mika Kuoppala
> ---
> drivers/gpu/drm/i915/i915_gem.c | 4 ++--
> drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 ++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 9ddcf17230e6..a3d701b50a6b 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -1172,6 +1172,8 @@ void i915_gem_driver_remove(struct drm_i915_private
> *dev_priv)
>
> void i915_gem_driver_release(struct drm_i915_private *dev_priv)
> {
> + i915_gem_driver_release__contexts(dev_priv);
> +
> intel_gt_driver_release(_priv->gt);
>
> intel_wa_list_free(_priv->gt_wa_list);
> @@ -1179,8 +1181,6 @@ void i915_gem_driver_release(struct drm_i915_private
> *dev_priv)
> intel_uc_cleanup_firmwares(_priv->gt.uc);
> i915_gem_cleanup_userptr(dev_priv);
>
> - i915_gem_driver_release__contexts(dev_priv);
> -
> i915_gem_drain_freed_objects(dev_priv);
>
> WARN_ON(!list_empty(_priv->gem.contexts.list));
> diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> index 2b01094e4318..3b8986983afc 100644
> --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> @@ -58,6 +58,8 @@ static void mock_device_release(struct drm_device *dev)
> mock_device_flush(i915);
> intel_gt_driver_remove(>gt);
>
> + i915_gem_driver_release__contexts(i915);
> +
> i915_gem_drain_workqueue(i915);
> i915_gem_drain_freed_objects(i915);
>
> --
> 2.25.0.rc0
>
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
