summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 10:16:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 10:16:11 -0800
commit832fb4a01ca27ded735421de2b090f03e20039fc (patch)
treeeceb6e49b6752218377a361e7050a3f9f622a44e /include
parent4a4565921aa9255be01921ff8ae339fa7b0a5468 (diff)
parent2906f0258770d3a9c4e65364df8acc904e148bbe (diff)
downloadop-kernel-dev-832fb4a01ca27ded735421de2b090f03e20039fc.zip
op-kernel-dev-832fb4a01ca27ded735421de2b090f03e20039fc.tar.gz
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: Fix cursor physical address choice to match the 2D driver. drm: stash AGP include under the do-we-have-AGP ifdef drm: don't whine about not reading EDID data drm/i915: hook up LVDS DPMS property drm/i915: remove unnecessary debug output in KMS init i915: fix freeing path for gem phys objects. drm: create mode_config idr lock drm: fix leak of device mappings since multi-master changes.
Diffstat (limited to 'include')
-rw-r--r--include/drm/drm_crtc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 47809ac..d54de24 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -528,7 +528,8 @@ struct drm_mode_group {
*
*/
struct drm_mode_config {
- struct mutex mutex; /* protects configuration and IDR */
+ struct mutex mutex; /* protects configuration (mode lists etc.) */
+ struct mutex idr_mutex; /* for IDR management */
struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, connector, modes - just makes life easier */
/* this is limited to one for now */
int num_fb;
OpenPOWER on IntegriCloud