diff options
| author | Chris Wilson | 2010-09-12 14:07:25 +0200 |
|---|---|---|
| committer | Chris Wilson | 2010-09-12 14:24:31 +0200 |
| commit | c9f9ccc150e119bab6a1003e7762b024623011d8 (patch) | |
| tree | 447ec33235ab24305e6134360117828ee59718f0 /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | drm/i915/lvds: Remove busy wait for powering down the panel (diff) | |
| download | kernel-qcow2-linux-c9f9ccc150e119bab6a1003e7762b024623011d8.tar.gz kernel-qcow2-linux-c9f9ccc150e119bab6a1003e7762b024623011d8.tar.xz kernel-qcow2-linux-c9f9ccc150e119bab6a1003e7762b024623011d8.zip | |
drm/i915/lvds: Remove busy wait for powering up the panel.
We just assume that it will happen in a timely manner. A variant of this
patch was first written and tested by Arjan van de Van.
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 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index f533169e5d8b..9089604011f9 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -84,17 +84,13 @@ 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); 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"); - intel_panel_set_backlight(dev, dev_priv->backlight_level); } else { intel_panel_set_backlight(dev, 0); - 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); } + POSTING_READ(lvds_reg); } static void intel_lvds_dpms(struct drm_encoder *encoder, int mode) |