| From c54aea2e14d56b49663106bc6bd97fc46e893937 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Wed, 22 May 2013 11:36:40 +0300 |
| Subject: drm/i915: Fix WARN_ON() on UP machines |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| (cherry picked from commit df0a67979543e716d411eb11406848dcb50abd0a) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_panel.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c |
| index 8cae635bb90a..01b5a519c43c 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) |
| struct drm_i915_private *dev_priv = dev->dev_private; |
| u32 val; |
| |
| - WARN_ON(!spin_is_locked(&dev_priv->backlight.lock)); |
| + WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight.lock)); |
| |
| /* Restore the CTL value if it lost, e.g. GPU reset */ |
| |
| -- |
| 1.8.5.rc3 |
| |
