OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c937ab3
)
drm/i915/fbc: make sure we cancel the work function at fbc_disable
author
Paulo Zanoni
<paulo.r.zanoni@intel.com>
Tue, 19 Jan 2016 13:35:47 +0000
(11:35 -0200)
committer
Paulo Zanoni
<paulo.r.zanoni@intel.com>
Fri, 29 Jan 2016 20:15:43 +0000
(18:15 -0200)
Just to be sure nothing will survive a module unload. We need to do
this after the unlock in order to make sure the function won't get
stuck trying to grab the lock we already own while we wait for it to
finish.
Reported-by: Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link:
http://patchwork.freedesktop.org/patch/msgid/1453210558-7875-15-git-send-email-paulo.r.zanoni@intel.com
drivers/gpu/drm/i915/intel_fbc.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_fbc.c
b/drivers/gpu/drm/i915/intel_fbc.c
index
0478343
..
35d2650
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_fbc.c
+++ b/
drivers/gpu/drm/i915/intel_fbc.c
@@
-1098,6
+1098,8
@@
void intel_fbc_disable(struct intel_crtc *crtc)
__intel_fbc_disable(dev_priv);
}
mutex_unlock(&fbc->lock);
+
+ cancel_work_sync(&fbc->work.work);
}
/**
@@
-1117,6
+1119,8
@@
void intel_fbc_global_disable(struct drm_i915_private *dev_priv)
if (fbc->enabled)
__intel_fbc_disable(dev_priv);
mutex_unlock(&fbc->lock);
+
+ cancel_work_sync(&fbc->work.work);
}
/**