Mesa (master): panfrost: Identify fragment_extra flags

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 587ad37e72d2a343b82a0c62c41c869d6825e14d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=587ad37e72d2a343b82a0c62c41c869d6825e14d

Author: Alyssa Rosenzweig <alyssa at rosenzweig.io>
Date:   Sat Mar  9 00:45:23 2019 +0000

panfrost: Identify fragment_extra flags

The fragment_extra structure contains additional fields extending the
MRT framebuffer descriptor, snuck in between the main framebuffer
descriptor and the render targets. Its fields include those related to
transaction elimination and depth/stencil buffers. This patch identifies
the flags field (previously just "unk" with some magic values) as well
as identifying some (but not all) flags set by the driver.

The process of identifying flags brought a bug to light where
transaction elimination (checksumming) could not be enabled unless AFBC
was in-use. This issue is now resolved.

Signed-off-by: Alyssa Rosenzweig <alyssa at rosenzweig.io>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>

---

 src/gallium/drivers/panfrost/include/panfrost-job.h |  9 ++++++++-
 src/gallium/drivers/panfrost/pan_context.c          | 13 +++++++++----
 src/gallium/drivers/panfrost/pandecode/decode.c     | 18 +++++++++++++-----
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/panfrost/include/panfrost-job.h b/src/gallium/drivers/panfrost/include/panfrost-job.h
index 28ba3f85ad4..85ef02d04e0 100644
--- a/src/gallium/drivers/panfrost/include/panfrost-job.h
+++ b/src/gallium/drivers/panfrost/include/panfrost-job.h
@@ -1419,12 +1419,19 @@ struct bifrost_render_target {
  * - TODO: Anything else?
  */
 
+/* Flags field: note, these are guesses */
+
+#define MALI_EXTRA_PRESENT      (0x400)
+#define MALI_EXTRA_AFBC         (0x20)
+#define MALI_EXTRA_AFBC_ZS      (0x10)
+#define MALI_EXTRA_ZS           (0x4)
+
 struct bifrost_fb_extra {
         mali_ptr checksum;
         /* Each tile has an 8 byte checksum, so the stride is "width in tiles * 8" */
         u32 checksum_stride;
 
-        u32 unk;
+        u32 flags;
 
         union {
                 /* Note: AFBC is only allowed for 24/8 combined depth/stencil. */
diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index 59095ae0203..cbf97daf6e5 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -247,6 +247,13 @@ panfrost_set_fragment_target(struct panfrost_context *ctx)
 
                         ctx->fragment_mfbd.unk3 |= MALI_MFBD_EXTRA;
 
+                        ctx->fragment_extra.flags =
+                                MALI_EXTRA_PRESENT |
+                                MALI_EXTRA_AFBC |
+                                MALI_EXTRA_AFBC_ZS |
+                                MALI_EXTRA_ZS |
+                                0x1; /* unknown */
+
                         ctx->fragment_extra.ds_afbc.depth_stencil_afbc_metadata = rsrc->bo->afbc_slab.gpu;
                         ctx->fragment_extra.ds_afbc.depth_stencil_afbc_stride = 0;
 
@@ -255,8 +262,6 @@ panfrost_set_fragment_target(struct panfrost_context *ctx)
                         ctx->fragment_extra.ds_afbc.zero1 = 0x10009;
                         ctx->fragment_extra.ds_afbc.padding = 0x1000;
 
-                        ctx->fragment_extra.unk = 0x435; /* General 0x400 in all unks. 0x5 for depth/stencil. 0x10 for AFBC encoded depth stencil. Unclear where the 0x20 is from */
-
                         ctx->fragment_mfbd.unk3 |= MALI_MFBD_DEPTH_WRITE;
                 }
         }
@@ -504,7 +509,7 @@ panfrost_clear_mfbd(struct panfrost_job *job)
         if (job->clear & (PIPE_CLEAR_DEPTH | PIPE_CLEAR_STENCIL)) {
                 /* Setup combined 24/8 depth/stencil */
                 ctx->fragment_mfbd.unk3 |= MALI_MFBD_EXTRA;
-                ctx->fragment_extra.unk = 0x405;
+                ctx->fragment_extra.flags = 0x405;
                 ctx->fragment_extra.ds_linear.depth = ctx->depth_stencil_buffer.gpu;
                 ctx->fragment_extra.ds_linear.depth_stride = ctx->pipe_framebuffer.width * 4;
         }
@@ -997,7 +1002,7 @@ panfrost_fragment_job(struct panfrost_context *ctx)
                         int stride = util_format_get_stride(rsrc->base.format, rsrc->base.width0);
 
                         ctx->fragment_mfbd.unk3 |= MALI_MFBD_EXTRA;
-                        ctx->fragment_extra.unk |= 0x420;
+                        ctx->fragment_extra.flags |= MALI_EXTRA_PRESENT;
                         ctx->fragment_extra.checksum_stride = rsrc->bo->checksum_stride;
                         ctx->fragment_extra.checksum = rsrc->bo->gpu[0] + stride * rsrc->base.height0;
                 }
diff --git a/src/gallium/drivers/panfrost/pandecode/decode.c b/src/gallium/drivers/panfrost/pandecode/decode.c
index ea635bbe981..e6932744939 100644
--- a/src/gallium/drivers/panfrost/pandecode/decode.c
+++ b/src/gallium/drivers/panfrost/pandecode/decode.c
@@ -209,6 +209,15 @@ static const struct pandecode_flag_info mfbd_fmt_flag_info[] = {
 };
 #undef FLAG_INFO
 
+#define FLAG_INFO(flag) { MALI_EXTRA_##flag, "MALI_EXTRA_" #flag }
+static const struct pandecode_flag_info mfbd_extra_flag_info[] = {
+        FLAG_INFO(PRESENT),
+        FLAG_INFO(AFBC),
+        FLAG_INFO(ZS),
+        {}
+};
+#undef FLAG_INFO
+
 extern char *replace_fragment;
 extern char *replace_vertex;
 
@@ -604,12 +613,11 @@ pandecode_replay_mfbd_bfr(uint64_t gpu_va, int job_no)
                 if (fbx->checksum_stride)
                         pandecode_prop("checksum_stride = %d", fbx->checksum_stride);
 
-                pandecode_prop("unk = 0x%x", fbx->unk);
+                pandecode_log(".flags = ");
+                pandecode_log_decoded_flags(mfbd_extra_flag_info, fbx->flags);
+                pandecode_log_cont(",\n");
 
-                /* TODO figure out if this is actually the right way to
-                 * determine whether AFBC is enabled
-                 */
-                if (fbx->unk & 0x10) {
+                if (fbx->flags & MALI_EXTRA_AFBC_ZS) {
                         pandecode_log(".ds_afbc = {\n");
                         pandecode_indent++;