[igt-dev] [PATCH i-g-t v3] lib/igt_draw: Change MOCS settings for MTL

Jeevan B
2022-12-22T09:42:50Z

v3: Extending get_mocs_index and using get_mocs_index
to get mocs val. (Zbigniew)

Signed-off-by: Jeevan B <jeevan.b@intel.com>
---
lib/i915/intel_mocs.c | 6 +++++-
lib/igt_draw.c | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/i915/intel_mocs.c b/lib/i915/intel_mocs.c
index df541ab0..d2994480 100644
--- a/lib/i915/intel_mocs.c
+++ b/lib/i915/intel_mocs.c
@@ -11,6 +11,8 @@
#define DG1_MOCS_WB_IDX 5
#define DG2_MOCS_UC_IDX 1
#define DG2_MOCS_WB_IDX 3
+#define MTL_MOCS_UC_IDX 5
+#define MTL_MOCS_WB_IDX 10
#define GEN12_MOCS_UC_IDX 3
#define GEN12_MOCS_WB_IDX 2
#define XY_BLOCK_COPY_BLT_MOCS_SHIFT 21
@@ -38,7 +40,9 @@ static void get_mocs_index(int fd, struct drm_i915_mocs_index *mocs)
} else if (IS_DG2(devid)) {
mocs->uc_index = DG2_MOCS_UC_IDX;
mocs->wb_index = DG2_MOCS_WB_IDX;
-
+ } else if (IS_METEORLAKE(devid)) {
+ mocs->uc_index = MTL_MOCS_UC_IDX;
+ mocs->wb_index = MTL_MOCS_WB_IDX;
} else if (IS_GEN12(devid)) {
mocs->uc_index = GEN12_MOCS_UC_IDX;
mocs->wb_index = GEN12_MOCS_WB_IDX;
diff --git a/lib/igt_draw.c b/lib/igt_draw.c
index 975d65cd..b02ad2a8 100644
--- a/lib/igt_draw.c
+++ b/lib/igt_draw.c
@@ -36,6 +36,7 @@
#include "i830_reg.h"
#include "i915/gem_create.h"
#include "i915/gem_mman.h"
+#include "i915/intel_mocs.h"

#ifndef PAGE_ALIGN
#ifndef PAGE_SIZE
@@ -702,8 +703,7 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,
pitch = tiling ? buf->stride / 4 : buf->stride;

intel_bb_out(ibb, XY_FAST_COLOR_BLT | blt_cmd_depth);
- /* DG2 MOCS entry 2 is "UC - Non-Coherent; GO:Memory" */
- intel_bb_out(ibb, blt_cmd_tiling | 2 << 21 | (pitch-1));
+ intel_bb_out(ibb, blt_cmd_tiling | intel_get_wb_mocs(fd) << 21 | (pitch-1));