Mesa (staging/20.0): iris: Fix BLORP vertex buffers to respect ISL MOCS settings

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: d7f95b226b51142bc1cb6f327c5c0de8c30ac282
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d7f95b226b51142bc1cb6f327c5c0de8c30ac282

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed Feb  5 00:52:45 2020 -0800

iris: Fix BLORP vertex buffers to respect ISL MOCS settings

Fixes: a4da6008b6a ("iris: Use mocs from isl_dev.")
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3720>
(cherry picked from commit 4bac2fa3c6d30537e444c555f182abd9c739cfd4)

---

 .pick_status.json                     | 2 +-
 src/gallium/drivers/iris/iris_blorp.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2cd238320e8..15ce5a1cd9b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -301,7 +301,7 @@
         "description": "iris: Fix BLORP vertex buffers to respect ISL MOCS settings",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "a4da6008b6a0d8876eaf5a67c95d88038bbf35e6"
     },
diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c
index e3584e22549..ec08c25019d 100644
--- a/src/gallium/drivers/iris/iris_blorp.c
+++ b/src/gallium/drivers/iris/iris_blorp.c
@@ -46,12 +46,6 @@
 #define BLORP_USE_SOFTPIN
 #include "blorp/blorp_genX_exec.h"
 
-#if GEN_GEN == 8
-#define MOCS_WB 0x78
-#else
-#define MOCS_WB (2 << 1)
-#endif
-
 static uint32_t *
 stream_state(struct iris_batch *batch,
              struct u_upload_mgr *uploader,
@@ -189,7 +183,7 @@ blorp_alloc_vertex_buffer(struct blorp_batch *blorp_batch,
    *addr = (struct blorp_address) {
       .buffer = bo,
       .offset = offset,
-      .mocs = MOCS_WB,
+      .mocs = iris_mocs(bo, &batch->screen->isl_dev),
    };
 
    return map;