iris: Fix BLORP vertex buffers to respect ISL MOCS settings

Fixes: a4da6008b6 ("iris: Use mocs from isl_dev.")
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3720>
(cherry picked from commit 4bac2fa3c6)
This commit is contained in:
Kenneth Graunke 2020-02-05 00:52:45 -08:00 committed by Dylan Baker
parent 23043719f7
commit d7f95b226b
2 changed files with 2 additions and 8 deletions

View file

@ -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"
},

View file

@ -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;