From d507b6b9825cc18f41911727ef2ba9b9593cfe21 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 30 Nov 2012 16:28:02 +0000 Subject: 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 --- src/sna/sna_reg.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/sna/sna_reg.h') 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) \ -- cgit v1.2.3