]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915/chv: Add DPINVGTT registers defines for Cherryview
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 2 May 2014 08:35:51 +0000 (11:35 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 6 May 2014 19:17:31 +0000 (21:17 +0200)
Due to Pipe C DPINVGTT has more bits on CHV.

v2: Fix comment to say VLV/CHV (Rafael)

Reviewed-by: Rafael Barbalho <rafael.barbalho@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_reg.h

index 4250717e8dec3ded163df9f0d7a3dd0004cfdca5..09bb469c5a7a858ddb6b63fbd0a3b650d733cb90 100644 (file)
@@ -3497,7 +3497,11 @@ enum punit_power_well {
 #define   SPRITEE_FLIPDONE_INT_EN              (1<<9)
 #define   PLANEC_FLIPDONE_INT_EN               (1<<8)
 
-#define DPINVGTT                               (VLV_DISPLAY_BASE + 0x7002c) /* VLV only */
+#define DPINVGTT                               (VLV_DISPLAY_BASE + 0x7002c) /* VLV/CHV only */
+#define   SPRITEF_INVALID_GTT_INT_EN           (1<<27)
+#define   SPRITEE_INVALID_GTT_INT_EN           (1<<26)
+#define   PLANEC_INVALID_GTT_INT_EN            (1<<25)
+#define   CURSORC_INVALID_GTT_INT_EN           (1<<24)
 #define   CURSORB_INVALID_GTT_INT_EN           (1<<23)
 #define   CURSORA_INVALID_GTT_INT_EN           (1<<22)
 #define   SPRITED_INVALID_GTT_INT_EN           (1<<21)
@@ -3507,6 +3511,11 @@ enum punit_power_well {
 #define   SPRITEA_INVALID_GTT_INT_EN           (1<<17)
 #define   PLANEA_INVALID_GTT_INT_EN            (1<<16)
 #define   DPINVGTT_EN_MASK                     0xff0000
+#define   DPINVGTT_EN_MASK_CHV                 0xfff0000
+#define   SPRITEF_INVALID_GTT_STATUS           (1<<11)
+#define   SPRITEE_INVALID_GTT_STATUS           (1<<10)
+#define   PLANEC_INVALID_GTT_STATUS            (1<<9)
+#define   CURSORC_INVALID_GTT_STATUS           (1<<8)
 #define   CURSORB_INVALID_GTT_STATUS           (1<<7)
 #define   CURSORA_INVALID_GTT_STATUS           (1<<6)
 #define   SPRITED_INVALID_GTT_STATUS           (1<<5)
@@ -3516,6 +3525,7 @@ enum punit_power_well {
 #define   SPRITEA_INVALID_GTT_STATUS           (1<<1)
 #define   PLANEA_INVALID_GTT_STATUS            (1<<0)
 #define   DPINVGTT_STATUS_MASK                 0xff
+#define   DPINVGTT_STATUS_MASK_CHV             0xfff
 
 #define DSPARB                 0x70030
 #define   DSPARB_CSTART_MASK   (0x7f << 7)