Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Daniel Vetter 11 years ago
parent
379ef82d46
commit
b073aeaa28
1 changed files with 1 additions and 2 deletions
Split View Show Diff Stats
  1. 1 2
      drivers/gpu/drm/i915/i915_reg.h

+ 1 - 2
drivers/gpu/drm/i915/i915_reg.h
View File 

@@ -1887,14 +1887,13 @@
 
 #define _PIPE_CRC_RES_RES2_A_G4X	(dev_priv->info->display_mmio_offset + 0x60080)
 
 
 /* Pipe B CRC regs */
 
-#define _PIPE_CRC_CTL_B			0x61050
 
 #define _PIPE_CRC_RES_1_B_IVB		0x61064
 
 #define _PIPE_CRC_RES_2_B_IVB		0x61068
 
 #define _PIPE_CRC_RES_3_B_IVB		0x6106c
 
 #define _PIPE_CRC_RES_4_B_IVB		0x61070
 
 #define _PIPE_CRC_RES_5_B_IVB		0x61074
 
 
-#define PIPE_CRC_CTL(pipe)	_PIPE(pipe, _PIPE_CRC_CTL_A, _PIPE_CRC_CTL_B)
 
+#define PIPE_CRC_CTL(pipe)	_PIPE_INC(pipe, _PIPE_CRC_CTL_A, 0x01000)
 
 #define PIPE_CRC_RES_1_IVB(pipe)	\
 
 	_PIPE(pipe, _PIPE_CRC_RES_1_A_IVB, _PIPE_CRC_RES_1_B_IVB)
 
 #define PIPE_CRC_RES_2_IVB(pipe)	\