gem_exec_blt: Use iterator for blit batch setup

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
This commit is contained in:
Ben Widawsky 2013-10-09 08:55:24 -07:00
parent 637162d0f7
commit a7934e26ae

View File

@ -62,11 +62,12 @@ static int gem_linear_blt(uint32_t *batch,
igt_assert(height <= 1<<16);
if (height) {
b[0] = COPY_BLT_CMD | BLT_WRITE_ALPHA | BLT_WRITE_RGB;
b[1] = 0xcc << 16 | 1 << 25 | 1 << 24 | (16*1024);
b[2] = 0;
b[3] = height << 16 | (4*1024);
b[4] = 0;
int i = 0;
b[i++] = COPY_BLT_CMD | BLT_WRITE_ALPHA | BLT_WRITE_RGB;
b[i++] = 0xcc << 16 | 1 << 25 | 1 << 24 | (16*1024);
b[i++] = 0;
b[i++] = height << 16 | (4*1024);
b[i++] = 0;
reloc->offset = (b-batch+4) * sizeof(uint32_t);
reloc->delta = 0;
reloc->target_handle = dst;
@ -75,9 +76,9 @@ static int gem_linear_blt(uint32_t *batch,
reloc->presumed_offset = 0;
reloc++;
b[5] = 0;
b[6] = 16*1024;
b[7] = 0;
b[i++] = 0;
b[i++] = 16*1024;
b[i++] = 0;
reloc->offset = (b-batch+7) * sizeof(uint32_t);
reloc->delta = 0;
reloc->target_handle = src;
@ -86,16 +87,17 @@ static int gem_linear_blt(uint32_t *batch,
reloc->presumed_offset = 0;
reloc++;
b += 8;
b += i;
length -= height * 16*1024;
}
if (length) {
b[0] = COPY_BLT_CMD | BLT_WRITE_ALPHA | BLT_WRITE_RGB;
b[1] = 0xcc << 16 | 1 << 25 | 1 << 24 | (16*1024);
b[2] = height << 16;
b[3] = (1+height) << 16 | (length / 4);
b[4] = 0;
int i = 0;
b[i++] = COPY_BLT_CMD | BLT_WRITE_ALPHA | BLT_WRITE_RGB;
b[i++] = 0xcc << 16 | 1 << 25 | 1 << 24 | (16*1024);
b[i++] = height << 16;
b[i++] = (1+height) << 16 | (length / 4);
b[i++] = 0;
reloc->offset = (b-batch+4) * sizeof(uint32_t);
reloc->delta = 0;
reloc->target_handle = dst;
@ -104,9 +106,9 @@ static int gem_linear_blt(uint32_t *batch,
reloc->presumed_offset = 0;
reloc++;
b[5] = height << 16;
b[6] = 16*1024;
b[7] = 0;
b[i++] = height << 16;
b[i++] = 16*1024;
b[i++] = 0;
reloc->offset = (b-batch+7) * sizeof(uint32_t);
reloc->delta = 0;
reloc->target_handle = src;
@ -115,7 +117,7 @@ static int gem_linear_blt(uint32_t *batch,
reloc->presumed_offset = 0;
reloc++;
b += 8;
b += i;
}
b[0] = MI_BATCH_BUFFER_END;