Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Zbigniew Kempczyński" <zbigniew.kempczynski@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: "Zbigniew Kempczyński" <zbigniew.kempczynski@intel.com>,
	"Juha-Pekka Heikkila" <juhapekka.heikkila@gmail.com>
Subject: [PATCH i-g-t] lib/intel_blt: Fix printing mocs on Xe2+
Date: Tue, 25 Jun 2024 11:18:47 +0200	[thread overview]
Message-ID: <20240625091847.134707-1-zbigniew.kempczynski@intel.com> (raw)

Due to different bit meanings dumping mocs indices displays incorrect
values for Xe2+. Fix this and print those indices according to platform.

Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
---
 lib/intel_blt.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/intel_blt.c b/lib/intel_blt.c
index 20c42eec14..a21df1e8cf 100644
--- a/lib/intel_blt.c
+++ b/lib/intel_blt.c
@@ -847,9 +847,18 @@ static void fill_data_ext(struct gen12_block_copy_data_ext *dext,
 	dext->dw21.src_array_index = ext->src.array_index;
 }
 
-static void dump_bb_cmd(struct gen12_block_copy_data *data)
+static void dump_bb_cmd(struct gen12_block_copy_data *data, unsigned int ip_ver)
 {
 	uint32_t *cmd = (uint32_t *) data;
+	int src_mocs_idx, dst_mocs_idx;
+
+	if (ip_ver >= IP_VER(20, 0)) {
+		src_mocs_idx = data->dw08_xe2.src_mocs_index;
+		dst_mocs_idx = data->dw01_xe2.dst_mocs_index;
+	} else {
+		src_mocs_idx = data->dw08.src_mocs_index;
+		dst_mocs_idx = data->dw01.dst_mocs_index;
+	}
 
 	igt_info("details:\n");
 	igt_info(" dw00: [%08x] <client: 0x%x, opcode: 0x%x, color depth: %d, "
@@ -860,7 +869,7 @@ static void dump_bb_cmd(struct gen12_block_copy_data *data)
 	igt_info(" dw01: [%08x] dst <pitch: %d, aux: %d, mocs_idx: %d, compr: %d, "
 		 "tiling: %d, ctrl surf type: %d>\n",
 		 cmd[1], data->dw01.dst_pitch, data->dw01.dst_aux_mode,
-		 data->dw01.dst_mocs_index, data->dw01.dst_compression,
+		 dst_mocs_idx, data->dw01.dst_compression,
 		 data->dw01.dst_tiling, data->dw01.dst_ctrl_surface_type);
 	igt_info(" dw02: [%08x] dst geom <x1: %d, y1: %d>\n",
 		 cmd[2], data->dw02.dst_x1, data->dw02.dst_y1);
@@ -878,7 +887,7 @@ static void dump_bb_cmd(struct gen12_block_copy_data *data)
 	igt_info(" dw08: [%08x] src <pitch: %d, aux: %d, mocs_idx: %d, compr: %d, "
 		 "tiling: %d, ctrl surf type: %d>\n",
 		 cmd[8], data->dw08.src_pitch, data->dw08.src_aux_mode,
-		 data->dw08.src_mocs_index, data->dw08.src_compression,
+		 src_mocs_idx, data->dw08.src_compression,
 		 data->dw08.src_tiling, data->dw08.src_ctrl_surface_type);
 	igt_info(" dw09: [%08x] src offset lo (0x%x)\n",
 		 cmd[9], data->dw09.src_address_lo);
@@ -1034,7 +1043,7 @@ uint64_t emit_blt_block_copy(int fd,
 			 ", bb offset: %" PRIx64 "\n",
 			 src_offset, dst_offset, bb_offset);
 
-		dump_bb_cmd(&data);
+		dump_bb_cmd(&data, ip_ver);
 		if (ext)
 			dump_bb_ext(&dext);
 	}
-- 
2.34.1


             reply	other threads:[~2024-06-25  9:18 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-25  9:18 Zbigniew Kempczyński [this message]
2024-06-25 10:05 ` [PATCH i-g-t] lib/intel_blt: Fix printing mocs on Xe2+ Juha-Pekka Heikkila
2024-06-25 11:29 ` ✓ CI.xeBAT: success for " Patchwork
2024-06-25 11:31 ` ✓ Fi.CI.BAT: " Patchwork
2024-06-25 13:44 ` ✗ CI.xeFULL: failure " Patchwork
2024-06-26 11:28   ` Kamil Konieczny
2024-06-26  9:18 ` ✗ Fi.CI.IGT: " Patchwork
2024-06-26 11:27   ` Kamil Konieczny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240625091847.134707-1-zbigniew.kempczynski@intel.com \
    --to=zbigniew.kempczynski@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=juhapekka.heikkila@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox