AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan/bi: Handle different sizes of LD_TILE

Browse Source 
v2: Fix overflow.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10393>
This commit is contained in:
Alyssa Rosenzweig
2021-04-21 17:42:54 -04:00
committed by Marge Bot
parent f412801768
commit ba17342a1f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/panfrost/pan_cmdstream.c
+5 -3
View File
@@ -990,16 +990,18 @@ panfrost_upload_multisampled_sysval(struct panfrost_batch *batch,
}
static void
panfrost_upload_rt_conversion_sysval(struct panfrost_batch *batch, unsigned rt,
struct sysval_uniform *uniform)
panfrost_upload_rt_conversion_sysval(struct panfrost_batch *batch,
unsigned size_and_rt, struct sysval_uniform *uniform)
{
struct panfrost_context *ctx = batch->ctx;
struct panfrost_device *dev = pan_device(ctx->base.screen);
unsigned rt = size_and_rt & 0xF;
unsigned size = size_and_rt >> 4;
if (rt < batch->key.nr_cbufs && batch->key.cbufs[rt]) {
enum pipe_format format = batch->key.cbufs[rt]->format;
uniform->u[0] =
pan_blend_get_bifrost_desc(dev, format, rt, 32) >> 32;
pan_blend_get_bifrost_desc(dev, format, rt, size) >> 32;
} else {
pan_pack(&uniform->u[0], BIFROST_INTERNAL_CONVERSION, cfg)
cfg.memory_format = dev->formats[PIPE_FORMAT_NONE].hw;
src/panfrost/bifrost/bifrost_compile.c
+2 -1
View File
@@ -920,6 +920,7 @@ static void
bi_emit_ld_tile(bi_builder *b, nir_intrinsic_instr *instr)
{
unsigned rt = b->shader->inputs->blend.rt;
unsigned size = nir_dest_bit_size(instr->dest);
/* Get the render target */
if (!b->shader->inputs->is_blend) {
@@ -943,7 +944,7 @@ bi_emit_ld_tile(bi_builder *b, nir_intrinsic_instr *instr)
bi_index desc = b->shader->inputs->is_blend ?
bi_imm_u32(b->shader->inputs->blend.bifrost_blend_desc >> 32) :
bi_load_sysval(b, PAN_SYSVAL(RT_CONVERSION, rt), 1, 0);
bi_load_sysval(b, PAN_SYSVAL(RT_CONVERSION, rt | (size << 4)), 1, 0);
uint32_t indices = 0;
memcpy(&indices, &pix, sizeof(indices));