summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2019-02-14 08:55:37 -0800
committerDylan Baker <dylan@pnwbakers.com>2019-02-15 10:03:08 -0800
commit103928528883dde66e48bc68f1cd740f65de69a7 (patch)
tree2466b8044208fe1ad0acd18e424236541574bd82
parent59812ac38dfeb6a1e92d0c333aeb4f1ea0f89bd9 (diff)
anv: Put MOCS in the correct location
My patch to switch from struct-based MOCS to numeric MOCS accidentally divided all MOCS entries by 2 in the Vulkan driver. MOCS on Gen9+ is just an array index into a table. But in the hardware packets, the index starts at bit 1. So we need to shift it. Fixes: 0b44644ca68 (genxml: Consistently use a numeric "MOCS" field) Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> (cherry picked from commit 39aee57523a02552e7eae7df5da488e535aeb1eb)
-rw-r--r--src/intel/vulkan/anv_private.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 110b2ccf023..5f6973ebe81 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -1449,10 +1449,10 @@ _anv_combine_address(struct anv_batch *batch, void *location,
*/
/* TC=LLC/eLLC, LeCC=WB, LRUM=3, L3CC=WB */
-#define GEN9_MOCS 2
+#define GEN9_MOCS (2 << 1)
/* TC=LLC/eLLC, LeCC=WB, LRUM=3, L3CC=WB */
-#define GEN9_EXTERNAL_MOCS 1
+#define GEN9_EXTERNAL_MOCS (1 << 1)
/* Cannonlake MOCS defines are duplicates of Skylake MOCS defines. */
#define GEN10_MOCS GEN9_MOCS