From: Dan Carpenter <error27@gmail.com>
To: David Airlie <airlied@linux.ie>
Cc: Luca Barbieri <luca@luca-barbieri.com>,
dri-devel@lists.freedesktop.org,
Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [patch v2] i915: take struct_mutex lock in intel_setup_overlay()
Date: Mon, 3 May 2010 09:58:32 +0200 [thread overview]
Message-ID: <20100503075832.GL29093@bicker> (raw)
In-Reply-To: <20100430222757.GJ29093@bicker>
I changed the drm_gem_object_unreference() to
drm_gem_object_unreference_unlocked().
"reg_bo" is a local variable so there are no synchronization issues, but
the problem is that if struct_mutex isn't held, it triggers a BUG_ON()
in drm_gem_object_free().
I also took the "struct_mutex" when calling i915_gem_object_pin().
The i915_gem_object_pin() function calls i915_gem_object_bind_to_gtt()
which unreferences stuff if we are low on gtt space. The truth is that
if we run out of gtt space on this code path, we're sunk already
regardless of the locking. But we should take the lock anyway for
consistency and to make the static checkers happy.
That call tree is:
i915_gem_object_pin()
=> i915_gem_object_bind_to_gtt()
=> i915_gem_evict_something()
=> i915_gem_retire_requests()
=> i915_gem_retire_request()
=> drm_gem_object_unreference()
intel_setup_overlay() is always called with "struct_mutex" unlocked.
There is only one call tree and it is:
i915_load_modeset_init()
=> intel_modeset_init()
=> intel_setup_overlay()
Signed-off-by: Dan Carpenter <error27@gmail.com>
---
V2: The code is the same, but the change log is updated.
No one has complained about hitting the BUG_ON() and I can't tested it
myself, so this patch is probably linux-next material.
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 6d524a1..a103582 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -1347,7 +1347,9 @@ void intel_setup_overlay(struct drm_device *dev)
overlay->reg_bo = to_intel_bo(reg_bo);
if (OVERLAY_NONPHYSICAL(dev)) {
+ mutex_lock(&dev->struct_mutex);
ret = i915_gem_object_pin(reg_bo, PAGE_SIZE);
+ mutex_unlock(&dev->struct_mutex);
if (ret) {
DRM_ERROR("failed to pin overlay register bo\n");
goto out_free_bo;
@@ -1385,7 +1387,7 @@ void intel_setup_overlay(struct drm_device *dev)
return;
out_free_bo:
- drm_gem_object_unreference(reg_bo);
+ drm_gem_object_unreference_unlocked(reg_bo);
out_free:
kfree(overlay);
return;
next prev parent reply other threads:[~2010-05-03 7:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-30 22:27 [patch] i915: take struct_mutex lock in intel_setup_overlay() Dan Carpenter
2010-05-03 7:58 ` Dan Carpenter [this message]
2010-06-19 13:39 ` [patch v2] " Dan Carpenter
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=20100503075832.GL29093@bicker \
--to=error27@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=luca@luca-barbieri.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.