diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-17 22:34:37 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-18 00:48:36 +0200 |
| commit | 8a270ebf341105b85aaf4f5e4336bb53b3c10177 (patch) | |
| tree | a793a06e56f35922f1b3540c3c82d68d0408f35b /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | c9224faa59c3071ecfa2d4b24592f4eb61e57069 (diff) | |
| download | op-kernel-dev-8a270ebf341105b85aaf4f5e4336bb53b3c10177.zip op-kernel-dev-8a270ebf341105b85aaf4f5e4336bb53b3c10177.tar.gz | |
drm/i915: Grab dev->struct_mutex in i915_gem_pageflip_info
We could walk of a bad list otherwise when someone concurrently
unbinds stuff for fun.
I've suspected this as the root-cause behind seemingly inconsistent
state, but alas it's not.
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 8057fd4..76c2572 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -513,6 +513,11 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) struct drm_device *dev = node->minor->dev; unsigned long flags; struct intel_crtc *crtc; + int ret; + + ret = mutex_lock_interruptible(&dev->struct_mutex); + if (ret) + return ret; for_each_intel_crtc(dev, crtc) { const char pipe = pipe_name(crtc->pipe); @@ -554,6 +559,8 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) spin_unlock_irqrestore(&dev->event_lock, flags); } + mutex_unlock(&dev->struct_mutex); + return 0; } |
