]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
drm/i915/chv: Add DDL register defines for Cherryview
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 9 Apr 2014 10:28:13 +0000 (13:28 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 12 May 2014 17:50:11 +0000 (19:50 +0200)
Fill in the sprite bits for DDL1/DDL2 registers, and add DDL3.

Still need to write the code to use these...

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

index 03ffc57a01148f4581e4aac568c523152a467093..eb8ebe8014979e4b460c1c9216812b00345f8fd2 100644 (file)
@@ -3585,14 +3585,43 @@ enum punit_power_well {
 #define DDL_CURSORA_PRECISION_32       (1<<31)
 #define DDL_CURSORA_PRECISION_16       (0<<31)
 #define DDL_CURSORA_SHIFT              24
+#define DDL_SPRITEB_PRECISION_32       (1<<23)
+#define DDL_SPRITEB_PRECISION_16       (0<<23)
+#define DDL_SPRITEB_SHIFT              16
+#define DDL_SPRITEA_PRECISION_32       (1<<15)
+#define DDL_SPRITEA_PRECISION_16       (0<<15)
+#define DDL_SPRITEA_SHIFT              8
 #define DDL_PLANEA_PRECISION_32                (1<<7)
 #define DDL_PLANEA_PRECISION_16                (0<<7)
+#define DDL_PLANEA_SHIFT               0
+
 #define VLV_DDL2                       (VLV_DISPLAY_BASE + 0x70054)
 #define DDL_CURSORB_PRECISION_32       (1<<31)
 #define DDL_CURSORB_PRECISION_16       (0<<31)
 #define DDL_CURSORB_SHIFT              24
+#define DDL_SPRITED_PRECISION_32       (1<<23)
+#define DDL_SPRITED_PRECISION_16       (0<<23)
+#define DDL_SPRITED_SHIFT              16
+#define DDL_SPRITEC_PRECISION_32       (1<<15)
+#define DDL_SPRITEC_PRECISION_16       (0<<15)
+#define DDL_SPRITEC_SHIFT              8
 #define DDL_PLANEB_PRECISION_32                (1<<7)
 #define DDL_PLANEB_PRECISION_16                (0<<7)
+#define DDL_PLANEB_SHIFT               0
+
+#define VLV_DDL3                       (VLV_DISPLAY_BASE + 0x70058)
+#define DDL_CURSORC_PRECISION_32       (1<<31)
+#define DDL_CURSORC_PRECISION_16       (0<<31)
+#define DDL_CURSORC_SHIFT              24
+#define DDL_SPRITEF_PRECISION_32       (1<<23)
+#define DDL_SPRITEF_PRECISION_16       (0<<23)
+#define DDL_SPRITEF_SHIFT              16
+#define DDL_SPRITEE_PRECISION_32       (1<<15)
+#define DDL_SPRITEE_PRECISION_16       (0<<15)
+#define DDL_SPRITEE_SHIFT              8
+#define DDL_PLANEC_PRECISION_32                (1<<7)
+#define DDL_PLANEC_PRECISION_16                (0<<7)
+#define DDL_PLANEC_SHIFT               0
 
 /* FIFO watermark sizes etc */
 #define G4X_FIFO_LINE_SIZE     64