From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 3 Jul 2020 17:17:35 +0000 (-0400)
Subject: panfrost: Force Z/S writeback
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=528e132d4f7fb86dbee4d5d5d88fceeed0fa236f;p=mesa.git

panfrost: Force Z/S writeback

This is unfortunately necessary for conformance at this stage.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5929>
---

diff --git a/src/gallium/drivers/panfrost/pan_mfbd.c b/src/gallium/drivers/panfrost/pan_mfbd.c
index 8ac5491b8b6..aea990f2104 100644
--- a/src/gallium/drivers/panfrost/pan_mfbd.c
+++ b/src/gallium/drivers/panfrost/pan_mfbd.c
@@ -298,7 +298,7 @@ panfrost_mfbd_set_zsbuf(
 
                 unsigned header_size = rsrc->slices[level].header_size;
 
-                fb->mfbd_flags |= MALI_MFBD_EXTRA;
+                fb->mfbd_flags |= MALI_MFBD_EXTRA | MALI_MFBD_DEPTH_WRITE;
 
                 fbx->flags_hi |= MALI_EXTRA_PRESENT;
                 fbx->flags_lo |= MALI_EXTRA_ZS | 0x1; /* unknown */
@@ -322,7 +322,7 @@ panfrost_mfbd_set_zsbuf(
 
                 unsigned layer_stride = (nr_samples > 1) ? rsrc->slices[level].size0 : 0;
 
-                fb->mfbd_flags |= MALI_MFBD_EXTRA;
+                fb->mfbd_flags |= MALI_MFBD_EXTRA | MALI_MFBD_DEPTH_WRITE;
                 fbx->flags_hi |= MALI_EXTRA_PRESENT;
                 fbx->flags_lo |= MALI_EXTRA_ZS;