panvk: Remove iter_sb on v11+
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
macOS-CI / macOS-CI (xlib) (push) Waiting to run

iter_sb is now unused on v11+, let's not store it on this codepath and
only define it for v10.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35307>
This commit is contained in:
Mary Guillemard 2025-06-04 12:13:26 +02:00 committed by Marge Bot
parent 1879b33877
commit 9963cf2d89
3 changed files with 4 additions and 4 deletions

View file

@ -92,8 +92,10 @@ struct panvk_cs_occlusion_query {
struct panvk_cs_subqueue_context {
uint64_t syncobjs;
#if PAN_ARCH == 10
uint32_t iter_sb;
uint32_t pad;
#endif
uint64_t reg_dump_addr;
struct {
struct panvk_cs_desc_ringbuf desc_ringbuf;

View file

@ -635,10 +635,6 @@ panvk_per_arch(cs_next_iter_sb)(struct panvk_cmd_buffer *cmdbuf,
cs_move32_to(b, sb_wait_mask, 0);
cs_bit_set32(b, sb_wait_mask, sb_wait_mask, iter_sb);
cs_set_state(b, MALI_CS_SET_STATE_TYPE_SB_MASK_WAIT, sb_wait_mask);
cs_store32(b, iter_sb, cs_subqueue_ctx_reg(b),
offsetof(struct panvk_cs_subqueue_context, iter_sb));
cs_flush_stores(b);
}
#else
void

View file

@ -395,10 +395,12 @@ init_subqueue(struct panvk_queue *queue, enum panvk_subqueue_id subqueue)
.syncobjs = panvk_priv_mem_dev_addr(queue->syncobjs),
.debug.syncobjs = panvk_priv_mem_dev_addr(queue->debug_syncobjs),
.debug.tracebuf.cs = subq->tracebuf.addr.dev,
#if PAN_ARCH == 10
/* Iterator scoreboard will be picked in CS and wrap back to SB_ITER(0) on
first RUN_* so we ensure an invalid value here that is handled by our
partial modulo implementation */
.iter_sb = SB_ITER(dev->csf.sb.iter_count),
#endif
.reg_dump_addr = panvk_priv_mem_dev_addr(subq->regs_save),
};