summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorVille Syrjälä2015-07-08 22:45:47 +0200
committerDaniel Vetter2015-08-26 10:18:33 +0200
commit25a25dfce4e678bb18c4d63937d240839ecd19cd (patch)
treed4b34a01154d5171d80f74f046daa60ebca14be6 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: fix driver's versions of WARN_ON & WARN_ON_ONCE (diff)
downloadkernel-qcow2-linux-25a25dfce4e678bb18c4d63937d240839ecd19cd.tar.gz
kernel-qcow2-linux-25a25dfce4e678bb18c4d63937d240839ecd19cd.tar.xz
kernel-qcow2-linux-25a25dfce4e678bb18c4d63937d240839ecd19cd.zip
drm/i915: Always program m2 fractional value on CHV
When fractional m2 divider isn't used on CHV the fractional part is ignore by the hardware. Despite that, program the fractional value (0 in this case) to the hardware register just to keep things a bit more consistent. Might at least make register dumps a bit less confusing when there isn't some stale fractional part hanging around. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index cf8dfa53e338..a64da67b4f40 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7374,8 +7374,7 @@ static void chv_prepare_pll(struct intel_crtc *crtc,
1 << DPIO_CHV_N_DIV_SHIFT);
/* M2 fraction division */
- if (bestm2_frac)
- vlv_dpio_write(dev_priv, pipe, CHV_PLL_DW2(port), bestm2_frac);
+ vlv_dpio_write(dev_priv, pipe, CHV_PLL_DW2(port), bestm2_frac);
/* M2 fraction division enable */
dpio_val = vlv_dpio_read(dev_priv, pipe, CHV_PLL_DW3(port));