* [PATCH] drm/i915: don't grab dev->struct_mutex for userspace forcewak
@ 2012-08-09 20:33 Daniel Vetter
2012-08-10 22:22 ` Chris Wilson
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2012-08-09 20:33 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Ben Widawsky
Since forcewake is now protected by a spinlock, we don't need to grab
dev->struct_mutex any more. This way we can also get rid of a stale
comment, noticed by Ben Widawsky while reviewing some locking changes.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_debugfs.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index ed4bc98..5f3bb5e 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1961,11 +1961,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)
if (INTEL_INFO(dev)->gen < 6)
return 0;
- ret = mutex_lock_interruptible(&dev->struct_mutex);
- if (ret)
- return ret;
gen6_gt_force_wake_get(dev_priv);
- mutex_unlock(&dev->struct_mutex);
return 0;
}
@@ -1974,24 +1970,11 @@ static int i915_forcewake_release(struct inode *inode, struct file *file)
{
struct drm_device *dev = inode->i_private;
struct drm_i915_private *dev_priv = dev->dev_private;
- int ret;
if (INTEL_INFO(dev)->gen < 6)
return 0;
- /*
- * It's bad that we can potentially hang userspace if struct_mutex gets
- * forever stuck. However, if we cannot acquire this lock it means that
- * almost certainly the driver has hung, is not unload-able. Therefore
- * hanging here is probably a minor inconvenience not to be seen my
- * almost every user.
- */
- ret = mutex_lock_interruptible(&dev->struct_mutex);
- if (ret)
- return ret;
-
gen6_gt_force_wake_put(dev_priv);
- mutex_unlock(&dev->struct_mutex);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: don't grab dev->struct_mutex for userspace forcewak
2012-08-09 20:33 [PATCH] drm/i915: don't grab dev->struct_mutex for userspace forcewak Daniel Vetter
@ 2012-08-10 22:22 ` Chris Wilson
2012-08-11 20:23 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Chris Wilson @ 2012-08-10 22:22 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Ben Widawsky
On Thu, 9 Aug 2012 22:33:58 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Since forcewake is now protected by a spinlock, we don't need to grab
> dev->struct_mutex any more. This way we can also get rid of a stale
> comment, noticed by Ben Widawsky while reviewing some locking changes.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
(Although I still wish it were not so)
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: don't grab dev->struct_mutex for userspace forcewak
2012-08-10 22:22 ` Chris Wilson
@ 2012-08-11 20:23 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2012-08-11 20:23 UTC (permalink / raw)
To: Chris Wilson; +Cc: Daniel Vetter, Intel Graphics Development, Ben Widawsky
On Fri, Aug 10, 2012 at 11:22:15PM +0100, Chris Wilson wrote:
> On Thu, 9 Aug 2012 22:33:58 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> > Since forcewake is now protected by a spinlock, we don't need to grab
> > dev->struct_mutex any more. This way we can also get rid of a stale
> > comment, noticed by Ben Widawsky while reviewing some locking changes.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> (Although I still wish it were not so)
Queued for -next, thanks for the review.
-Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-11 20:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-09 20:33 [PATCH] drm/i915: don't grab dev->struct_mutex for userspace forcewak Daniel Vetter
2012-08-10 22:22 ` Chris Wilson
2012-08-11 20:23 ` Daniel Vetter
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).