fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ilo: reduce BLT function parameters

Browse source 
Intruduce gen6_blt_bo and gen6_blt_xy_bo to describe BOs.  In the extreme case
of gen6_XY_SRC_COPY_BLT(), the number of parameters goes down from 18 to 8.
This commit is contained in:
Chia-I Wu 2014-09-12 12:20:31 +08:00
parent 8fa62a9982
commit 07e0923203
2 changed files with 170 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

191
src/gallium/drivers/ilo/ilo_blitter_blt.c
View file

@ -121,46 +121,48 @@ ilo_blitter_blt_end(struct ilo_blitter *blitter, uint32_t swctrl)
static bool
buf_clear_region(struct ilo_blitter *blitter,
struct ilo_buffer *dst,
unsigned dst_offset, unsigned dst_size,
uint32_t val,
struct ilo_buffer *buf, unsigned offset,
uint32_t val, unsigned size,
enum gen6_blt_mask value_mask,
enum gen6_blt_mask write_mask)
{
const uint8_t rop = 0xf0; /* PATCOPY */
const int cpp = gen6_blt_translate_value_cpp(value_mask);
struct ilo_context *ilo = blitter->ilo;
unsigned offset = 0;
struct gen6_blt_bo dst;
if (dst_offset % cpp || dst_size % cpp)
if (offset % cpp || size % cpp)
return false;
dst.bo = buf->bo;
dst.offset = offset;
ilo_blitter_blt_begin(blitter, 0,
dst->bo, INTEL_TILING_NONE, NULL, INTEL_TILING_NONE);
dst.bo, INTEL_TILING_NONE, NULL, INTEL_TILING_NONE);
while (dst_size) {
while (size) {
unsigned width, height;
int16_t pitch;
width = dst_size;
width = size;
height = 1;
pitch = 0;
if (width > gen6_blt_max_bytes_per_scanline) {
/* less than INT16_MAX and dword-aligned */
pitch = 32764;
width = pitch;
height = dst_size / width;
width = 32764;
height = size / width;
if (height > gen6_blt_max_scanlines)
height = gen6_blt_max_scanlines;
dst.pitch = width;
} else {
dst.pitch = 0;
}
gen6_COLOR_BLT(&ilo->cp->builder, dst->bo, pitch, dst_offset + offset,
width, height, val, rop, value_mask, write_mask);
gen6_COLOR_BLT(&ilo->cp->builder, &dst, val,
width, height, rop, value_mask, write_mask);
offset += pitch * height;
dst_size -= width * height;
dst.offset += dst.pitch * height;
size -= width * height;
}
ilo_blitter_blt_end(blitter, 0);
@ -170,42 +172,50 @@ buf_clear_region(struct ilo_blitter *blitter,
static bool
buf_copy_region(struct ilo_blitter *blitter,
struct ilo_buffer *dst, unsigned dst_offset,
struct ilo_buffer *src, unsigned src_offset,
struct ilo_buffer *dst_buf, unsigned dst_offset,
struct ilo_buffer *src_buf, unsigned src_offset,
unsigned size)
{
const uint8_t rop = 0xcc; /* SRCCOPY */
struct ilo_context *ilo = blitter->ilo;
unsigned offset = 0;
struct gen6_blt_bo dst, src;
dst.bo = dst_buf->bo;
dst.offset = dst_offset;
dst.pitch = 0;
src.bo = src_buf->bo;
src.offset = src_offset;
src.pitch = 0;
ilo_blitter_blt_begin(blitter, 0,
dst->bo, INTEL_TILING_NONE, src->bo, INTEL_TILING_NONE);
dst_buf->bo, INTEL_TILING_NONE, src_buf->bo, INTEL_TILING_NONE);
while (size) {
unsigned width, height;
int16_t pitch;
width = size;
height = 1;
pitch = 0;
if (width > gen6_blt_max_bytes_per_scanline) {
/* less than INT16_MAX and dword-aligned */
pitch = 32764;
width = pitch;
width = 32764;
height = size / width;
if (height > gen6_blt_max_scanlines)
height = gen6_blt_max_scanlines;
dst.pitch = width;
src.pitch = width;
} else {
dst.pitch = 0;
src.pitch = 0;
}
gen6_SRC_COPY_BLT(&ilo->cp->builder,
dst->bo, pitch, dst_offset + offset,
width, height,
src->bo, pitch, src_offset + offset,
false, rop, GEN6_BLT_MASK_8, GEN6_BLT_MASK_8);
gen6_SRC_COPY_BLT(&ilo->cp->builder, &dst, &src,
width, height, rop, GEN6_BLT_MASK_8, GEN6_BLT_MASK_8);
offset += pitch * height;
dst.offset += dst.pitch * height;
src.offset += src.pitch * height;
size -= width * height;
}
@ -216,7 +226,7 @@ buf_copy_region(struct ilo_blitter *blitter,
static bool
tex_clear_region(struct ilo_blitter *blitter,
struct ilo_texture *dst, unsigned dst_level,
struct ilo_texture *dst_tex, unsigned dst_level,
const struct pipe_box *dst_box,
uint32_t val,
enum gen6_blt_mask value_mask,
@ -226,37 +236,43 @@ tex_clear_region(struct ilo_blitter *blitter,
const unsigned max_extent = 32767; /* INT16_MAX */
const uint8_t rop = 0xf0; /* PATCOPY */
struct ilo_context *ilo = blitter->ilo;
struct gen6_blt_xy_bo dst;
uint32_t swctrl;
int slice;
/* no W-tiling support */
if (dst->separate_s8)
if (dst_tex->separate_s8)
return false;
if (dst->layout.bo_stride > max_extent)
if (dst_tex->layout.bo_stride > max_extent)
return false;
if (dst_box->width * cpp > gen6_blt_max_bytes_per_scanline)
return false;
dst.bo = dst_tex->bo;
dst.offset = 0;
dst.pitch = dst_tex->layout.bo_stride;
dst.tiling = dst_tex->layout.tiling;
swctrl = ilo_blitter_blt_begin(blitter, dst_box->depth * 6,
dst->bo, dst->layout.tiling, NULL, INTEL_TILING_NONE);
dst_tex->bo, dst_tex->layout.tiling, NULL, INTEL_TILING_NONE);
for (slice = 0; slice < dst_box->depth; slice++) {
unsigned x1, y1, x2, y2;
unsigned x, y;
ilo_layout_get_slice_pos(&dst->layout,
dst_level, dst_box->z + slice, &x1, &y1);
ilo_layout_get_slice_pos(&dst_tex->layout,
dst_level, dst_box->z + slice, &x, &y);
x1 += dst_box->x;
y1 += dst_box->y;
x2 = x1 + dst_box->width;
y2 = y1 + dst_box->height;
dst.x = x + dst_box->x;
dst.y = y + dst_box->y;
if (x2 > max_extent || y2 > max_extent ||
(x2 - x1) * cpp > gen6_blt_max_bytes_per_scanline)
if (dst.x + dst_box->width > max_extent ||
dst.y + dst_box->height > max_extent)
break;
gen6_XY_COLOR_BLT(&ilo->cp->builder,
dst->bo, dst->layout.tiling, dst->layout.bo_stride, 0,
x1, y1, x2, y2, val, rop, value_mask, write_mask);
gen6_XY_COLOR_BLT(&ilo->cp->builder, &dst, val,
dst_box->width, dst_box->height, rop, value_mask, write_mask);
}
ilo_blitter_blt_end(blitter, swctrl);
@ -266,28 +282,29 @@ tex_clear_region(struct ilo_blitter *blitter,
static bool
tex_copy_region(struct ilo_blitter *blitter,
struct ilo_texture *dst,
struct ilo_texture *dst_tex,
unsigned dst_level,
unsigned dst_x, unsigned dst_y, unsigned dst_z,
struct ilo_texture *src,
struct ilo_texture *src_tex,
unsigned src_level,
const struct pipe_box *src_box)
{
const struct util_format_description *desc =
util_format_description(dst->layout.format);
util_format_description(dst_tex->layout.format);
const unsigned max_extent = 32767; /* INT16_MAX */
const uint8_t rop = 0xcc; /* SRCCOPY */
struct ilo_context *ilo = blitter->ilo;
enum gen6_blt_mask mask;
struct gen6_blt_xy_bo dst, src;
uint32_t swctrl;
int cpp, xscale, slice;
/* no W-tiling support */
if (dst->separate_s8 || src->separate_s8)
if (dst_tex->separate_s8 || src_tex->separate_s8)
return false;
if (dst->layout.bo_stride > max_extent ||
src->layout.bo_stride > max_extent)
if (dst_tex->layout.bo_stride > max_extent ||
src_tex->layout.bo_stride > max_extent)
return false;
cpp = desc->block.bits / 8;
@ -302,6 +319,9 @@ tex_copy_region(struct ilo_blitter *blitter,
xscale = (desc->block.bits / 8) / cpp;
}
if (src_box->width * cpp * xscale > gen6_blt_max_bytes_per_scanline)
return false;
switch (cpp) {
case 1:
mask = GEN6_BLT_MASK_8;
@ -317,43 +337,48 @@ tex_copy_region(struct ilo_blitter *blitter,
break;
}
dst.bo = dst_tex->bo;
dst.offset = 0;
dst.pitch = dst_tex->layout.bo_stride;
dst.tiling = dst_tex->layout.tiling;
src.bo = src_tex->bo;
src.offset = 0;
src.pitch = src_tex->layout.bo_stride;
src.tiling = src_tex->layout.tiling;
swctrl = ilo_blitter_blt_begin(blitter, src_box->depth * 8,
dst->bo, dst->layout.tiling, src->bo, src->layout.tiling);
dst.bo, dst.tiling, src.bo, src.tiling);
for (slice = 0; slice < src_box->depth; slice++) {
unsigned x1, y1, x2, y2, src_x, src_y;
unsigned dx, dy, sx, sy, width, height;
ilo_layout_get_slice_pos(&dst->layout,
dst_level, dst_z + slice, &x1, &y1);
x1 = (x1 + dst_x) * xscale;
y1 = y1 + dst_y;
x2 = (x1 + src_box->width) * xscale;
y2 = y1 + src_box->height;
ilo_layout_get_slice_pos(&dst_tex->layout,
dst_level, dst_z + slice, &dx, &dy);
ilo_layout_get_slice_pos(&src_tex->layout,
src_level, src_box->z + slice, &sx, &sy);
ilo_layout_get_slice_pos(&src->layout,
src_level, src_box->z + slice, &src_x, &src_y);
src_x = (src_x + src_box->x) * xscale;
src_y += src_box->y;
dst.x = (dx + dst_x) * xscale;
dst.y = dy + dst_y;
src.x = (sx + src_box->x) * xscale;
src.y = sy + src_box->y;
width = src_box->width * xscale;
height = src_box->height;
/* in blocks */
x1 /= desc->block.width;
y1 /= desc->block.height;
x2 = (x2 + desc->block.width - 1) / desc->block.width;
y2 = (y2 + desc->block.height - 1) / desc->block.height;
src_x /= desc->block.width;
src_y /= desc->block.height;
dst.x /= desc->block.width;
dst.y /= desc->block.height;
src.x /= desc->block.width;
src.y /= desc->block.height;
width /= desc->block.width;
height /= desc->block.height;
if (x2 > max_extent || y2 > max_extent ||
src_x > max_extent || src_y > max_extent ||
(x2 - x1) * cpp > gen6_blt_max_bytes_per_scanline)
if (src.x + width > max_extent || src.y + height > max_extent ||
dst.x + width > max_extent || dst.y + height > max_extent)
break;
gen6_XY_SRC_COPY_BLT(&ilo->cp->builder,
dst->bo, dst->layout.tiling, dst->layout.bo_stride, 0,
x1, y1, x2, y2,
src->bo, src->layout.tiling, src->layout.bo_stride, 0,
src_x, src_y, rop, mask, mask);
gen6_XY_SRC_COPY_BLT(&ilo->cp->builder, &dst, &src,
width, height, rop, mask, mask);
}
ilo_blitter_blt_end(blitter, swctrl);
@ -453,7 +478,7 @@ ilo_blitter_blt_clear_rt(struct ilo_blitter *blitter,
size = end - offset;
success = buf_clear_region(blitter, ilo_buffer(rt->texture),
offset, size, packed.ui[0], mask, mask);
offset, packed.ui[0], size, mask, mask);
}
else {
struct pipe_box box;

120
src/gallium/drivers/ilo/ilo_builder_blt.h
View file

@ -42,6 +42,21 @@ enum gen6_blt_mask {
GEN6_BLT_MASK_32_HI,
};
struct gen6_blt_bo {
struct intel_bo *bo;
uint32_t offset;
int16_t pitch;
};
struct gen6_blt_xy_bo {
struct intel_bo *bo;
uint32_t offset;
int16_t pitch;
enum intel_tiling_mode tiling;
int16_t x, y;
};
/*
* From the Sandy Bridge PRM, volume 1 part 5, page 7:
*
@ -89,10 +104,8 @@ gen6_blt_translate_write_mask(enum gen6_blt_mask write_mask)
static inline void
gen6_COLOR_BLT(struct ilo_builder *builder,
struct intel_bo *dst_bo,
int16_t dst_pitch, uint32_t dst_offset,
uint16_t width, uint16_t height,
uint32_t pattern, uint8_t rop,
const struct gen6_blt_bo *dst, uint32_t pattern,
uint16_t width, uint16_t height, uint8_t rop,
enum gen6_blt_mask value_mask,
enum gen6_blt_mask write_mask)
{
@ -106,7 +119,7 @@ gen6_COLOR_BLT(struct ilo_builder *builder,
assert(width < gen6_blt_max_bytes_per_scanline);
assert(height < gen6_blt_max_scanlines);
/* offsets are naturally aligned and pitches are dword-aligned */
assert(dst_offset % cpp == 0 && dst_pitch % 4 == 0);
assert(dst->offset % cpp == 0 && dst->pitch % 4 == 0);
pos = ilo_builder_batch_pointer(builder, cmd_len, &dw);
@ -115,21 +128,18 @@ gen6_COLOR_BLT(struct ilo_builder *builder,
(cmd_len - 2);
dw[1] = rop << GEN6_BLITTER_BR13_ROP__SHIFT |
gen6_blt_translate_value_mask(value_mask) |
dst_pitch;
dst->pitch;
dw[2] = height << 16 | width;
dw[4] = pattern;
ilo_builder_batch_reloc(builder, pos + 3,
dst_bo, dst_offset, INTEL_RELOC_WRITE);
dst->bo, dst->offset, INTEL_RELOC_WRITE);
}
static inline void
gen6_XY_COLOR_BLT(struct ilo_builder *builder,
struct intel_bo *dst_bo,
enum intel_tiling_mode dst_tiling,
int16_t dst_pitch, uint32_t dst_offset,
int16_t x1, int16_t y1, int16_t x2, int16_t y2,
uint32_t pattern, uint8_t rop,
const struct gen6_blt_xy_bo *dst, uint32_t pattern,
uint16_t width, uint16_t height, uint8_t rop,
enum gen6_blt_mask value_mask,
enum gen6_blt_mask write_mask)
{
@ -141,8 +151,10 @@ gen6_XY_COLOR_BLT(struct ilo_builder *builder,
ILO_DEV_ASSERT(builder->dev, 6, 7.5);
assert((x2 - x1) * cpp < gen6_blt_max_bytes_per_scanline);
assert(y2 - y1 < gen6_blt_max_scanlines);
assert(width * cpp < gen6_blt_max_bytes_per_scanline);
assert(height < gen6_blt_max_scanlines);
/* INT16_MAX */
assert(dst->x + width <= 32767 && dst->y + height <= 32767);
pos = ilo_builder_batch_pointer(builder, cmd_len, &dw);
@ -150,35 +162,32 @@ gen6_XY_COLOR_BLT(struct ilo_builder *builder,
gen6_blt_translate_write_mask(write_mask) |
(cmd_len - 2);
if (dst_tiling != INTEL_TILING_NONE) {
if (dst->tiling != INTEL_TILING_NONE) {
dw[0] |= GEN6_BLITTER_BR00_DST_TILED;
dst_align = (dst_tiling == INTEL_TILING_Y) ? 128 : 512;
dst_align = (dst->tiling == INTEL_TILING_Y) ? 128 : 512;
/* in dwords when tiled */
dst_pitch_shift = 2;
}
assert(dst_offset % dst_align == 0 && dst_pitch % dst_align == 0);
assert(dst->offset % dst_align == 0 && dst->pitch % dst_align == 0);
dw[1] = rop << GEN6_BLITTER_BR13_ROP__SHIFT |
gen6_blt_translate_value_mask(value_mask) |
dst_pitch >> dst_pitch_shift;
dw[2] = y1 << 16 | x1;
dw[3] = y2 << 16 | x2;
dst->pitch >> dst_pitch_shift;
dw[2] = dst->y << 16 | dst->x;
dw[3] = (dst->y + height) << 16 | (dst->x + width);
dw[5] = pattern;
ilo_builder_batch_reloc(builder, pos + 4,
dst_bo, dst_offset, INTEL_RELOC_WRITE);
dst->bo, dst->offset, INTEL_RELOC_WRITE);
}
static inline void
gen6_SRC_COPY_BLT(struct ilo_builder *builder,
struct intel_bo *dst_bo,
int16_t dst_pitch, uint32_t dst_offset,
uint16_t width, uint16_t height,
struct intel_bo *src_bo,
int16_t src_pitch, uint32_t src_offset,
bool dir_rtl, uint8_t rop,
const struct gen6_blt_bo *dst,
const struct gen6_blt_bo *src,
uint16_t width, uint16_t height, uint8_t rop,
enum gen6_blt_mask value_mask,
enum gen6_blt_mask write_mask)
{
@ -192,8 +201,8 @@ gen6_SRC_COPY_BLT(struct ilo_builder *builder,
assert(width < gen6_blt_max_bytes_per_scanline);
assert(height < gen6_blt_max_scanlines);
/* offsets are naturally aligned and pitches are dword-aligned */
assert(dst_offset % cpp == 0 && dst_pitch % 4 == 0);
assert(src_offset % cpp == 0 && src_pitch % 4 == 0);
assert(dst->offset % cpp == 0 && dst->pitch % 4 == 0);
assert(src->offset % cpp == 0 && src->pitch % 4 == 0);
pos = ilo_builder_batch_pointer(builder, cmd_len, &dw);
@ -203,28 +212,21 @@ gen6_SRC_COPY_BLT(struct ilo_builder *builder,
dw[1] = rop << GEN6_BLITTER_BR13_ROP__SHIFT |
gen6_blt_translate_value_mask(value_mask) |
dst_pitch;
if (dir_rtl)
dw[1] |= GEN6_BLITTER_BR13_DIR_RTL;
dst->pitch;
dw[2] = height << 16 | width;
dw[4] = src_pitch;
dw[4] = src->pitch;
ilo_builder_batch_reloc(builder, pos + 3,
dst_bo, dst_offset, INTEL_RELOC_WRITE);
ilo_builder_batch_reloc(builder, pos + 5, src_bo, src_offset, 0);
dst->bo, dst->offset, INTEL_RELOC_WRITE);
ilo_builder_batch_reloc(builder, pos + 5, src->bo, src->offset, 0);
}
static inline void
gen6_XY_SRC_COPY_BLT(struct ilo_builder *builder,
struct intel_bo *dst_bo,
enum intel_tiling_mode dst_tiling,
int16_t dst_pitch, uint32_t dst_offset,
int16_t x1, int16_t y1, int16_t x2, int16_t y2,
struct intel_bo *src_bo,
enum intel_tiling_mode src_tiling,
int16_t src_pitch, uint32_t src_offset,
int16_t src_x, int16_t src_y, uint8_t rop,
const struct gen6_blt_xy_bo *dst,
const struct gen6_blt_xy_bo *src,
uint16_t width, uint16_t height, uint8_t rop,
enum gen6_blt_mask value_mask,
enum gen6_blt_mask write_mask)
{
@ -237,8 +239,10 @@ gen6_XY_SRC_COPY_BLT(struct ilo_builder *builder,
ILO_DEV_ASSERT(builder->dev, 6, 7.5);
assert((x2 - x1) * cpp < gen6_blt_max_bytes_per_scanline);
assert(y2 - y1 < gen6_blt_max_scanlines);
assert(width * cpp < gen6_blt_max_bytes_per_scanline);
assert(height < gen6_blt_max_scanlines);
/* INT16_MAX */
assert(dst->x + width <= 32767 && dst->y + height <= 32767);
pos = ilo_builder_batch_pointer(builder, cmd_len, &dw);
@ -246,36 +250,36 @@ gen6_XY_SRC_COPY_BLT(struct ilo_builder *builder,
gen6_blt_translate_write_mask(write_mask) |
(cmd_len - 2);
if (dst_tiling != INTEL_TILING_NONE) {
if (dst->tiling != INTEL_TILING_NONE) {
dw[0] |= GEN6_BLITTER_BR00_DST_TILED;
dst_align = (dst_tiling == INTEL_TILING_Y) ? 128 : 512;
dst_align = (dst->tiling == INTEL_TILING_Y) ? 128 : 512;
/* in dwords when tiled */
dst_pitch_shift = 2;
}
if (src_tiling != INTEL_TILING_NONE) {
if (src->tiling != INTEL_TILING_NONE) {
dw[0] |= GEN6_BLITTER_BR00_SRC_TILED;
src_align = (src_tiling == INTEL_TILING_Y) ? 128 : 512;
src_align = (src->tiling == INTEL_TILING_Y) ? 128 : 512;
/* in dwords when tiled */
src_pitch_shift = 2;
}
assert(dst_offset % dst_align == 0 && dst_pitch % dst_align == 0);
assert(src_offset % src_align == 0 && src_pitch % src_align == 0);
assert(dst->offset % dst_align == 0 && dst->pitch % dst_align == 0);
assert(src->offset % src_align == 0 && src->pitch % src_align == 0);
dw[1] = rop << GEN6_BLITTER_BR13_ROP__SHIFT |
gen6_blt_translate_value_mask(value_mask) |
dst_pitch >> dst_pitch_shift;
dw[2] = y1 << 16 | x1;
dw[3] = y2 << 16 | x2;
dw[5] = src_y << 16 | src_x;
dw[6] = src_pitch >> src_pitch_shift;
dst->pitch >> dst_pitch_shift;
dw[2] = dst->y << 16 | dst->x;
dw[3] = (dst->y + height) << 16 | (dst->x + width);
dw[5] = src->y << 16 | src->x;
dw[6] = src->pitch >> src_pitch_shift;
ilo_builder_batch_reloc(builder, pos + 4,
dst_bo, dst_offset, INTEL_RELOC_WRITE);
ilo_builder_batch_reloc(builder, pos + 7, src_bo, src_offset, 0);
dst->bo, dst->offset, INTEL_RELOC_WRITE);
ilo_builder_batch_reloc(builder, pos + 7, src->bo, src->offset, 0);
}
#endif /* ILO_BUILDER_BLT_H */