Mesa (staging/21.3): panfrost: Enable AFBC on v7

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 31dcf06c14006c18deaf7b381f0043e769358e40
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=31dcf06c14006c18deaf7b381f0043e769358e40

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Tue Oct  5 16:18:22 2021 -0400

panfrost: Enable AFBC on v7

The bugs blocking this have been resolved, so flip on AFBC again and get
moar fps.

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13205>
(cherry picked from commit 2526f6f229406fa364e4375449d33e2048caaab6)

---

 .pick_status.json                         | 2 +-
 src/gallium/drivers/panfrost/pan_screen.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 82535a0de06..f02bb7d85ae 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -22,7 +22,7 @@
         "description": "panfrost: Enable AFBC on v7",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 72999fe7c90..abc21432751 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -841,13 +841,6 @@ panfrost_create_screen(int fd, struct renderonly *ro)
         if (dev->debug & PAN_DBG_NO_AFBC)
                 dev->has_afbc = false;
 
-        /* XXX: AFBC is currently broken on Bifrost
-         *
-         *  - Preload is broken if the effective tile size is not 16x16
-         */
-        if (dev->arch == 7)
-                dev->has_afbc = false;
-
         dev->ro = ro;
 
         /* Check if we're loading against a supported GPU model. */