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

Jeevan B
2022-12-20T04:44:14Z

Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
lib/igt_draw.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/igt_draw.c b/lib/igt_draw.c
index 975d65cd..e9b427f7 100644
--- a/lib/igt_draw.c
+++ b/lib/igt_draw.c
@@ -651,13 +651,16 @@ static struct intel_buf *create_buf(int fd, struct buf_ops *bops,
return buf;
}

+#define DG2_MOCS_UC_GO_MEM 2 /* MOCS index 0x1 */
+#define MTL_MOCS_UC_GO_MEM 10 /* MOCS index 0x5 */
+
static void draw_rect_blt(int fd, struct cmd_data *cmd_data,
struct buf_data *buf, struct rect *rect,
uint32_t tiling, uint32_t color)
{
struct intel_bb *ibb;
struct intel_buf *dst;
- int blt_cmd_len, blt_cmd_tiling, blt_cmd_depth;
+ int blt_cmd_len, blt_cmd_tiling, blt_cmd_depth, mocs_val;
uint32_t devid = intel_get_drm_devid(fd);
int gen = intel_gen(devid);
int pitch;
@@ -699,11 +702,15 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,
igt_assert(false);
}

+ if (IS_METEORLAKE(intel_get_drm_devid(fd)))
+ mocs_val = MTL_MOCS_UC_GO_MEM;
+ else
+ mocs_val = DG2_MOCS_UC_GO_MEM;
+
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 | mocs_val << 21 | (pitch-1));