Mesa (master): panfrost: Force ->s_writeback_base to ->zs_writeback_base for Z24S8 buffers

[GitLab Mirror]

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

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Sun Nov 22 11:37:54 2020 +0100

panfrost: Force ->s_writeback_base to ->zs_writeback_base for Z24S8 buffers

Apparently this field is used even if the stencil is part of the ZS
buffer. Fixes a bunch of page faults on Bifrost.

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7922>

---

 src/gallium/drivers/panfrost/pan_mfbd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gallium/drivers/panfrost/pan_mfbd.c b/src/gallium/drivers/panfrost/pan_mfbd.c
index 62a07f36d70..bcf78814c02 100644
--- a/src/gallium/drivers/panfrost/pan_mfbd.c
+++ b/src/gallium/drivers/panfrost/pan_mfbd.c
@@ -335,6 +335,7 @@ panfrost_mfbd_zs_crc_ext_set_bufs(struct panfrost_batch *batch,
                 break;
         case PIPE_FORMAT_Z24_UNORM_S8_UINT:
                 ext->zs_write_format = MALI_ZS_FORMAT_D24S8;
+                ext->s_writeback_base = ext->zs_writeback_base;
                 break;
         case PIPE_FORMAT_Z24X8_UNORM:
                 ext->zs_write_format = MALI_ZS_FORMAT_D24X8;