diff options
| -rw-r--r-- | src/gallium/drivers/panfrost/pan_sfbd.c | 2 | ||||
| -rw-r--r-- | src/panfrost/include/panfrost-job.h | 9 | ||||
| -rw-r--r-- | src/panfrost/pandecode/decode.c | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/gallium/drivers/panfrost/pan_sfbd.c b/src/gallium/drivers/panfrost/pan_sfbd.c index eb0f24b0a8a..4647b48ef33 100644 --- a/src/gallium/drivers/panfrost/pan_sfbd.c +++ b/src/gallium/drivers/panfrost/pan_sfbd.c @@ -269,5 +269,5 @@ panfrost_sfbd_fragment(struct panfrost_batch *batch, bool has_draws) fb.format.unk2 |= MALI_SFBD_FORMAT_MSAA_B; } - return panfrost_upload_transient(batch, &fb, sizeof(fb)) | MALI_SFBD; + return panfrost_upload_transient(batch, &fb, sizeof(fb)); } diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h index d2334b503f0..15c22d8fa09 100644 --- a/src/panfrost/include/panfrost-job.h +++ b/src/panfrost/include/panfrost-job.h @@ -872,14 +872,11 @@ struct mali_attr_meta { int32_t src_offset; } __attribute__((packed)); -enum mali_fbd_type { - MALI_SFBD = 0, - MALI_MFBD = 1, -}; - -#define FBD_TYPE (1) #define FBD_MASK (~0x3f) +/* MFBD, rather than SFBD */ +#define MALI_MFBD (0x1) + /* ORed into an MFBD address to specify the fbx section is included */ #define MALI_MFBD_TAG_EXTRA (0x2) diff --git a/src/panfrost/pandecode/decode.c b/src/panfrost/pandecode/decode.c index efc9ef7087a..b24ce3f65d1 100644 --- a/src/panfrost/pandecode/decode.c +++ b/src/panfrost/pandecode/decode.c @@ -2116,7 +2116,7 @@ pandecode_vertex_tiler_postfix_pre( }; if (is_bifrost) - pandecode_scratchpad(p->framebuffer & ~FBD_TYPE, job_no, suffix); + pandecode_scratchpad(p->framebuffer & ~1, job_no, suffix); else if (p->framebuffer & MALI_MFBD) fbd_info = pandecode_mfbd_bfr((u64) ((uintptr_t) p->framebuffer) & FBD_MASK, job_no, false); else if (job_type == JOB_TYPE_COMPUTE) @@ -2734,7 +2734,7 @@ pandecode_fragment_job(const struct pandecode_mapped_memory *mem, { const struct mali_payload_fragment *PANDECODE_PTR_VAR(s, mem, payload); - bool is_mfbd = (s->framebuffer & FBD_TYPE) == MALI_MFBD; + bool is_mfbd = s->framebuffer & MALI_MFBD; /* Bifrost theoretically may retain support for SFBD on compute jobs, * but for graphics workloads with a FRAGMENT payload, use MFBD */ @@ -2754,7 +2754,7 @@ pandecode_fragment_job(const struct pandecode_mapped_memory *mem, * additional structures follow the MFBD header (an extra payload or * not, as well as a count of render targets) */ - unsigned expected_tag = is_mfbd ? MALI_MFBD : MALI_SFBD; + unsigned expected_tag = is_mfbd ? MALI_MFBD : 0; if (is_mfbd) { if (info.has_extra) |