diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-03-06 13:12:31 -0800 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-03-13 14:52:59 +0000 |
| commit | c1d7abadbb0009e9f2b9d8d3744d4ae5c13a1c8f (patch) | |
| tree | b289416d984ac8482c17066b1382c803260bed3f | |
| parent | 44fe21018330e0ce750ce25be36cc780ccdb78eb (diff) | |
uxa: Remove implicit length from BLT command #defines.
These command packets grew on Gen8.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | src/uxa/i830_reg.h | 12 | ||||
| -rw-r--r-- | src/uxa/intel_uxa.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/uxa/i830_reg.h b/src/uxa/i830_reg.h index 93d03cf3..d8306bcd 100644 --- a/src/uxa/i830_reg.h +++ b/src/uxa/i830_reg.h @@ -70,32 +70,32 @@ #define COLOR_BLT_WRITE_ALPHA (1<<21) #define COLOR_BLT_WRITE_RGB (1<<20) -#define XY_COLOR_BLT_CMD ((2<<29)|(0x50<<22)|(0x4)) +#define XY_COLOR_BLT_CMD ((2<<29)|(0x50<<22)) #define XY_COLOR_BLT_WRITE_ALPHA (1<<21) #define XY_COLOR_BLT_WRITE_RGB (1<<20) #define XY_COLOR_BLT_TILED (1<<11) -#define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)|1) +#define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)) -#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)|6) +#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)) #define XY_SRC_COPY_BLT_WRITE_ALPHA (1<<21) #define XY_SRC_COPY_BLT_WRITE_RGB (1<<20) #define XY_SRC_COPY_BLT_SRC_TILED (1<<15) #define XY_SRC_COPY_BLT_DST_TILED (1<<11) -#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|0x4) +#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)) #define SRC_COPY_BLT_WRITE_ALPHA (1<<21) #define SRC_COPY_BLT_WRITE_RGB (1<<20) #define XY_PAT_BLT_IMMEDIATE ((2<<29)|(0x72<<22)) -#define XY_MONO_PAT_BLT_CMD ((0x2<<29)|(0x52<<22)|0x7) +#define XY_MONO_PAT_BLT_CMD ((0x2<<29)|(0x52<<22)) #define XY_MONO_PAT_VERT_SEED ((1<<10)|(1<<9)|(1<<8)) #define XY_MONO_PAT_HORT_SEED ((1<<14)|(1<<13)|(1<<12)) #define XY_MONO_PAT_BLT_WRITE_ALPHA (1<<21) #define XY_MONO_PAT_BLT_WRITE_RGB (1<<20) -#define XY_MONO_SRC_BLT_CMD ((0x2<<29)|(0x54<<22)|(0x6)) +#define XY_MONO_SRC_BLT_CMD ((0x2<<29)|(0x54<<22)) #define XY_MONO_SRC_BLT_WRITE_ALPHA (1<<21) #define XY_MONO_SRC_BLT_WRITE_RGB (1<<20) diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c index d4ba7fcc..53148551 100644 --- a/src/uxa/intel_uxa.c +++ b/src/uxa/intel_uxa.c @@ -326,7 +326,7 @@ static void intel_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2) { BEGIN_BATCH_BLT(6); - cmd = XY_COLOR_BLT_CMD; + cmd = XY_COLOR_BLT_CMD | (6 - 2); if (pixmap->drawable.bitsPerPixel == 32) cmd |= @@ -464,7 +464,7 @@ intel_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1, { BEGIN_BATCH_BLT(8); - cmd = XY_SRC_COPY_BLT_CMD; + cmd = XY_SRC_COPY_BLT_CMD | (8 - 2); if (dest->drawable.bitsPerPixel == 32) cmd |= @@ -512,7 +512,7 @@ static void intel_uxa_done(PixmapPtr pixmap) if (IS_GEN6(intel) || IS_GEN7(intel)) { /* workaround a random BLT hang */ BEGIN_BATCH_BLT(3); - OUT_BATCH(XY_SETUP_CLIP_BLT_CMD); + OUT_BATCH(XY_SETUP_CLIP_BLT_CMD | (3 - 2)); OUT_BATCH(0); OUT_BATCH(0); ADVANCE_BATCH(); |