diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-16 16:55:57 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-21 12:33:06 -0400 |
commit | b073aeaa28b43b00b5c90096c76e872dca4d4ee4 (patch) | |
tree | 36e10699ee4b2977124641a20cdd1985c937e8c0 | |
parent | 379ef82d460fae81d167c0fba45b0f3513fc6cb7 (diff) |
drm/i915: Fix PIPE_CRC_CTL for vlv
The PIPE_B #define was missing the display mmio offset. Use the
_PIPE_INC macro instead, it's simpler.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 08061fc83e5c..d0e61f0c34ce 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -1887,14 +1887,13 @@ | |||
1887 | #define _PIPE_CRC_RES_RES2_A_G4X (dev_priv->info->display_mmio_offset + 0x60080) | 1887 | #define _PIPE_CRC_RES_RES2_A_G4X (dev_priv->info->display_mmio_offset + 0x60080) |
1888 | 1888 | ||
1889 | /* Pipe B CRC regs */ | 1889 | /* Pipe B CRC regs */ |
1890 | #define _PIPE_CRC_CTL_B 0x61050 | ||
1891 | #define _PIPE_CRC_RES_1_B_IVB 0x61064 | 1890 | #define _PIPE_CRC_RES_1_B_IVB 0x61064 |
1892 | #define _PIPE_CRC_RES_2_B_IVB 0x61068 | 1891 | #define _PIPE_CRC_RES_2_B_IVB 0x61068 |
1893 | #define _PIPE_CRC_RES_3_B_IVB 0x6106c | 1892 | #define _PIPE_CRC_RES_3_B_IVB 0x6106c |
1894 | #define _PIPE_CRC_RES_4_B_IVB 0x61070 | 1893 | #define _PIPE_CRC_RES_4_B_IVB 0x61070 |
1895 | #define _PIPE_CRC_RES_5_B_IVB 0x61074 | 1894 | #define _PIPE_CRC_RES_5_B_IVB 0x61074 |
1896 | 1895 | ||
1897 | #define PIPE_CRC_CTL(pipe) _PIPE(pipe, _PIPE_CRC_CTL_A, _PIPE_CRC_CTL_B) | 1896 | #define PIPE_CRC_CTL(pipe) _PIPE_INC(pipe, _PIPE_CRC_CTL_A, 0x01000) |
1898 | #define PIPE_CRC_RES_1_IVB(pipe) \ | 1897 | #define PIPE_CRC_RES_1_IVB(pipe) \ |
1899 | _PIPE(pipe, _PIPE_CRC_RES_1_A_IVB, _PIPE_CRC_RES_1_B_IVB) | 1898 | _PIPE(pipe, _PIPE_CRC_RES_1_A_IVB, _PIPE_CRC_RES_1_B_IVB) |
1900 | #define PIPE_CRC_RES_2_IVB(pipe) \ | 1899 | #define PIPE_CRC_RES_2_IVB(pipe) \ |