From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH 08/13] drm/i915: GEM operations need to be done under the big lock
Date: Fri, 8 Jan 2016 12:40:09 +0000 [thread overview]
Message-ID: <1452256809-26049-1-git-send-email-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <1452252592-24803-9-git-send-email-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
VMA creation and GEM list management need the big lock.
v2:
Mutex unlock ended on the wrong path somehow. (0-day, Julia Lawall)
Not to mention drm_gem_object_unreference was there in existing
code with no mutex held.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_gem_stolen.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index c384dc9c8a63..7c2f9127bb23 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -670,6 +670,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
if (gtt_offset == I915_GTT_OFFSET_NONE)
return obj;
+ mutex_lock(&dev->struct_mutex);
+
vma = i915_gem_obj_lookup_or_create_vma(obj, ggtt);
if (IS_ERR(vma)) {
ret = PTR_ERR(vma);
@@ -698,9 +700,12 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
list_add_tail(&obj->global_list, &dev_priv->mm.bound_list);
i915_gem_object_pin_pages(obj);
+ mutex_unlock(&dev->struct_mutex);
+
return obj;
err:
drm_gem_object_unreference(&obj->base);
+ mutex_unlock(&dev->struct_mutex);
return NULL;
}
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-01-08 12:40 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-08 11:29 [PATCH v2 00/13] Misc cleanups and locking fixes Tvrtko Ursulin
2016-01-08 11:29 ` [PATCH 01/13] drm/i915/bdw+: Replace list_del+list_add_tail with list_move_tail Tvrtko Ursulin
2016-01-11 8:22 ` Daniel Vetter
2016-01-08 11:29 ` [PATCH 02/13] drm/i915: Don't need a timer to wake us up Tvrtko Ursulin
2016-01-11 8:26 ` Daniel Vetter
2016-01-08 11:29 ` [PATCH 03/13] drm/i915: Avoid invariant conditionals in lrc interrupt handler Tvrtko Ursulin
2016-01-11 8:29 ` Daniel Vetter
2016-01-11 9:43 ` Tvrtko Ursulin
2016-01-08 11:29 ` [PATCH 04/13] drm/i915: Fail engine initialization if LRCA is incorrectly aligned Tvrtko Ursulin
2016-01-11 8:31 ` Daniel Vetter
2016-01-11 16:02 ` Dave Gordon
2016-01-11 23:31 ` Chris Wilson
2016-01-08 11:29 ` [PATCH 05/13] drm/i915: Cache LRCA in the context Tvrtko Ursulin
2016-01-11 8:38 ` Daniel Vetter
2016-01-11 19:41 ` Dave Gordon
2016-01-12 9:59 ` Tvrtko Ursulin
2016-01-08 11:29 ` [PATCH 06/13] drm/i915: Only grab timestamps when needed Tvrtko Ursulin
2016-01-11 8:42 ` Daniel Vetter
2016-01-11 9:45 ` Tvrtko Ursulin
2016-01-08 11:29 ` [PATCH 07/13] drm/i915: Introduce dedicated object VMA iterator Tvrtko Ursulin
2016-01-08 11:44 ` Chris Wilson
2016-01-11 8:48 ` Daniel Vetter
2016-01-08 13:29 ` Tvrtko Ursulin
2016-01-11 8:43 ` Daniel Vetter
2016-01-11 9:51 ` Tvrtko Ursulin
2016-01-12 16:19 ` Daniel Vetter
2016-01-12 16:43 ` Maarten Lankhorst
2016-01-13 14:35 ` Tvrtko Ursulin
2016-01-08 11:29 ` [PATCH 08/13] drm/i915: GEM operations need to be done under the big lock Tvrtko Ursulin
2016-01-08 11:40 ` Chris Wilson
2016-01-08 11:45 ` Chris Wilson
2016-01-08 11:47 ` Tvrtko Ursulin
2016-01-08 12:09 ` Chris Wilson
2016-01-08 12:40 ` Tvrtko Ursulin [this message]
2016-01-08 13:04 ` [PATCH v3 " Tvrtko Ursulin
2016-01-08 11:29 ` [PATCH 09/13] drm/i915: Remove two impossible asserts Tvrtko Ursulin
2016-01-11 8:49 ` Daniel Vetter
2016-01-08 11:29 ` [PATCH 10/13] drm/i915: Introduce dedicated safe object VMA iterator Tvrtko Ursulin
2016-01-08 11:29 ` [PATCH 11/13] drm/i915: Cache ringbuffer GTT address Tvrtko Ursulin
2016-01-08 11:37 ` Chris Wilson
2016-01-11 8:49 ` Daniel Vetter
2016-01-12 11:42 ` [PATCH v3 3/7] drm/i915: Cache ringbuffer GTT VMA Tvrtko Ursulin
2016-01-12 11:54 ` Chris Wilson
2016-01-11 16:16 ` [PATCH 11/13] drm/i915: Cache ringbuffer GTT address Dave Gordon
2016-01-11 17:44 ` Tvrtko Ursulin
2016-01-08 11:29 ` [PATCH 12/13] drm/i915: Add BKL asserts to get page helpers Tvrtko Ursulin
2016-01-08 11:37 ` Chris Wilson
2016-01-08 11:29 ` [PATCH 13/13] drm/i915: Cache LRC state page in the context Tvrtko Ursulin
2016-01-08 11:38 ` [PATCH v2 00/13] Misc cleanups and locking fixes Chris Wilson
2016-01-11 9:44 ` ✗ failure: Fi.CI.BAT Patchwork
[not found] <201601082045.Y5jJGnlE%fengguang.wu@intel.com>
2016-01-08 12:10 ` [PATCH 08/13] drm/i915: GEM operations need to be done under the big lock Julia Lawall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452256809-26049-1-git-send-email-tvrtko.ursulin@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=Intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).