diff options
| author | Alyssa Rosenzweig <[email protected]> | 2019-12-16 12:05:45 -0500 |
|---|---|---|
| committer | Alyssa Rosenzweig <[email protected]> | 2019-12-16 12:51:03 -0500 |
| commit | 89593649377e343850faab18a1c121cdda43d685 (patch) | |
| tree | 51777f15efa1d57bbbc93fd9b396d5ab4c84c34b /src/panfrost | |
| parent | 5408700a12cd4b0a25aa2e36f8c4aed987ac6707 (diff) | |
panfrost: Remove fbd_type enum
Just use the MALI_MFBD tag directly; it's clean.
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3118>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3118>
Diffstat (limited to 'src/panfrost')
| -rw-r--r-- | src/panfrost/include/panfrost-job.h | 9 | ||||
| -rw-r--r-- | src/panfrost/pandecode/decode.c | 6 |
2 files changed, 6 insertions, 9 deletions
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) |