diff options
| author | Ville Syrjälä | 2015-09-18 19:03:33 +0200 |
|---|---|---|
| committer | Ville Syrjälä | 2015-10-26 15:33:37 +0100 |
| commit | 01403de3c037932883b181f7f6b9962856064f9a (patch) | |
| tree | 854557032ad1ece2ed7f678de0a9a477277cc5ef /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Add NEEDS_FORCEWAKE() checks for vlv/chv (diff) | |
| download | kernel-qcow2-linux-01403de3c037932883b181f7f6b9962856064f9a.tar.gz kernel-qcow2-linux-01403de3c037932883b181f7f6b9962856064f9a.tar.xz kernel-qcow2-linux-01403de3c037932883b181f7f6b9962856064f9a.zip | |
drm/i915: Use paramtrized WRPLL_CTL()
v2: Rebase due to SKL_DPLLx usage
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1442595836-23981-21-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 9d9e0e864b66..db66dae69765 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9277,8 +9277,8 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv) I915_STATE_WARN(I915_READ(HSW_PWR_WELL_DRIVER), "Power well on\n"); I915_STATE_WARN(I915_READ(SPLL_CTL) & SPLL_PLL_ENABLE, "SPLL enabled\n"); - I915_STATE_WARN(I915_READ(WRPLL_CTL1) & WRPLL_PLL_ENABLE, "WRPLL1 enabled\n"); - I915_STATE_WARN(I915_READ(WRPLL_CTL2) & WRPLL_PLL_ENABLE, "WRPLL2 enabled\n"); + I915_STATE_WARN(I915_READ(WRPLL_CTL(0)) & WRPLL_PLL_ENABLE, "WRPLL1 enabled\n"); + I915_STATE_WARN(I915_READ(WRPLL_CTL(1)) & WRPLL_PLL_ENABLE, "WRPLL2 enabled\n"); I915_STATE_WARN(I915_READ(PCH_PP_STATUS) & PP_ON, "Panel power on\n"); I915_STATE_WARN(I915_READ(BLC_PWM_CPU_CTL2) & BLM_PWM_ENABLE, "CPU PWM1 enabled\n"); |