From 8d0410df5b3e27a35e6bfd6d25e1ac72c1b5956f Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 6 Jun 2009 09:46:00 +0100 Subject: [PATCH] --- yaml --- r: 148711 b: refs/heads/master c: b1ce786cb85280490ca3c29a62ddf8608826b414 h: refs/heads/master i: 148709: a5c4bbd779b4d417dc70d2da5bccdeb7caa1c6a0 148707: 9921562cc300343bc6c9011aef043e81be67253d 148703: de005fec4b14e98c7fd9a4b6063f1c616ecd5731 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2324d8174442..f485daca03a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f803ee5cea67d2387aeedb4b07e645a743729de +refs/heads/master: b1ce786cb85280490ca3c29a62ddf8608826b414 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 2d705e8a297e..744bf9803ea3 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -3701,15 +3701,14 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, struct drm_gem_object *obj; struct drm_i915_gem_object *obj_priv; - mutex_lock(&dev->struct_mutex); obj = drm_gem_object_lookup(dev, file_priv, args->handle); if (obj == NULL) { DRM_ERROR("Bad handle in i915_gem_busy_ioctl(): %d\n", args->handle); - mutex_unlock(&dev->struct_mutex); return -EBADF; } + mutex_lock(&dev->struct_mutex); /* Update the active list for the hardware's current position. * Otherwise this only updates on a delayed timer or when irqs are * actually unmasked, and our working set ends up being larger than