From 37204588dab37c16c24178c881e28976291dd50a Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 30 Jun 2020 16:21:18 -0400 Subject: [PATCH] panfrost: Identify layer_stride For MSAA. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/include/panfrost-job.h | 4 ++-- src/panfrost/pandecode/decode.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h index f58776a709e..50159c3eb10 100644 --- a/src/panfrost/include/panfrost-job.h +++ b/src/panfrost/include/panfrost-job.h @@ -1738,8 +1738,8 @@ struct mali_render_target { mali_ptr framebuffer; u32 zero2 : 4; - u32 framebuffer_stride : 28; // in units of bytes - u32 zero3; + u32 framebuffer_stride : 28; // in units of bytes, row to next + u32 layer_stride; /* For multisample rendering */ u32 clear_color_1; // RGBA8888 from glClear, actually used by hardware u32 clear_color_2; // always equal, but unclear function? diff --git a/src/panfrost/pandecode/decode.c b/src/panfrost/pandecode/decode.c index ea50020c021..37f384eff58 100644 --- a/src/panfrost/pandecode/decode.c +++ b/src/panfrost/pandecode/decode.c @@ -1088,6 +1088,9 @@ pandecode_render_target(uint64_t gpu_va, unsigned job_no, const struct mali_fram MEMORY_PROP(rt, framebuffer); pandecode_prop("framebuffer_stride = %d", rt->framebuffer_stride); + if (rt->layer_stride) + pandecode_prop("layer_stride = %d", rt->layer_stride); + if (rt->clear_color_1 | rt->clear_color_2 | rt->clear_color_3 | rt->clear_color_4) { pandecode_prop("clear_color_1 = 0x%" PRIx32, rt->clear_color_1); pandecode_prop("clear_color_2 = 0x%" PRIx32, rt->clear_color_2); @@ -1095,11 +1098,10 @@ pandecode_render_target(uint64_t gpu_va, unsigned job_no, const struct mali_fram pandecode_prop("clear_color_4 = 0x%" PRIx32, rt->clear_color_4); } - if (rt->zero1 || rt->zero2 || rt->zero3) { + if (rt->zero1 || rt->zero2) { pandecode_msg("XXX: render target zeros tripped\n"); pandecode_prop("zero1 = 0x%" PRIx64, rt->zero1); pandecode_prop("zero2 = 0x%" PRIx32, rt->zero2); - pandecode_prop("zero3 = 0x%" PRIx32, rt->zero3); } pandecode_indent--; -- 2.30.2