Skip to contentSkip to conversation

lib/igt_draw: Change MOCS settings for MTL

PATCH In review Jeevan B 5 participants 12 messages Jan 13, 2023 – Jan 18, 2023 Library code

lore
Share & tools
lore

Jeevan B

author
#0 lore raw

cover lib/igt_draw: Change MOCS settings for MTL

On MTL, we want the table entry labelled "UC (GO:Mem)" which has index 5. This means that the MOCS value is 10.

v2: Add define for MOCS settings. (Lucas)
v3: Extending get_mocs_index and using get_mocs_index
to get mocs val. (Zbigniew)
v4: Spliting the patches as Fix and MTL changes.

Jeevan B (2):
lib/igt_draw: Use intel_get_uc_mocs to get MOCS value lib/igt_draw: Add MOCS values for MTL

 lib/i915/intel_mocs.c | 12 ++++++++----
 lib/igt_draw.c        |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)
Signature · 1 line
2.19.1
author
#1 lore raw

PATCH 1/2 lib/igt_draw: Use intel_get_uc_mocs to get MOCS value

Use intel_get_uc_mocs instead of hardcoding to get table entry.

---
 lib/igt_draw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
lib/igt_draw.c +2 -1
index 975d65cd..bfe9cd50 100644
@@ -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
@@ -703,7 +704,7 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,
 
 		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_uc_mocs(fd) << 21 | (pitch-1));
 		intel_bb_out(ibb, (rect->y << 16) | rect->x);
 		intel_bb_out(ibb, ((rect->y + rect->h) << 16) | (rect->x + rect->w));
 		intel_bb_emit_reloc_fenced(ibb, dst->handle, 0,
Signature · 1 line
2.19.1
author
#5 lore raw

PATCH 2/2 lib/igt_draw: Add MOCS values for MTL

In reply to Jeevan B

On MTL, we want the table entry labelled "UC (GO:Mem)" which has index 5. This means that the MOCS value is 10.

---
 lib/i915/intel_mocs.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
lib/i915/intel_mocs.c +8 -4
index df541ab0..95f0fbde 100644
@@ -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
@@ -32,13 +34,15 @@ static void get_mocs_index(int fd, struct drm_i915_mocs_index *mocs)
 	 * This helper function is providing current UC as well
 	 * as WB MOCS index based on platform.
 	 */
-	if (IS_DG1(devid)) {
-		mocs->uc_index = DG1_MOCS_UC_IDX;
-		mocs->wb_index = DG1_MOCS_WB_IDX;
+	if (IS_METEORLAKE(devid)) {
+		mocs->uc_index = MTL_MOCS_UC_IDX;
+		mocs->wb_index = MTL_MOCS_WB_IDX;
 	} else if (IS_DG2(devid)) {
 		mocs->uc_index = DG2_MOCS_UC_IDX;
 		mocs->wb_index = DG2_MOCS_WB_IDX;
-
+	} else if (IS_DG1(devid)) {
+		mocs->uc_index = DG1_MOCS_UC_IDX;
+		mocs->wb_index = DG1_MOCS_WB_IDX;
 	} else if (IS_GEN12(devid)) {
 		mocs->uc_index = GEN12_MOCS_UC_IDX;
 		mocs->wb_index = GEN12_MOCS_WB_IDX;
Signature · 1 line
2.19.1
#10 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for lib/igt_draw: Change MOCS settings for MTL (rev9)

In reply to Jeevan B
== Series Details ==

== Series Details ==

Series: lib/igt_draw: Change MOCS settings for MTL (rev9)
URL : https://patchwork.freedesktop.org/series/111958/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_12579 -> IGTPW_8335
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/index.html

Participating hosts (43 -> 42)
------------------------------

Additional (1): fi-bsw-kefka
Missing (2): fi-kbl-soraka fi-snb-2520m

Known issues
------------

Here are the changes found in IGTPW_8335 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@gt_lrc:
- fi-rkl-guc: [PASS][1] -> [INCOMPLETE][2] ([i915#4983])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/fi-rkl-guc/igt@i915_selftest@live@gt_lrc.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/fi-rkl-guc/igt@i915_selftest@live@gt_lrc.html

* igt@prime_vgem@basic-fence-flip:
- fi-bsw-kefka: NOTRUN -> [SKIP][3] ([fdo#109271]) +26 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/fi-bsw-kefka/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [DMESG-FAIL][4] ([i915#5334]) -> [PASS][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_selftest@live@requests:
- {bat-rpls-2}: [INCOMPLETE][6] ([i915#4983] / [i915#6257]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/bat-rpls-2/igt@i915_selftest@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/bat-rpls-2/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@slpc:
- {bat-adlp-6}: [DMESG-FAIL][8] ([i915#6367]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/bat-adlp-6/igt@i915_selftest@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/bat-adlp-6/igt@i915_selftest@[email protected]
- {bat-adln-1}: [DMESG-FAIL][10] ([i915#6997]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/bat-adln-1/igt@i915_selftest@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/bat-adln-1/igt@i915_selftest@[email protected]

#### Warnings ####

* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: [FAIL][12] ([fdo#103375]) -> [INCOMPLETE][13] ([i915#4817])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/fi-rkl-11600/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/fi-rkl-11600/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6257]: https://gitlab.freedesktop.org/drm/intel/issues/6257
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_7119 -> IGTPW_8335

CI-20190529: 20190529
CI_DRM_12579: f06110201eddf1835258ba2efebe6442682b5ed2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8335: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/index.html
IGT_7119: 1e6d24e6dfa42b22f950f7d5e436b8f9acf8747f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/index.html

#6 lore raw

Re: [igt-dev] [PATCH 2/2] lib/igt_draw: Add MOCS values for MTL

In reply to Jeevan B
Quoted 22 lines · Jeevan B

On MTL, we want the table entry labelled "UC (GO:Mem)" which has index 5. This means that the MOCS value is 10.

---
 lib/i915/intel_mocs.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
lib/i915/intel_mocs.c +2 -0
index df541ab0..95f0fbde 100644
@@ -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

lib/i915/intel_mocs.c static void get_mocs_index(int fd, struct drm_i915_mocs_index *mocs) · line 37

Quoted 6 lines
lib/i915/intel_mocs.c +0 -3
@@ -32,13 +34,15 @@ static void get_mocs_index(int fd, struct drm_i915_mocs_index *mocs)
 	 * This helper function is providing current UC as well
 	 * as WB MOCS index based on platform.
 	 */
-	if (IS_DG1(devid)) {
-		mocs->uc_index = DG1_MOCS_UC_IDX;
-		mocs->wb_index = DG1_MOCS_WB_IDX;

Is this reorder necessary? I would just add MTL else if condition (unless you'll convince me it makes sense).

--
Zbigniew

Quoted 16 lines
lib/i915/intel_mocs.c +6 -1
+	if (IS_METEORLAKE(devid)) {
+		mocs->uc_index = MTL_MOCS_UC_IDX;
+		mocs->wb_index = MTL_MOCS_WB_IDX;
 	} else if (IS_DG2(devid)) {
 		mocs->uc_index = DG2_MOCS_UC_IDX;
 		mocs->wb_index = DG2_MOCS_WB_IDX;
-
+	} else if (IS_DG1(devid)) {
+		mocs->uc_index = DG1_MOCS_UC_IDX;
+		mocs->wb_index = DG1_MOCS_WB_IDX;
 	} else if (IS_GEN12(devid)) {
 		mocs->uc_index = GEN12_MOCS_UC_IDX;
 		mocs->wb_index = GEN12_MOCS_WB_IDX;
Signature · 1 line
2.19.1
#9 lore raw

Re: [igt-dev] [PATCH 2/2] lib/igt_draw: Add MOCS values for MTL

In reply to Jeevan B
Quoted 2 lines · Jeevan B

On MTL, we want the table entry labelled "UC (GO:Mem)" which has index 5. This means that the MOCS value is 10.

I've noticed this is patch 2/2, I think it should be 1/2 (define MTL mocs case), then use it in the test.

--
Zbigniew

Quoted 42 lines
---
 lib/i915/intel_mocs.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
lib/i915/intel_mocs.c +8 -4
index df541ab0..95f0fbde 100644
@@ -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
@@ -32,13 +34,15 @@ static void get_mocs_index(int fd, struct drm_i915_mocs_index *mocs)
 	 * This helper function is providing current UC as well
 	 * as WB MOCS index based on platform.
 	 */
-	if (IS_DG1(devid)) {
-		mocs->uc_index = DG1_MOCS_UC_IDX;
-		mocs->wb_index = DG1_MOCS_WB_IDX;
+	if (IS_METEORLAKE(devid)) {
+		mocs->uc_index = MTL_MOCS_UC_IDX;
+		mocs->wb_index = MTL_MOCS_WB_IDX;
 	} else if (IS_DG2(devid)) {
 		mocs->uc_index = DG2_MOCS_UC_IDX;
 		mocs->wb_index = DG2_MOCS_WB_IDX;
-
+	} else if (IS_DG1(devid)) {
+		mocs->uc_index = DG1_MOCS_UC_IDX;
+		mocs->wb_index = DG1_MOCS_WB_IDX;
 	} else if (IS_GEN12(devid)) {
 		mocs->uc_index = GEN12_MOCS_UC_IDX;
 		mocs->wb_index = GEN12_MOCS_WB_IDX;
Signature · 1 line
2.19.1
Reviewed-by on v1 1/2
#2 lore raw

Re: [igt-dev] [PATCH 1/2] lib/igt_draw: Use intel_get_uc_mocs to get MOCS value

In reply to Jeevan B
Quoted 3 lines · Jeevan B

Use intel_get_uc_mocs instead of hardcoding to get table entry.

This should be patch 2/2. With this fixed:

--
Zbigniew

Quoted 28 lines
---
 lib/igt_draw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
lib/igt_draw.c +2 -1
index 975d65cd..bfe9cd50 100644
@@ -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
@@ -703,7 +704,7 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,
 
 		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_uc_mocs(fd) << 21 | (pitch-1));
 		intel_bb_out(ibb, (rect->y << 16) | rect->x);
 		intel_bb_out(ibb, ((rect->y + rect->h) << 16) | (rect->x + rect->w));
 		intel_bb_emit_reloc_fenced(ibb, dst->handle, 0,
Signature · 1 line
2.19.1
#11 lore raw

[igt-dev] ✗ Fi.CI.IGT: failure for lib/igt_draw: Change MOCS settings for MTL (rev9)

In reply to Jeevan B
== Series Details ==

== Series Details ==

Series: lib/igt_draw: Change MOCS settings for MTL (rev9)
URL : https://patchwork.freedesktop.org/series/111958/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_12579_full -> IGTPW_8335_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with IGTPW_8335_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in IGTPW_8335_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/index.html

Participating hosts (13 -> 9)
------------------------------

Missing (4): pig-skl-6260u pig-kbl-iris shard-tglu-9 pig-glk-j5005

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_8335_full:

### IGT changes ###

#### Possible regressions ####

* igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait:
- shard-apl: [PASS][1] -> [TIMEOUT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-apl2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl1/igt@[email protected]

Known issues
------------

Here are the changes found in IGTPW_8335_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_fair@basic-pace@vcs0:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#2842]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-glk5/igt@gem_exec_fair@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-glk9/igt@gem_exec_fair@[email protected]

* igt@gem_lmem_swapping@smem-oom:
- shard-apl: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl1/igt@[email protected]

* igt@gem_partial_pwrite_pread@writes-after-reads-snoop:
- shard-apl: [PASS][6] -> [INCOMPLETE][7] ([i915#7708] / [i915#7833])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-apl1/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl3/igt@[email protected]

* igt@gem_pwrite@basic-exhaustion:
- shard-apl: NOTRUN -> [WARN][8] ([i915#2658])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl2/igt@[email protected]

* igt@i915_selftest@live@gt_heartbeat:
- shard-apl: [PASS][9] -> [DMESG-FAIL][10] ([i915#5334])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-apl2/igt@i915_selftest@live@gt_heartbeat.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl6/igt@i915_selftest@live@gt_heartbeat.html

* igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#3886]) +4 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl7/igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs.html

* igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#3886])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-glk8/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_rc_ccs_cc.html

* igt@kms_chamelium_color@ctm-0-75:
- shard-apl: NOTRUN -> [SKIP][13] ([fdo#109271]) +110 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl7/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions:
- shard-apl: [PASS][14] -> [FAIL][15] ([i915#2346])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-apl3/igt@kms_cursor_legacy@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl1/igt@kms_cursor_legacy@[email protected]

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-glk: NOTRUN -> [FAIL][16] ([i915#4767])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-glk4/igt@[email protected]

* igt@kms_hdr@static-toggle-dpms:
- shard-glk: NOTRUN -> [SKIP][17] ([fdo#109271]) +36 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-glk4/igt@[email protected]

* igt@kms_psr2_sf@cursor-plane-update-sf:
- shard-glk: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#658])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-glk9/igt@[email protected]

* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:
- shard-apl: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#658]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl1/igt@[email protected]

#### Possible fixes ####

* igt@drm_fdinfo@most-busy-check-all@rcs0:
- {shard-rkl}: [FAIL][20] ([i915#7742]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-rkl-1/igt@drm_fdinfo@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-rkl-4/igt@drm_fdinfo@[email protected]

* igt@drm_read@short-buffer-nonblock:
- {shard-rkl}: [SKIP][22] ([i915#4098]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-rkl-3/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-rkl-6/igt@[email protected]

* igt@fbdev@info:
- {shard-rkl}: [SKIP][24] ([i915#2582]) -> [PASS][25] +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-rkl-3/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-rkl-1/igt@[email protected]

* igt@gem_caching@read-writes:
- shard-apl: [INCOMPLETE][26] ([i915#7708]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-apl2/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl7/igt@[email protected]

* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [FAIL][28] ([i915#2842]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-glk4/igt@gem_exec_fair@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-glk7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_reloc@basic-wc-read-noreloc:
- {shard-rkl}: [SKIP][30] ([i915#3281]) -> [PASS][31] +7 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-rkl-3/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-rkl-5/igt@[email protected]

* igt@gem_partial_pwrite_pread@writes-after-reads:
- {shard-rkl}: [SKIP][32] ([i915#3282]) -> [PASS][33] +2 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-rkl-1/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-rkl-5/igt@[email protected]

* igt@i915_pm_dc@dc9-dpms:
- shard-apl: [SKIP][34] ([fdo#109271]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-apl7/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-apl1/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-idle@rcs0:
- {shard-dg1}: [FAIL][36] ([i915#3591]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-dg1-15/igt@i915_pm_rc6_residency@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-dg1-12/igt@i915_pm_rc6_residency@[email protected]

* igt@i915_pm_rpm@modeset-non-lpsp-stress:
- {shard-dg1}: [SKIP][38] ([i915#1397]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-dg1-14/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-dg1-19/igt@[email protected]

* igt@i915_pm_rpm@pm-tiling:
- {shard-tglu}: [SKIP][40] ([i915#3547]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-tglu-6/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-tglu-5/igt@[email protected]

* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0:
- {shard-tglu}: [SKIP][42] ([i915#7651]) -> [PASS][43] +4 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-tglu-6/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-tglu-1/igt@[email protected]

* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ab-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][44] ([i915#79]) -> [PASS][45] +1 similar issue
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-glk3/igt@kms_flip@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-glk8/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-expired-vblank@b-vga1:
- shard-snb: [FAIL][46] ([i915#79]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-snb7/igt@kms_flip@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-snb4/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw:
- {shard-dg1}: [FAIL][48] -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-dg1-12/igt@[email protected]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-dg1-18/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- {shard-tglu}: [SKIP][50] ([i915#1849]) -> [PASS][51] +2 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-tglu-6/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-tglu-2/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-rgb101010-draw-pwrite:
- {shard-rkl}: [SKIP][52] ([i915#1849] / [i915#4098]) -> [PASS][53] +15 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-rkl-3/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-rkl-6/igt@[email protected]

* igt@kms_psr@cursor_plane_onoff:
- {shard-rkl}: [SKIP][54] ([i915#1072]) -> [PASS][55] +2 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-rkl-4/igt@kms_psr@cursor_plane_onoff.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-rkl-6/igt@kms_psr@cursor_plane_onoff.html

* igt@kms_pwrite_crc:
- {shard-rkl}: [SKIP][56] ([i915#1845] / [i915#4098]) -> [PASS][57] +16 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-rkl-1/igt@kms_pwrite_crc.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-rkl-6/igt@kms_pwrite_crc.html

* igt@kms_vblank@pipe-c-wait-forked:
- {shard-tglu}: [SKIP][58] ([i915#1845] / [i915#7651]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-tglu-6/igt@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-tglu-8/igt@[email protected]

* igt@perf@gen12-unprivileged-single-ctx-counters:
- {shard-rkl}: [SKIP][60] ([fdo#109289]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-rkl-5/igt@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-rkl-4/igt@[email protected]

* igt@perf_pmu@all-busy-idle-check-all:
- {shard-dg1}: [FAIL][62] ([i915#5234]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-dg1-12/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-dg1-17/igt@[email protected]

* igt@sysfs_heartbeat_interval@precise@vecs0:
- {shard-dg1}: [FAIL][64] ([i915#1755]) -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12579/shard-dg1-18/igt@sysfs_heartbeat_interval@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/shard-dg1-19/igt@sysfs_heartbeat_interval@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
[fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1722]: https://gitlab.freedesktop.org/drm/intel/issues/1722
[i915#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755
[i915#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1850]: https://gitlab.freedesktop.org/drm/intel/issues/1850
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2532]: https://gitlab.freedesktop.org/drm/intel/issues/2532
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3318]: https://gitlab.freedesktop.org/drm/intel/issues/3318
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3547]: https://gitlab.freedesktop.org/drm/intel/issues/3547
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3952]: https://gitlab.freedesktop.org/drm/intel/issues/3952
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4877]: https://gitlab.freedesktop.org/drm/intel/issues/4877
[i915#5030]: https://gitlab.freedesktop.org/drm/intel/issues/5030
[i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5234]: https://gitlab.freedesktop.org/drm/intel/issues/5234
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5327]: https://gitlab.freedesktop.org/drm/intel/issues/5327
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7037]: https://gitlab.freedesktop.org/drm/intel/issues/7037
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
[i915#7443]: https://gitlab.freedesktop.org/drm/intel/issues/7443
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7582]: https://gitlab.freedesktop.org/drm/intel/issues/7582
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7679]: https://gitlab.freedesktop.org/drm/intel/issues/7679
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7708]: https://gitlab.freedesktop.org/drm/intel/issues/7708
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7833]: https://gitlab.freedesktop.org/drm/intel/issues/7833
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_7119 -> IGTPW_8335
* Piglit: piglit_4509 -> None

CI-20190529: 20190529
CI_DRM_12579: f06110201eddf1835258ba2efebe6442682b5ed2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8335: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/index.html
IGT_7119: 1e6d24e6dfa42b22f950f7d5e436b8f9acf8747f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8335/index.html

Reviewed-by on v1 1/2
#3 lore raw

Re: [igt-dev] [PATCH 1/2] lib/igt_draw: Use intel_get_uc_mocs to get MOCS value

In reply to Jeevan B

Hi,

Quoted 20 lines · Jeevan B

Use intel_get_uc_mocs instead of hardcoding to get table entry.

---
 lib/igt_draw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
lib/igt_draw.c +1 -0
index 975d65cd..bfe9cd50 100644
@@ -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

lib/igt_draw.c static void draw_rect_blt(int fd, struct cmd_data *cmd_data, · line 706

Quoted 3 lines
lib/igt_draw.c +0 -0
@@ -703,7 +704,7 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,
 
 		intel_bb_out(ibb, XY_FAST_COLOR_BLT | blt_cmd_depth);
 		/* DG2 MOCS entry 2 is "UC - Non-Coherent; GO:Memory" */

---------------- ^
Please remove this old comment from here as after change it will start working for DG1 and other archs.

Btw this is independent from 2/2 and imho should be first.

Regards,

Quoted 8 lines
lib/igt_draw.c +1 -1
-		intel_bb_out(ibb, blt_cmd_tiling | 2 << 21 | (pitch-1));
+		intel_bb_out(ibb, blt_cmd_tiling | intel_get_uc_mocs(fd) << 21 | (pitch-1));
 		intel_bb_out(ibb, (rect->y << 16) | rect->x);
 		intel_bb_out(ibb, ((rect->y + rect->h) << 16) | (rect->x + rect->w));
 		intel_bb_emit_reloc_fenced(ibb, dst->handle, 0,
Signature · 1 line
2.19.1
author
#4 lore raw

Re: [igt-dev] [PATCH 1/2] lib/igt_draw: Use intel_get_uc_mocs to get MOCS value

Quoted 35 lines

-----Original Message-----
From: Kamil Konieczny <[email protected]>
Sent: Tuesday, January 17, 2023 12:45 AM
To: [email protected]
Cc: B, Jeevan <[email protected]>; Kempczynski, Zbigniew <[email protected]>; De Marchi, Lucas <[email protected]>; [email protected]
Subject: Re: [PATCH 1/2] lib/igt_draw: Use intel_get_uc_mocs to get MOCS value

Hi,

Quoted 22 lines · Jeevan B

Use intel_get_uc_mocs instead of hardcoding to get table entry.

---
 lib/igt_draw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
lib/igt_draw.c index 975d65cd..bfe9cd50 renamed from lib/igt_draw.c +0 -0

100644

lib/igt_draw.c +1 -0
@@ -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
@@ -703,7 +704,7 @@ static void draw_rect_blt(int fd, struct cmd_data
 *cmd_data,
 
Quoted 7 lines

lib/igt_draw.c static void draw_rect_blt(int fd, struct cmd_data *cmd_data, · line 706

Quoted 2 lines
lib/igt_draw.c +0 -0
 		intel_bb_out(ibb, XY_FAST_COLOR_BLT | blt_cmd_depth);
 		/* DG2 MOCS entry 2 is "UC - Non-Coherent; GO:Memory" */

---------------- ^
Please remove this old comment from here as after change it will start working for DG1 and other archs.

Btw this is independent from 2/2 and imho should be first.

Hi,

I agree with Kamil, This patch should be 1/2.

Thanks
Jeevan B

Quoted 15 lines

Regards,

lib/igt_draw.c static void draw_rect_blt(int fd, struct cmd_data · line 708

Quoted 2 lines
lib/igt_draw.c +1 -1
-		intel_bb_out(ibb, blt_cmd_tiling | 2 << 21 | (pitch-1));
+		intel_bb_out(ibb, blt_cmd_tiling | intel_get_uc_mocs(fd) << 21

|

Quoted 8 lines
lib/igt_draw.c +1 -0
+(pitch-1));
 		intel_bb_out(ibb, (rect->y << 16) | rect->x);
 		intel_bb_out(ibb, ((rect->y + rect->h) << 16) | (rect->x + rect-

w));
intel_bb_emit_reloc_fenced(ibb, dst->handle, 0,
--
2.19.1

author
#7 lore raw

Re: [igt-dev] [PATCH 2/2] lib/igt_draw: Add MOCS values for MTL

In reply to Zbigniew Kempczyński
Quoted 44 lines

-----Original Message-----
From: Kempczynski, Zbigniew <[email protected]>
Sent: Friday, January 13, 2023 5:01 PM
To: B, Jeevan <[email protected]>
Cc: [email protected]; De Marchi, Lucas <[email protected]>; [email protected]
Subject: Re: [PATCH 2/2] lib/igt_draw: Add MOCS values for MTL

lib/i915/intel_mocs.c static void get_mocs_index(int fd, struct

Quoted 22 lines · Jeevan B

On MTL, we want the table entry labelled "UC (GO:Mem)" which has index 5. This means that the MOCS value is 10.

---
 lib/i915/intel_mocs.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
lib/i915/intel_mocs.c index renamed from lib/i915/intel_mocs.c +0 -0

df541ab0..95f0fbde 100644

lib/i915/intel_mocs.c +2 -0
@@ -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
@@ -32,13 +34,15 @@ static void get_mocs_index(int fd, struct

drm_i915_mocs_index *mocs)

lib/i915/intel_mocs.c static void get_mocs_index(int fd, struct drm_i915_mocs_index *mocs) · line 37

Quoted 6 lines
lib/i915/intel_mocs.c +0 -3
 	 * This helper function is providing current UC as well
 	 * as WB MOCS index based on platform.
 	 */
-	if (IS_DG1(devid)) {
-		mocs->uc_index = DG1_MOCS_UC_IDX;
-		mocs->wb_index = DG1_MOCS_WB_IDX;

Is this reorder necessary? I would just add MTL else if condition (unless you'll convince me it makes sense).

Quoted 2 lines

--
Zbigniew

Hi Zbigniew,

convention is latest platform first,
MTL
DG2
DG1
GEN12
So I have reordered.

Thanks
Jeevan B

Quoted 17 lines
Quoted 17 lines
lib/i915/intel_mocs.c +6 -2
+	if (IS_METEORLAKE(devid)) {
+		mocs->uc_index = MTL_MOCS_UC_IDX;
+		mocs->wb_index = MTL_MOCS_WB_IDX;
 	} else if (IS_DG2(devid)) {
 		mocs->uc_index = DG2_MOCS_UC_IDX;
 		mocs->wb_index = DG2_MOCS_WB_IDX;
-
+	} else if (IS_DG1(devid)) {
+		mocs->uc_index = DG1_MOCS_UC_IDX;
+		mocs->wb_index = DG1_MOCS_WB_IDX;
 	} else if (IS_GEN12(devid)) {
 		mocs->uc_index = GEN12_MOCS_UC_IDX;
 		mocs->wb_index = GEN12_MOCS_WB_IDX;
--

2.19.1

#8 lore raw

Re: [igt-dev] [PATCH 2/2] lib/igt_draw: Add MOCS values for MTL

Quoted 46 lines · Jeevan
Quoted 44 lines

-----Original Message-----
From: Kempczynski, Zbigniew <[email protected]>
Sent: Friday, January 13, 2023 5:01 PM
To: B, Jeevan <[email protected]>
Cc: [email protected]; De Marchi, Lucas <[email protected]>; [email protected]
Subject: Re: [PATCH 2/2] lib/igt_draw: Add MOCS values for MTL

lib/i915/intel_mocs.c static void get_mocs_index(int fd, struct

Quoted 22 lines · Jeevan B

On MTL, we want the table entry labelled "UC (GO:Mem)" which has index 5. This means that the MOCS value is 10.

---
 lib/i915/intel_mocs.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
lib/i915/intel_mocs.c index renamed from lib/i915/intel_mocs.c +0 -0

df541ab0..95f0fbde 100644

lib/i915/intel_mocs.c +2 -0
@@ -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
@@ -32,13 +34,15 @@ static void get_mocs_index(int fd, struct

drm_i915_mocs_index *mocs)

lib/i915/intel_mocs.c static void get_mocs_index(int fd, struct drm_i915_mocs_index *mocs) · line 37

Quoted 6 lines
lib/i915/intel_mocs.c +0 -3
 	 * This helper function is providing current UC as well
 	 * as WB MOCS index based on platform.
 	 */
-	if (IS_DG1(devid)) {
-		mocs->uc_index = DG1_MOCS_UC_IDX;
-		mocs->wb_index = DG1_MOCS_WB_IDX;

Is this reorder necessary? I would just add MTL else if condition (unless you'll convince me it makes sense).

Quoted 2 lines

--
Zbigniew

Quoted 8 lines

Hi Zbigniew,

convention is latest platform first,
MTL
DG2
DG1
GEN12
So I have reordered.

yep, that is correct. Lately I've seen people merging patches not following this convention so we need to fix that up.

Lucas De Marchi

Quoted 21 lines

Thanks
Jeevan B

Quoted 17 lines
Quoted 17 lines
lib/i915/intel_mocs.c +6 -2
+	if (IS_METEORLAKE(devid)) {
+		mocs->uc_index = MTL_MOCS_UC_IDX;
+		mocs->wb_index = MTL_MOCS_WB_IDX;
 	} else if (IS_DG2(devid)) {
 		mocs->uc_index = DG2_MOCS_UC_IDX;
 		mocs->wb_index = DG2_MOCS_WB_IDX;
-
+	} else if (IS_DG1(devid)) {
+		mocs->uc_index = DG1_MOCS_UC_IDX;
+		mocs->wb_index = DG1_MOCS_WB_IDX;
 	} else if (IS_GEN12(devid)) {
 		mocs->uc_index = GEN12_MOCS_UC_IDX;
 		mocs->wb_index = GEN12_MOCS_WB_IDX;
--

2.19.1