Mesa (main): panfrost: Increase tiler_heap max allocation to 64MB

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Mon May 24 11:07:11 2021 -0400

panfrost: Increase tiler_heap max allocation to 64MB

We previously allocated only 16MB, but this isn't always enough. Now
that we have growable (heap) on recent kernels, there's not much reason
to try to shrink this allocation.

Fixes OUT_OF_MEMORY fault on furmark trace.

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

---

 src/gallium/drivers/panfrost/ci/traces-panfrost.yml | 2 +-
 src/panfrost/lib/pan_props.c                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml b/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
index 46391c338c6..99fe2e09606 100644
--- a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
+++ b/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
@@ -45,7 +45,7 @@ traces:
   - path: gputest/furmark.trace
     expectations:
       - device: gl-panfrost-t860
-        checksum: dc4ece101ed145228840d1f0654118c6
+        checksum: 2bde9efdddd92c28d29f744e36a226e9
   - path: gputest/triangle.trace
     expectations:
       - device: gl-panfrost-t860
diff --git a/src/panfrost/lib/pan_props.c b/src/panfrost/lib/pan_props.c
index 3837d1e7730..a23bf00bcaf 100644
--- a/src/panfrost/lib/pan_props.c
+++ b/src/panfrost/lib/pan_props.c
@@ -258,7 +258,7 @@ panfrost_open_device(void *memctx, int fd, struct panfrost_device *dev)
          * active for a single job chain at once, so a single heap can be
          * shared across batches/contextes */
 
-        dev->tiler_heap = panfrost_bo_create(dev, 4096 * 4096,
+        dev->tiler_heap = panfrost_bo_create(dev, 64 * 1024 * 1024,
                         PAN_BO_INVISIBLE | PAN_BO_GROWABLE, "Tiler heap");
 
         pthread_mutex_init(&dev->submit_lock, NULL);