diff options
author | Jani Nikula <jani.nikula@intel.com> | 2013-11-08 09:48:54 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-12 18:07:43 -0500 |
commit | 58c68779e48fa6d60b97fadc3dcac61a6c318c4c (patch) | |
tree | f75bc7730e8bf3b3490e5efe01c890bf638b33d0 /drivers/gpu/drm/i915/i915_suspend.c | |
parent | db31af1d4e815e141295b0bdf8da3e77885001d5 (diff) |
drm/i915: make backlight info per-connector
Move from dev_priv to connector->panel. We still don't allow multiple
sysfs interfaces, though.
There should be no functional changes, except for a slight reordering of
connector backlight and sysfs destroy calls. (This change happens now
that the backlight device is actually per-connector, even though the
destroy calls became per-connector earlier.)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 98790c7cccb1..eadf8e19d2c4 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c | |||
@@ -203,7 +203,7 @@ static void i915_save_display(struct drm_device *dev) | |||
203 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) | 203 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) |
204 | i915_save_display_reg(dev); | 204 | i915_save_display_reg(dev); |
205 | 205 | ||
206 | spin_lock_irqsave(&dev_priv->backlight.lock, flags); | 206 | spin_lock_irqsave(&dev_priv->backlight_lock, flags); |
207 | 207 | ||
208 | /* LVDS state */ | 208 | /* LVDS state */ |
209 | if (HAS_PCH_SPLIT(dev)) { | 209 | if (HAS_PCH_SPLIT(dev)) { |
@@ -241,7 +241,7 @@ static void i915_save_display(struct drm_device *dev) | |||
241 | dev_priv->regfile.saveLVDS = I915_READ(LVDS); | 241 | dev_priv->regfile.saveLVDS = I915_READ(LVDS); |
242 | } | 242 | } |
243 | 243 | ||
244 | spin_unlock_irqrestore(&dev_priv->backlight.lock, flags); | 244 | spin_unlock_irqrestore(&dev_priv->backlight_lock, flags); |
245 | 245 | ||
246 | if (!IS_I830(dev) && !IS_845G(dev) && !HAS_PCH_SPLIT(dev)) | 246 | if (!IS_I830(dev) && !IS_845G(dev) && !HAS_PCH_SPLIT(dev)) |
247 | dev_priv->regfile.savePFIT_CONTROL = I915_READ(PFIT_CONTROL); | 247 | dev_priv->regfile.savePFIT_CONTROL = I915_READ(PFIT_CONTROL); |
@@ -287,7 +287,7 @@ static void i915_restore_display(struct drm_device *dev) | |||
287 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) | 287 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) |
288 | i915_restore_display_reg(dev); | 288 | i915_restore_display_reg(dev); |
289 | 289 | ||
290 | spin_lock_irqsave(&dev_priv->backlight.lock, flags); | 290 | spin_lock_irqsave(&dev_priv->backlight_lock, flags); |
291 | 291 | ||
292 | /* LVDS state */ | 292 | /* LVDS state */ |
293 | if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev)) | 293 | if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev)) |
@@ -341,7 +341,7 @@ static void i915_restore_display(struct drm_device *dev) | |||
341 | I915_WRITE(PP_CONTROL, dev_priv->regfile.savePP_CONTROL); | 341 | I915_WRITE(PP_CONTROL, dev_priv->regfile.savePP_CONTROL); |
342 | } | 342 | } |
343 | 343 | ||
344 | spin_unlock_irqrestore(&dev_priv->backlight.lock, flags); | 344 | spin_unlock_irqrestore(&dev_priv->backlight_lock, flags); |
345 | 345 | ||
346 | /* only restore FBC info on the platform that supports FBC*/ | 346 | /* only restore FBC info on the platform that supports FBC*/ |
347 | intel_disable_fbc(dev); | 347 | intel_disable_fbc(dev); |