Mesa (17.1): Revert "cherry-ignore: anv: [...]"

[Juan Antonio Suárez Romero]

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

Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Fri Jun  2 10:33:41 2017 +0000

Revert "cherry-ignore: anv: [...]"

Revert "cherry-ignore: anv: Refactor memory type setup"
This reverts commit eab4a503a0b04dfe1fdcfc2dcde62eb09c038aca.

Revert "cherry-ignore: anv: Add valid_bufer_usage to the memory type metadata"
This reverts commit c31e814a85a27249e2a57cb7350240c01a1cad58.

Revert "cherry-ignore: anv: Advertise both 32-bit and 48-bit heaps when we have enough memory"
This reverts commit e391144853640ee39fca8dfe0e9387bbf1d90a76.

Revert "cherry-ignore: anv: Make supports_48bit_addresses a heap property"
This reverts commit dbadd066321786ea9b8f0259413740a10f753f36.

Revert "cherry-ignore: anv: Stop setting BO flags in bo_init_new"
This reverts commit 07867f72cf53209d230b3fb13f24f9371ab9d4b4.

Revert "cherry-ignore: anv: Determine the type of mapping based on type metadata"
This reverts commit 9299466b83ce88c911b30b35d9f4f6addb25c92a.

---

 bin/.cherry-ignore | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 88277a69ac..209c0ec92e 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -1,16 +1,6 @@
 # This commit depends on 9fd9a7d0ba3 and 678d568c7b2, neither of which is in branch.
 b84b631c6381d9b36bca5d0e7cc67dd23af188c1 radeonsi: load patch_id for TES-as-ES when exporting for PS
-# This commit depends on commit c3c61d210f which did not land in branch.
-92325a7efc769c32e03031323e21700dc55171e4 anv: Determine the type of mapping based on type metadata
-# This commit depends on commit 35e626bd0e which did not land in branch.
-00df1cd9d6234cdfc9fb2bf3615196ff83a3c956 anv: Stop setting BO flags in bo_init_new
-# This commit depends on commit 00df1cd9d6 which did not land in branch.
-b83b1af6f6936f36db42a8f8b8e0854d0f9491fd anv: Make supports_48bit_addresses a heap property
-# These commits depend on commit b83b1af6f6 which did not land in branch.
-50d0eb5096bd9514821a641f25c0b3455c0f8a88 anv: Advertise both 32-bit and 48-bit heaps when we have enough memory
+# This commit causes regressions in the crucible testsuite
 39adea9330376a64a4b5e8da98f5e055ebd3331e anv: Require vertex buffers to come from a 32-bit heap
 # This commit addressed an earlier commit 126d5ad which did not land in branch.
 9da104593386f6e8ddec8f0d9d288aceb8908fe1 radv: fix regression in descriptor set freeing.
-# These commits depend on commit 9da1045933 which did not land in branch.
-f7736ccf53eaeb66c4270afe0916e2cb29ab8667 anv: Add valid_bufer_usage to the memory type metadata
-34581fdd4f149894dfa51777a2f7eb289bd08b71 anv: Refactor memory type setup