diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-12 12:42:35 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-12 13:24:16 +0100 |
| commit | 77d07fd9d73ef28689737c0952dbd5d6a5017743 (patch) | |
| tree | 00aaa3e9a78918101280c3bac5f281ea0a82110d /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | b222f2673354c65e178cbcba610e7883a05f5bf3 (diff) | |
| download | kernel_samsung_smdk4412-77d07fd9d73ef28689737c0952dbd5d6a5017743.zip kernel_samsung_smdk4412-77d07fd9d73ef28689737c0952dbd5d6a5017743.tar.gz kernel_samsung_smdk4412-77d07fd9d73ef28689737c0952dbd5d6a5017743.tar.bz2 | |
drm/i915/lvds: Remove busy wait for powering down the panel
Just assume that it will turn off...
Reported-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 93a711d..f533169 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -83,10 +83,7 @@ static void intel_lvds_set_power(struct drm_device *dev, bool on) if (on) { I915_WRITE(lvds_reg, I915_READ(lvds_reg) | LVDS_PORT_EN); - POSTING_READ(lvds_reg); - - I915_WRITE(ctl_reg, I915_READ(ctl_reg) | - POWER_TARGET_ON); + I915_WRITE(ctl_reg, I915_READ(ctl_reg) | POWER_TARGET_ON); if (wait_for(I915_READ(status_reg) & PP_ON, 1000)) DRM_ERROR("timed out waiting to enable LVDS pipe"); @@ -94,11 +91,7 @@ static void intel_lvds_set_power(struct drm_device *dev, bool on) } else { intel_panel_set_backlight(dev, 0); - I915_WRITE(ctl_reg, I915_READ(ctl_reg) & - ~POWER_TARGET_ON); - if (wait_for((I915_READ(status_reg) & PP_ON) == 0, 1000)) - DRM_ERROR("timed out waiting for LVDS pipe to turn off"); - + I915_WRITE(ctl_reg, I915_READ(ctl_reg) & ~POWER_TARGET_ON); I915_WRITE(lvds_reg, I915_READ(lvds_reg) & ~LVDS_PORT_EN); POSTING_READ(lvds_reg); } |