From 42138ee1c801dfd289e0f3e0214600fb1a01890d Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 7 Dec 2023 15:46:57 +0100 Subject: [PATCH] panfrost: Pass no_hierarchical_tiling info through pan_tiler_context Signed-off-by: Boris Brezillon Reviewed-by: Constantine Shablya Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/panfrost/pan_cmdstream.c | 2 ++ src/panfrost/lib/pan_desc.c | 2 +- src/panfrost/lib/pan_desc.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 6971127c338..243f1605834 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -3707,6 +3707,8 @@ batch_get_polygon_list(struct panfrost_batch *batch) } batch->tiler_ctx.midgard.disable = !has_draws; + batch->tiler_ctx.midgard.no_hierarchical_tiling = + dev->model->quirks.no_hierarchical_tiling; } return batch->tiler_ctx.midgard.polygon_list->ptr.gpu; diff --git a/src/panfrost/lib/pan_desc.c b/src/panfrost/lib/pan_desc.c index 4a5b0e447dc..6958b9aaa6b 100644 --- a/src/panfrost/lib/pan_desc.c +++ b/src/panfrost/lib/pan_desc.c @@ -571,7 +571,7 @@ pan_emit_midgard_tiler(const struct panfrost_device *dev, const struct pan_fb_info *fb, const struct pan_tiler_context *tiler_ctx, void *out) { - bool hierarchy = !dev->model->quirks.no_hierarchical_tiling; + bool hierarchy = !tiler_ctx->midgard.no_hierarchical_tiling; assert(tiler_ctx->midgard.polygon_list->ptr.gpu); diff --git a/src/panfrost/lib/pan_desc.h b/src/panfrost/lib/pan_desc.h index ca08f703f14..ccd3b2eb389 100644 --- a/src/panfrost/lib/pan_desc.h +++ b/src/panfrost/lib/pan_desc.h @@ -79,6 +79,7 @@ struct pan_tiler_context { mali_ptr bifrost; struct { bool disable; + bool no_hierarchical_tiling; struct panfrost_bo *polygon_list; } midgard; };