Attachment 88130 Details for Bug 70874 – Serialise i915_gem_release() and i915_gem_free_request()

[patch] Serialise i915_gem_release() and i915_gem_free_request()

0001-drm-i915-Serialise-i915_gem_release-i915_gem_free_qu.patch (text/plain), 1.54 KB, created by Chris Wilson on 2013-10-25 21:36:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2013-10-25 21:36:08 UTC

Size: 1.54 KB

patch

obsolete

>From 23b0e49cda42d3bce9a7041744cf433bf6fad4b4 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 25 Oct 2013 22:34:25 +0100
>Subject: [PATCH] drm/i915: Serialise i915_gem_release()/i915_gem_free_quest()
>
>---
> drivers/gpu/drm/i915/i915_dma.c         |    2 ++
> drivers/gpu/drm/i915/i915_gem_context.c |    2 --
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
>index fd6c46b..03a5244 100644
>--- a/drivers/gpu/drm/i915/i915_dma.c
>+++ b/drivers/gpu/drm/i915/i915_dma.c
>@@ -1827,8 +1827,10 @@ void i915_driver_lastclose(struct drm_device * dev)
> 
> void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
> {
>+	mutex_lock(&dev->struct_mutex);
> 	i915_gem_context_close(dev, file_priv);
> 	i915_gem_release(dev, file_priv);
>+	mutex_unlock(&dev->struct_mutex);
> }
> 
> void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)
>diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
>index e53345c..f436ea1 100644
>--- a/drivers/gpu/drm/i915/i915_gem_context.c
>+++ b/drivers/gpu/drm/i915/i915_gem_context.c
>@@ -338,10 +338,8 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file)
> {
> 	struct drm_i915_file_private *file_priv = file->driver_priv;
> 
>-	mutex_lock(&dev->struct_mutex);
> 	idr_for_each(&file_priv->context_idr, context_idr_cleanup, NULL);
> 	idr_destroy(&file_priv->context_idr);
>-	mutex_unlock(&dev->struct_mutex);
> }
> 
> static struct i915_hw_context *
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 70874: 88124 | 88125 | 88130 | 88276

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.