diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-06-29 08:25:49 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-13 04:41:33 -0400 |
commit | 60bfe44f83c0a9d7293e821c4ddae3770d60acf9 (patch) | |
tree | 4ec7146d1ad20b3b5aa1f614e5873b0da486f53c /drivers/gpu/drm/i915/intel_runtime_pm.c | |
parent | b8afb9113c519a8bd742f7df8c424b0af69a75cd (diff) |
drm/i915: Apply OCD to VLV/CHV DPLL defines
Drop the spurious 'A' from the VLV/CHV ref clock enable define,
and add the "REF" to the VLV ref clock selection bit. Also
s/CLOCK/CLK/ for extra consistency.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_runtime_pm.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_runtime_pm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index f0e6f49ee33a..932d96332eca 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c | |||
@@ -883,7 +883,7 @@ static void vlv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv, | |||
883 | * hotplug / manual detection. | 883 | * hotplug / manual detection. |
884 | */ | 884 | */ |
885 | I915_WRITE(DPLL(PIPE_B), I915_READ(DPLL(PIPE_B)) | DPLL_VGA_MODE_DIS | | 885 | I915_WRITE(DPLL(PIPE_B), I915_READ(DPLL(PIPE_B)) | DPLL_VGA_MODE_DIS | |
886 | DPLL_REFA_CLK_ENABLE_VLV | DPLL_INTEGRATED_CRI_CLK_VLV); | 886 | DPLL_REF_CLK_ENABLE_VLV | DPLL_INTEGRATED_CRI_CLK_VLV); |
887 | udelay(1); /* >10ns for cmnreset, >0ns for sidereset */ | 887 | udelay(1); /* >10ns for cmnreset, >0ns for sidereset */ |
888 | 888 | ||
889 | vlv_set_power_well(dev_priv, power_well, true); | 889 | vlv_set_power_well(dev_priv, power_well, true); |
@@ -934,13 +934,13 @@ static void chv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv, | |||
934 | if (power_well->data == PUNIT_POWER_WELL_DPIO_CMN_BC) { | 934 | if (power_well->data == PUNIT_POWER_WELL_DPIO_CMN_BC) { |
935 | phy = DPIO_PHY0; | 935 | phy = DPIO_PHY0; |
936 | I915_WRITE(DPLL(PIPE_B), I915_READ(DPLL(PIPE_B)) | DPLL_VGA_MODE_DIS | | 936 | I915_WRITE(DPLL(PIPE_B), I915_READ(DPLL(PIPE_B)) | DPLL_VGA_MODE_DIS | |
937 | DPLL_REFA_CLK_ENABLE_VLV); | 937 | DPLL_REF_CLK_ENABLE_VLV); |
938 | I915_WRITE(DPLL(PIPE_B), I915_READ(DPLL(PIPE_B)) | DPLL_VGA_MODE_DIS | | 938 | I915_WRITE(DPLL(PIPE_B), I915_READ(DPLL(PIPE_B)) | DPLL_VGA_MODE_DIS | |
939 | DPLL_REFA_CLK_ENABLE_VLV | DPLL_INTEGRATED_CRI_CLK_VLV); | 939 | DPLL_REF_CLK_ENABLE_VLV | DPLL_INTEGRATED_CRI_CLK_VLV); |
940 | } else { | 940 | } else { |
941 | phy = DPIO_PHY1; | 941 | phy = DPIO_PHY1; |
942 | I915_WRITE(DPLL(PIPE_C), I915_READ(DPLL(PIPE_C)) | DPLL_VGA_MODE_DIS | | 942 | I915_WRITE(DPLL(PIPE_C), I915_READ(DPLL(PIPE_C)) | DPLL_VGA_MODE_DIS | |
943 | DPLL_REFA_CLK_ENABLE_VLV | DPLL_INTEGRATED_CRI_CLK_VLV); | 943 | DPLL_REF_CLK_ENABLE_VLV | DPLL_INTEGRATED_CRI_CLK_VLV); |
944 | } | 944 | } |
945 | udelay(1); /* >10ns for cmnreset, >0ns for sidereset */ | 945 | udelay(1); /* >10ns for cmnreset, >0ns for sidereset */ |
946 | vlv_set_power_well(dev_priv, power_well, true); | 946 | vlv_set_power_well(dev_priv, power_well, true); |