diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-05-22 04:36:40 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-05-23 06:51:30 -0400 |
| commit | df0a67979543e716d411eb11406848dcb50abd0a (patch) | |
| tree | e226f372e98c5673721153afafc50dcd6423d0d9 /drivers/gpu/drm/i915/intel_panel.c | |
| parent | a36689cb771f06819c3fa8139c3d3716dfdf6d53 (diff) | |
drm/i915: Fix WARN_ON() on UP machines
WARN_ON(!spin_is_locked()) is not a good idea on a UP system w/o
spinlock debugging. Use WARN_ON_SMP() instead.
This check has been added in
commit 8ba2d18520ce380cf572e9902d9b3b91ece6c2c0
Author: Jani Nikula <jani.nikula@intel.com>
Date: Fri Apr 12 15:18:37 2013 +0300
drm/i915: protect backlight registers and data with a spinlock
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 56f17b2382fc..80bea1d3209f 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c | |||
| @@ -332,7 +332,7 @@ static u32 i915_read_blc_pwm_ctl(struct drm_device *dev) | |||
| 332 | struct drm_i915_private *dev_priv = dev->dev_private; | 332 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 333 | u32 val; | 333 | u32 val; |
| 334 | 334 | ||
| 335 | WARN_ON(!spin_is_locked(&dev_priv->backlight.lock)); | 335 | WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight.lock)); |
| 336 | 336 | ||
| 337 | /* Restore the CTL value if it lost, e.g. GPU reset */ | 337 | /* Restore the CTL value if it lost, e.g. GPU reset */ |
| 338 | 338 | ||