From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sun, 26 May 2019 20:48:42 +0000 (-0700)
Subject: iris: Fall back to fresh allocations of mapping for zero-memset fails.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cea6671395864d8b4c5020193b2f84955de827e4;p=mesa.git

iris: Fall back to fresh allocations of mapping for zero-memset fails.

It is unlikely that we would fail to map a cached BO in order to zero
its contents.  When we did, we would free the first BO in the cache and
try again with the second.  It's possible that this next BO already had
a map setup, in which case we'd succeed.  But if it didn't, we'd likely
fail again in the same manner.

There's not much point in optimizing this case (and frankly, if we're
out of CPU-side VMA we should probably dump the cache entirely)...so
instead, just fall back to allocating a fresh BO from the kernel which
will already be zeroed so we don't have to try and map it.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
---

diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index e6c61a7a14c..659840c47aa 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -443,11 +443,12 @@ retry:
 
          if (zeroed) {
             void *map = iris_bo_map(NULL, bo, MAP_WRITE | MAP_RAW);
-            if (!map) {
+            if (map) {
+               memset(map, 0, bo_size);
+            } else {
+               alloc_from_cache = false;
                bo_free(bo);
-               goto retry;
             }
-            memset(map, 0, bo_size);
          }
       }
    }