summaryrefslogtreecommitdiff
path: root/src/sna/sna_reg.h
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-11-30 16:28:02 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-11-02 13:50:15 +0000
commitd507b6b9825cc18f41911727ef2ba9b9593cfe21 (patch)
treee35776aa07dc8d885ae10368d555ee1985ca53a7 /src/sna/sna_reg.h
parent9681b1422e4531a19e0117e1b1a97668f6b6a571 (diff)
Prepare for changes in the BLT unit on future generations
Adapt the legacy BLT commands in preparation for future changes. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_reg.h')
-rw-r--r--src/sna/sna_reg.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/sna/sna_reg.h b/src/sna/sna_reg.h
index 26282361..bda6ef67 100644
--- a/src/sna/sna_reg.h
+++ b/src/sna/sna_reg.h
@@ -42,22 +42,22 @@
#define BLT_SRC_TILED (1<<15)
#define BLT_DST_TILED (1<<11)
-#define COLOR_BLT_CMD ((2<<29)|(0x40<<22)|(0x3))
-#define XY_COLOR_BLT ((2<<29)|(0x50<<22)|(0x4))
-#define XY_SETUP_BLT ((2<<29)|(1<<22)|6)
-#define XY_SETUP_MONO_PATTERN_SL_BLT ((2<<29)|(0x11<<22)|7)
-#define XY_SETUP_CLIP ((2<<29)|(3<<22)|1)
-#define XY_SCANLINE_BLT ((2<<29)|(0x25<<22)|1)
-#define XY_TEXT_IMMEDIATE_BLT ((2<<29)|(0x31<<22)|(1<<16))
-#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)|6)
-#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|0x4)
-#define XY_PAT_BLT ((2<<29)|(0x51<<22)|0x4)
-#define XY_PAT_BLT_IMMEDIATE ((2<<29)|(0x72<<22))
-#define XY_MONO_PAT ((0x2<<29)|(0x52<<22)|0x7)
-#define XY_MONO_SRC_COPY ((0x2<<29)|(0x54<<22)|(0x6))
-#define XY_MONO_SRC_COPY_IMM ((0x2<<29)|(0x71<<22))
-#define XY_FULL_MONO_PATTERN_BLT ((0x2<<29)|(0x57<<22)|0xa)
-#define XY_FULL_MONO_PATTERN_MONO_SRC_BLT ((0x2<<29)|(0x58<<22)|0xa)
+#define COLOR_BLT_CMD (2<<29|0x40<<22|(0x3))
+#define XY_COLOR_BLT (2<<29|0x50<<22|(0x4))
+#define XY_SETUP_BLT (2<<29|0x01<<22)
+#define XY_SETUP_MONO_PATTERN_SL_BLT (2<<29|0x11<<22)
+#define XY_SETUP_CLIP (2<<29|0x03<<22|1)
+#define XY_SCANLINE_BLT (2<<29|0x25<<22|1)
+#define XY_TEXT_IMMEDIATE_BLT (2<<29|0x31<<22|(1<<16))
+#define XY_SRC_COPY_BLT_CMD (2<<29|0x53<<22)
+#define SRC_COPY_BLT_CMD (2<<29|0x43<<22|0x4)
+#define XY_PAT_BLT (2<<29|0x51<<22)
+#define XY_PAT_BLT_IMMEDIATE (2<<29|0x72<<22)
+#define XY_MONO_PAT (2<<29|0x52<<22)
+#define XY_MONO_SRC_COPY (2<<29|0x54<<22)
+#define XY_MONO_SRC_COPY_IMM (2<<29|0x71<<22)
+#define XY_FULL_MONO_PATTERN_BLT (2<<29|0x57<<22)
+#define XY_FULL_MONO_PATTERN_MONO_SRC_BLT (2<<29|0x58<<22)
/* FLUSH commands */
#define BRW_3D(Pipeline,Opcode,Subopcode) \