Mesa (main): panfrost: Hide AFBC on Valhall

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: e39f9aa883bb0471d821b14e5e360f31ac3f0df2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e39f9aa883bb0471d821b14e5e360f31ac3f0df2

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Thu Feb  3 13:29:00 2022 -0500

panfrost: Hide AFBC on Valhall

The relevant data structures have been shuffled a bit. We need to wire up AFBC
for Valhall; however, that's out of scope for the initial bring up. Just hide it
so we can build.

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

---

 src/panfrost/lib/pan_cs.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/panfrost/lib/pan_cs.c b/src/panfrost/lib/pan_cs.c
index 76e69f43021..c52285a87fc 100644
--- a/src/panfrost/lib/pan_cs.c
+++ b/src/panfrost/lib/pan_cs.c
@@ -202,6 +202,7 @@ pan_prepare_zs(const struct pan_fb_info *fb,
         pan_iview_get_surface(zs, 0, 0, 0, &surf);
 
         if (drm_is_afbc(zs->image->layout.modifier)) {
+#if PAN_ARCH <= 8
 #if PAN_ARCH >= 6
                 const struct pan_image_slice_layout *slice = &zs->image->layout.slices[level];
 
@@ -216,6 +217,7 @@ pan_prepare_zs(const struct pan_fb_info *fb,
 
                 ext->zs_afbc_header = surf.afbc.header;
                 ext->zs_afbc_body = surf.afbc.body;
+#endif
         } else {
                 assert(zs->image->layout.modifier == DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED ||
                        zs->image->layout.modifier == DRM_FORMAT_MOD_LINEAR);
@@ -442,6 +444,7 @@ pan_prepare_rt(const struct pan_fb_info *fb, unsigned idx,
         pan_iview_get_surface(rt, 0, 0, 0, &surf);
 
         if (drm_is_afbc(rt->image->layout.modifier)) {
+#if PAN_ARCH <= 8
                 const struct pan_image_slice_layout *slice = &rt->image->layout.slices[level];
 
 #if PAN_ARCH >= 6
@@ -460,6 +463,7 @@ pan_prepare_rt(const struct pan_fb_info *fb, unsigned idx,
 
                 if (rt->image->layout.modifier & AFBC_FORMAT_MOD_YTR)
                         cfg->afbc.yuv_transform_enable = true;
+#endif
         } else {
                 assert(rt->image->layout.modifier == DRM_FORMAT_MOD_LINEAR ||
                        rt->image->layout.modifier == DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED);