From: Eric Anholt <eric@anholt.net>
Date: Wed, 11 Jul 2018 18:23:36 +0000 (-0700)
Subject: vc4: Don't automatically reallocate a PERSISTENT-mapped buffer.
X-Git-Tag: android-x86-8.1-r1~2209
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=50a3a283d052a8d7a5f75fb45ab540d397fb22c2;p=android-x86%2Fexternal-mesa.git

vc4: Don't automatically reallocate a PERSISTENT-mapped buffer.

I had mistakenly used the COHERENT flag, which can only be set when
PERSISTENT is mapped, but isn't always.

Fixes: a2014c2eb9e0 ("vc4: Simplify the DISCARD_RANGE handling")
---

diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c
index 3ea45ba080b..4392b5943a9 100644
--- a/src/gallium/drivers/vc4/vc4_resource.c
+++ b/src/gallium/drivers/vc4/vc4_resource.c
@@ -161,7 +161,7 @@ vc4_resource_transfer_map(struct pipe_context *pctx,
          */
         if ((usage & PIPE_TRANSFER_DISCARD_RANGE) &&
             !(usage & PIPE_TRANSFER_UNSYNCHRONIZED) &&
-            !(prsc->flags & PIPE_RESOURCE_FLAG_MAP_COHERENT) &&
+            !(prsc->flags & PIPE_RESOURCE_FLAG_MAP_PERSISTENT) &&
             prsc->last_level == 0 &&
             prsc->width0 == box->width &&
             prsc->height0 == box->height &&