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

panfrost: Inline pan_emit_tiler_heap()

Browse source 
Tiler heap emission will differ on v10. Since pan_emit_tiler_heap()
is only used by the gallium driver, and it's simple enough to be
inlined, move the code to panfrost_batch_get_bifrost_tiler().

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26249>
This commit is contained in:
Boris Brezillon 2023-11-13 16:50:16 +01:00 • committed by Marge Bot
parent 708a3a33a8
commit b378cfbc48
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -2962,7 +2962,12 @@ panfrost_batch_get_bifrost_tiler(struct panfrost_batch *batch,
struct panfrost_ptr t = pan_pool_alloc_desc(&batch->pool.base, TILER_HEAP); struct panfrost_ptr t = pan_pool_alloc_desc(&batch->pool.base, TILER_HEAP);
GENX(pan_emit_tiler_heap)(dev, t.cpu); pan_pack(t.cpu, TILER_HEAP, heap) {
heap.size = dev->tiler_heap->size;
heap.base = dev->tiler_heap->ptr.gpu;
heap.bottom = dev->tiler_heap->ptr.gpu;
heap.top = dev->tiler_heap->ptr.gpu + dev->tiler_heap->size;
}
mali_ptr heap = t.gpu; mali_ptr heap = t.gpu;

11
src/panfrost/lib/pan_cs.c
View file

@ -964,17 +964,6 @@ GENX(pan_emit_fbd)(const struct panfrost_device *dev,
#endif #endif
#if PAN_ARCH >= 6 #if PAN_ARCH >= 6
void
GENX(pan_emit_tiler_heap)(const struct panfrost_device *dev, void *out)
{
pan_pack(out, TILER_HEAP, heap) {
heap.size = dev->tiler_heap->size;
heap.base = dev->tiler_heap->ptr.gpu;
heap.bottom = dev->tiler_heap->ptr.gpu;
heap.top = dev->tiler_heap->ptr.gpu + dev->tiler_heap->size;
}
}
void void
GENX(pan_emit_tiler_ctx)(const struct panfrost_device *dev, unsigned fb_width, GENX(pan_emit_tiler_ctx)(const struct panfrost_device *dev, unsigned fb_width,
unsigned fb_height, unsigned nr_samples, unsigned fb_height, unsigned nr_samples,

2
src/panfrost/lib/pan_cs.h
View file

@ -163,8 +163,6 @@ unsigned GENX(pan_emit_fbd)(const struct panfrost_device *dev,
void *out); void *out);
#if PAN_ARCH >= 6 #if PAN_ARCH >= 6
void GENX(pan_emit_tiler_heap)(const struct panfrost_device *dev, void *out);
void GENX(pan_emit_tiler_ctx)(const struct panfrost_device *dev, void GENX(pan_emit_tiler_ctx)(const struct panfrost_device *dev,
unsigned fb_width, unsigned fb_height, unsigned fb_width, unsigned fb_height,
unsigned nr_samples, bool first_provoking_vertex, unsigned nr_samples, bool first_provoking_vertex,