diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 222459ad178d..14e516fdc2dd 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
| @@ -89,17 +89,22 @@ static u32 intel_lvds_get_max_backlight(struct drm_device *dev) | |||
| 89 | static void intel_lvds_set_power(struct drm_device *dev, bool on) | 89 | static void intel_lvds_set_power(struct drm_device *dev, bool on) |
| 90 | { | 90 | { |
| 91 | struct drm_i915_private *dev_priv = dev->dev_private; | 91 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 92 | u32 pp_status, ctl_reg, status_reg; | 92 | u32 pp_status, ctl_reg, status_reg, lvds_reg; |
| 93 | 93 | ||
| 94 | if (HAS_PCH_SPLIT(dev)) { | 94 | if (HAS_PCH_SPLIT(dev)) { |
| 95 | ctl_reg = PCH_PP_CONTROL; | 95 | ctl_reg = PCH_PP_CONTROL; |
| 96 | status_reg = PCH_PP_STATUS; | 96 | status_reg = PCH_PP_STATUS; |
| 97 | lvds_reg = PCH_LVDS; | ||
| 97 | } else { | 98 | } else { |
| 98 | ctl_reg = PP_CONTROL; | 99 | ctl_reg = PP_CONTROL; |
| 99 | status_reg = PP_STATUS; | 100 | status_reg = PP_STATUS; |
| 101 | lvds_reg = LVDS; | ||
| 100 | } | 102 | } |
| 101 | 103 | ||
| 102 | if (on) { | 104 | if (on) { |
| 105 | I915_WRITE(lvds_reg, I915_READ(lvds_reg) | LVDS_PORT_EN); | ||
| 106 | POSTING_READ(lvds_reg); | ||
| 107 | |||
| 103 | I915_WRITE(ctl_reg, I915_READ(ctl_reg) | | 108 | I915_WRITE(ctl_reg, I915_READ(ctl_reg) | |
| 104 | POWER_TARGET_ON); | 109 | POWER_TARGET_ON); |
| 105 | do { | 110 | do { |
| @@ -115,6 +120,9 @@ static void intel_lvds_set_power(struct drm_device *dev, bool on) | |||
| 115 | do { | 120 | do { |
| 116 | pp_status = I915_READ(status_reg); | 121 | pp_status = I915_READ(status_reg); |
| 117 | } while (pp_status & PP_ON); | 122 | } while (pp_status & PP_ON); |
| 123 | |||
| 124 | I915_WRITE(lvds_reg, I915_READ(lvds_reg) & ~LVDS_PORT_EN); | ||
| 125 | POSTING_READ(lvds_reg); | ||
| 118 | } | 126 | } |
| 119 | } | 127 | } |
| 120 | 128 | ||
