aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dsi.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-06-29 08:25:49 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-07-13 04:41:33 -0400
commit60bfe44f83c0a9d7293e821c4ddae3770d60acf9 (patch)
tree4ec7146d1ad20b3b5aa1f614e5873b0da486f53c /drivers/gpu/drm/i915/intel_dsi.c
parentb8afb9113c519a8bd742f7df8c424b0af69a75cd (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_dsi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_dsi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 5381ddcc2a79..f4438eb5b458 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -413,12 +413,12 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
413 /* Disable DPOunit clock gating, can stall pipe 413 /* Disable DPOunit clock gating, can stall pipe
414 * and we need DPLL REFA always enabled */ 414 * and we need DPLL REFA always enabled */
415 tmp = I915_READ(DPLL(pipe)); 415 tmp = I915_READ(DPLL(pipe));
416 tmp |= DPLL_REFA_CLK_ENABLE_VLV; 416 tmp |= DPLL_REF_CLK_ENABLE_VLV;
417 I915_WRITE(DPLL(pipe), tmp); 417 I915_WRITE(DPLL(pipe), tmp);
418 418
419 /* update the hw state for DPLL */ 419 /* update the hw state for DPLL */
420 intel_crtc->config->dpll_hw_state.dpll = DPLL_INTEGRATED_CLOCK_VLV | 420 intel_crtc->config->dpll_hw_state.dpll = DPLL_INTEGRATED_REF_CLK_VLV |
421 DPLL_REFA_CLK_ENABLE_VLV | DPLL_VGA_MODE_DIS; 421 DPLL_REF_CLK_ENABLE_VLV | DPLL_VGA_MODE_DIS;
422 422
423 tmp = I915_READ(DSPCLK_GATE_D); 423 tmp = I915_READ(DSPCLK_GATE_D);
424 tmp |= DPOUNIT_CLOCK_GATE_DISABLE; 424 tmp |= DPOUNIT_CLOCK_GATE_DISABLE;