diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-10-07 19:01:24 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-08 05:28:28 -0400 |
commit | 298b0b392c750137f148fda056a7d4c42019814c (patch) | |
tree | 2514e05bf6117851af6aa60bc4543984d13a067b /drivers/gpu/drm/i915/intel_dp.c | |
parent | 895692befab73fd399d854c7db41d6d7260af2da (diff) |
drm/i915/dp: make eDP PLL functions work as advertised
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index ada7319f0eaf..128c2fefd541 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -891,8 +891,10 @@ static void ironlake_edp_pll_on(struct drm_encoder *encoder) | |||
891 | 891 | ||
892 | DRM_DEBUG_KMS("\n"); | 892 | DRM_DEBUG_KMS("\n"); |
893 | dpa_ctl = I915_READ(DP_A); | 893 | dpa_ctl = I915_READ(DP_A); |
894 | dpa_ctl &= ~DP_PLL_ENABLE; | 894 | dpa_ctl |= DP_PLL_ENABLE; |
895 | I915_WRITE(DP_A, dpa_ctl); | 895 | I915_WRITE(DP_A, dpa_ctl); |
896 | POSTING_READ(DP_A); | ||
897 | udelay(200); | ||
896 | } | 898 | } |
897 | 899 | ||
898 | static void ironlake_edp_pll_off(struct drm_encoder *encoder) | 900 | static void ironlake_edp_pll_off(struct drm_encoder *encoder) |
@@ -902,7 +904,7 @@ static void ironlake_edp_pll_off(struct drm_encoder *encoder) | |||
902 | u32 dpa_ctl; | 904 | u32 dpa_ctl; |
903 | 905 | ||
904 | dpa_ctl = I915_READ(DP_A); | 906 | dpa_ctl = I915_READ(DP_A); |
905 | dpa_ctl |= DP_PLL_ENABLE; | 907 | dpa_ctl &= ~DP_PLL_ENABLE; |
906 | I915_WRITE(DP_A, dpa_ctl); | 908 | I915_WRITE(DP_A, dpa_ctl); |
907 | POSTING_READ(DP_A); | 909 | POSTING_READ(DP_A); |
908 | udelay(200); | 910 | udelay(200); |