diff options
author | Rob Clark <robdclark@gmail.com> | 2013-11-19 12:10:12 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-06-04 19:54:33 -0400 |
commit | 51fd371bbaf94018a1223b4e2cf20b9880fd92d4 (patch) | |
tree | e86e8ec3ace2fd61111105d39f5eb2d37378e9a8 /drivers/gpu/drm/i915/intel_opregion.c | |
parent | 4f71d0cb76339a10fd445b0b281acc45c71b6271 (diff) |
drm: convert crtc and connection_mutex to ww_mutex (v5)
For atomic, it will be quite necessary to not need to care so much
about locking order. And 'state' gives us a convenient place to stash a
ww_ctx for any sort of update that needs to grab multiple crtc locks.
Because we will want to eventually make locking even more fine grained
(giving locks to planes, connectors, etc), split out drm_modeset_lock
and drm_modeset_acquire_ctx to track acquired locks.
Atomic will use this to keep track of which locks have been acquired
in a transaction.
v1: original
v2: remove a few things not needed until atomic, for now
v3: update for v3 of connection_mutex patch..
v4: squash in docbook
v5: doc tweaks/fixes
Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_opregion.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_opregion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index b812e9d39f38..2e2c71fcc9ed 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c | |||
@@ -410,7 +410,7 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp) | |||
410 | if (bclp > 255) | 410 | if (bclp > 255) |
411 | return ASLC_BACKLIGHT_FAILED; | 411 | return ASLC_BACKLIGHT_FAILED; |
412 | 412 | ||
413 | mutex_lock(&dev->mode_config.connection_mutex); | 413 | drm_modeset_lock(&dev->mode_config.connection_mutex, NULL); |
414 | 414 | ||
415 | /* | 415 | /* |
416 | * Update backlight on all connectors that support backlight (usually | 416 | * Update backlight on all connectors that support backlight (usually |
@@ -421,7 +421,7 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp) | |||
421 | intel_panel_set_backlight(intel_connector, bclp, 255); | 421 | intel_panel_set_backlight(intel_connector, bclp, 255); |
422 | iowrite32(DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID, &asle->cblv); | 422 | iowrite32(DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID, &asle->cblv); |
423 | 423 | ||
424 | mutex_unlock(&dev->mode_config.connection_mutex); | 424 | drm_modeset_unlock(&dev->mode_config.connection_mutex); |
425 | 425 | ||
426 | 426 | ||
427 | return 0; | 427 | return 0; |