aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2014-10-16 13:52:32 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-10-24 10:34:11 -0400
commit142d2eca356af6744c7e4bb577c3dfaadee486fc (patch)
tree743a2c3a551483bf5908e849631aa921f30bc29d
parent0039a4b357477bd8bcd495e4160974c71657b3e6 (diff)
drm/i915: Fix chv PCS DW11 register defines
I managed to fumble the per spline PCS DW11 register defines in: commit 570e2a747bc06cd8620662c5125ec2dc964c511b Author: Ville Syrjälä <ville.syrjala@linux.intel.com> Date: Mon Aug 18 14:42:46 2014 +0300 drm/i915: Clear TX FIFO reset master override bits on chv Fortunately the bit in DW0 that was cleared due to this didn't have any effect as long as the bit we meant to clear was already zero. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> [danvet: Fix commit ref as pointed out by Jani.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 6db369a91ee9..46cfbc7466ef 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -883,8 +883,8 @@ enum punit_power_well {
883#define _VLV_PCS23_DW11_CH0 0x042c 883#define _VLV_PCS23_DW11_CH0 0x042c
884#define _VLV_PCS01_DW11_CH1 0x262c 884#define _VLV_PCS01_DW11_CH1 0x262c
885#define _VLV_PCS23_DW11_CH1 0x282c 885#define _VLV_PCS23_DW11_CH1 0x282c
886#define VLV_PCS01_DW11(ch) _PORT(ch, _VLV_PCS01_DW0_CH0, _VLV_PCS01_DW0_CH1) 886#define VLV_PCS01_DW11(ch) _PORT(ch, _VLV_PCS01_DW11_CH0, _VLV_PCS01_DW11_CH1)
887#define VLV_PCS23_DW11(ch) _PORT(ch, _VLV_PCS23_DW0_CH0, _VLV_PCS23_DW0_CH1) 887#define VLV_PCS23_DW11(ch) _PORT(ch, _VLV_PCS23_DW11_CH0, _VLV_PCS23_DW11_CH1)
888 888
889#define _VLV_PCS_DW12_CH0 0x8230 889#define _VLV_PCS_DW12_CH0 0x8230
890#define _VLV_PCS_DW12_CH1 0x8430 890#define _VLV_PCS_DW12_CH1 0x8430