All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH i-g-t] i915/gem_mocs_settings: Fudge gen11:vcs2 mocs register base
@ 2019-08-13 16:13 Chris Wilson
  2019-08-13 16:56 ` ✓ Fi.CI.BAT: success for " Patchwork
  2019-08-14  3:34 ` ✓ Fi.CI.IGT: " Patchwork
  0 siblings, 2 replies; 4+ messages in thread
From: Chris Wilson @ 2019-08-13 16:13 UTC (permalink / raw)
  To: intel-gfx

On gen11 CI, we have vcs2 available which has a different base to gen9
vcs1. Gloss over the discrepancy while a proper fix is sought.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111330
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/gem_mocs_settings.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/tests/i915/gem_mocs_settings.c b/tests/i915/gem_mocs_settings.c
index 3ad941491..06240877e 100644
--- a/tests/i915/gem_mocs_settings.c
+++ b/tests/i915/gem_mocs_settings.c
@@ -62,6 +62,7 @@ static const char * const test_modes[] = {
 #define GEN9_MFX0_MOCS_0	(0xc900)	/* Media 0 MOCS base register*/
 #define GEN9_MFX1_MOCS_0	(0xcA00)	/* Media 1 MOCS base register*/
 #define GEN9_VEBOX_MOCS_0	(0xcB00)	/* Video MOCS base register*/
+#define GEN11_MFX2_MOCS_0	(0x10000)
 #define GEN9_BLT_MOCS_0		(0xcc00)	/* Blitter MOCS base register*/
 #define GEN12_GLOBAL_MOCS	(0x4000)
 #define ICELAKE_MOCS_PTE	{0x00000004, 0x0030, 0x1}
@@ -216,12 +217,27 @@ static uint32_t get_engine_base(int fd, uint32_t engine)
 		return GEN12_GLOBAL_MOCS;
 
 	switch (engine) {
-	case LOCAL_I915_EXEC_BSD1:	return GEN9_MFX0_MOCS_0;
-	case LOCAL_I915_EXEC_BSD2:	return GEN9_MFX1_MOCS_0;
-	case I915_EXEC_RENDER:		return GEN9_GFX_MOCS_0;
-	case I915_EXEC_BLT:		return GEN9_BLT_MOCS_0;
-	case I915_EXEC_VEBOX:		return GEN9_VEBOX_MOCS_0;
-	default:			return 0;
+	case LOCAL_I915_EXEC_BSD1:
+		return GEN9_MFX0_MOCS_0;
+
+	case LOCAL_I915_EXEC_BSD2:
+		if (intel_gen(intel_get_drm_devid(fd)) >= 11)
+			/* i915_query to find correct HW base */
+			return GEN11_MFX2_MOCS_0;
+		else
+			return GEN9_MFX1_MOCS_0;
+
+	case I915_EXEC_RENDER:
+		return GEN9_GFX_MOCS_0;
+
+	case I915_EXEC_BLT:
+		return GEN9_BLT_MOCS_0;
+
+	case I915_EXEC_VEBOX:
+		return GEN9_VEBOX_MOCS_0;
+
+	default:
+		return 0;
 	}
 }
 
-- 
2.23.0.rc1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* ✓ Fi.CI.BAT: success for i915/gem_mocs_settings: Fudge gen11:vcs2 mocs register base
  2019-08-13 16:13 [PATCH i-g-t] i915/gem_mocs_settings: Fudge gen11:vcs2 mocs register base Chris Wilson
@ 2019-08-13 16:56 ` Patchwork
  2019-08-14  3:34 ` ✓ Fi.CI.IGT: " Patchwork
  1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2019-08-13 16:56 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: i915/gem_mocs_settings: Fudge gen11:vcs2 mocs register base
URL   : https://patchwork.freedesktop.org/series/65138/
State : success

== Summary ==

CI Bug Log - changes from IGT_5132 -> IGTPW_3342
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/65138/revisions/1/mbox/

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

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

### IGT changes ###

#### Issues hit ####

  * igt@kms_busy@basic-flip-b:
    - fi-icl-u3:          [PASS][1] -> [DMESG-WARN][2] ([fdo#107724])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/fi-icl-u3/igt@kms_busy@basic-flip-b.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/fi-icl-u3/igt@kms_busy@basic-flip-b.html

  * igt@kms_chamelium@hdmi-hpd-fast:
    - fi-icl-u2:          [PASS][3] -> [FAIL][4] ([fdo#109483])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html

  
#### Possible fixes ####

  * igt@gem_ctx_switch@legacy-render:
    - fi-bxt-dsi:         [INCOMPLETE][5] ([fdo#103927]) -> [PASS][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/fi-bxt-dsi/igt@gem_ctx_switch@legacy-render.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/fi-bxt-dsi/igt@gem_ctx_switch@legacy-render.html

  * igt@kms_chamelium@hdmi-hpd-fast:
    - fi-kbl-7567u:       [FAIL][7] ([fdo#109485]) -> [PASS][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/fi-kbl-7567u/igt@kms_chamelium@hdmi-hpd-fast.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/fi-kbl-7567u/igt@kms_chamelium@hdmi-hpd-fast.html

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

  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
  [fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
  [fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485


Participating hosts (54 -> 45)
------------------------------

  Additional (1): fi-skl-6770hq 
  Missing    (10): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-blb-e6850 fi-byt-clapper fi-bdw-samus fi-snb-2600 


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

  * IGT: IGT_5132 -> IGTPW_3342

  CI_DRM_6696: e9dffb84ec534faeafbcd7029ab6b58f3a3bc01e @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_3342: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/
  IGT_5132: eced11670da92bc338a162af6eeda39edd49cd12 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

* ✓ Fi.CI.IGT: success for i915/gem_mocs_settings: Fudge gen11:vcs2 mocs register base
  2019-08-13 16:13 [PATCH i-g-t] i915/gem_mocs_settings: Fudge gen11:vcs2 mocs register base Chris Wilson
  2019-08-13 16:56 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2019-08-14  3:34 ` Patchwork
  1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2019-08-14  3:34 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: i915/gem_mocs_settings: Fudge gen11:vcs2 mocs register base
URL   : https://patchwork.freedesktop.org/series/65138/
State : success

== Summary ==

CI Bug Log - changes from IGT_5132_full -> IGTPW_3342_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/65138/revisions/1/mbox/

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_eio@reset-stress:
    - shard-kbl:          [PASS][1] -> [FAIL][2] ([fdo#109661])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-kbl2/igt@gem_eio@reset-stress.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-kbl4/igt@gem_eio@reset-stress.html

  * igt@gem_exec_schedule@deep-bsd:
    - shard-iclb:         [PASS][3] -> [SKIP][4] ([fdo#111325]) +5 similar issues
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb7/igt@gem_exec_schedule@deep-bsd.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb2/igt@gem_exec_schedule@deep-bsd.html

  * igt@kms_flip@flip-vs-expired-vblank:
    - shard-glk:          [PASS][5] -> [FAIL][6] ([fdo#105363])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-glk3/igt@kms_flip@flip-vs-expired-vblank.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-glk1/igt@kms_flip@flip-vs-expired-vblank.html

  * igt@kms_flip@flip-vs-suspend:
    - shard-glk:          [PASS][7] -> [INCOMPLETE][8] ([fdo#103359] / [k.org#198133])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-glk9/igt@kms_flip@flip-vs-suspend.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-glk4/igt@kms_flip@flip-vs-suspend.html

  * igt@kms_psr@psr2_sprite_plane_move:
    - shard-iclb:         [PASS][9] -> [SKIP][10] ([fdo#109441]) +4 similar issues
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb7/igt@kms_psr@psr2_sprite_plane_move.html

  * igt@kms_vblank@pipe-a-ts-continuation-suspend:
    - shard-apl:          [PASS][11] -> [DMESG-WARN][12] ([fdo#108566]) +1 similar issue
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-apl2/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-apl5/igt@kms_vblank@pipe-a-ts-continuation-suspend.html

  * igt@prime_vgem@fence-wait-bsd2:
    - shard-iclb:         [PASS][13] -> [SKIP][14] ([fdo#109276]) +16 similar issues
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb2/igt@prime_vgem@fence-wait-bsd2.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb5/igt@prime_vgem@fence-wait-bsd2.html

  
#### Possible fixes ####

  * igt@gem_ctx_isolation@bcs0-s3:
    - shard-apl:          [DMESG-WARN][15] ([fdo#108566]) -> [PASS][16] +4 similar issues
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-apl4/igt@gem_ctx_isolation@bcs0-s3.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-apl3/igt@gem_ctx_isolation@bcs0-s3.html

  * igt@gem_ctx_isolation@vecs0-s3:
    - shard-kbl:          [DMESG-WARN][17] ([fdo#103313]) -> [PASS][18]
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-kbl2/igt@gem_ctx_isolation@vecs0-s3.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-kbl1/igt@gem_ctx_isolation@vecs0-s3.html

  * igt@gem_ctx_shared@exec-single-timeline-bsd:
    - shard-iclb:         [SKIP][19] ([fdo#110841]) -> [PASS][20]
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb4/igt@gem_ctx_shared@exec-single-timeline-bsd.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb7/igt@gem_ctx_shared@exec-single-timeline-bsd.html

  * igt@gem_exec_capture@capture-bsd:
    - shard-iclb:         [SKIP][21] ([fdo#111325]) -> [PASS][22]
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb2/igt@gem_exec_capture@capture-bsd.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb5/igt@gem_exec_capture@capture-bsd.html

  * igt@gem_exec_schedule@independent-bsd2:
    - shard-iclb:         [SKIP][23] ([fdo#109276]) -> [PASS][24] +14 similar issues
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb7/igt@gem_exec_schedule@independent-bsd2.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb4/igt@gem_exec_schedule@independent-bsd2.html

  * igt@kms_cursor_crc@pipe-b-cursor-size-change:
    - shard-glk:          [FAIL][25] ([fdo#103232]) -> [PASS][26]
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-glk6/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-glk9/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
    - shard-apl:          [FAIL][27] ([fdo#103232]) -> [PASS][28]
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-apl4/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-apl6/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
    - shard-kbl:          [FAIL][29] ([fdo#103232]) -> [PASS][30]
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-kbl3/igt@kms_cursor_crc@pipe-b-cursor-size-change.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-kbl6/igt@kms_cursor_crc@pipe-b-cursor-size-change.html

  * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
    - shard-hsw:          [FAIL][31] ([fdo#105767]) -> [PASS][32]
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-hsw6/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-hsw7/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
    - shard-apl:          [FAIL][33] ([fdo#103167]) -> [PASS][34]
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-apl3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-apl1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html

  * igt@kms_frontbuffer_tracking@fbc-stridechange:
    - shard-iclb:         [FAIL][35] ([fdo#103167]) -> [PASS][36] +6 similar issues
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-stridechange.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-stridechange.html

  * igt@kms_plane_lowres@pipe-a-tiling-x:
    - shard-iclb:         [FAIL][37] ([fdo#103166]) -> [PASS][38]
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb8/igt@kms_plane_lowres@pipe-a-tiling-x.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb7/igt@kms_plane_lowres@pipe-a-tiling-x.html

  * igt@kms_psr@psr2_cursor_blt:
    - shard-iclb:         [SKIP][39] ([fdo#109441]) -> [PASS][40] +2 similar issues
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb4/igt@kms_psr@psr2_cursor_blt.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html

  
#### Warnings ####

  * igt@gem_ctx_isolation@vcs1-nonpriv:
    - shard-iclb:         [SKIP][41] ([fdo#109276]) -> [FAIL][42] ([fdo#111329])
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb3/igt@gem_ctx_isolation@vcs1-nonpriv.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb1/igt@gem_ctx_isolation@vcs1-nonpriv.html

  * igt@gem_mocs_settings@mocs-reset-bsd2:
    - shard-iclb:         [FAIL][43] ([fdo#111330]) -> [SKIP][44] ([fdo#109276]) +1 similar issue
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5132/shard-iclb4/igt@gem_mocs_settings@mocs-reset-bsd2.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/shard-iclb6/igt@gem_mocs_settings@mocs-reset-bsd2.html

  
  [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
  [fdo#103313]: https://bugs.freedesktop.org/show_bug.cgi?id=103313
  [fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
  [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
  [fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
  [fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
  [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
  [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
  [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
  [k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133


Participating hosts (7 -> 6)
------------------------------

  Missing    (1): shard-skl 


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

  * IGT: IGT_5132 -> IGTPW_3342

  CI_DRM_6696: e9dffb84ec534faeafbcd7029ab6b58f3a3bc01e @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_3342: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/
  IGT_5132: eced11670da92bc338a162af6eeda39edd49cd12 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3342/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH i-g-t] i915/gem_mocs_settings: Fudge gen11:vcs2 mocs register base
@ 2019-08-13 16:13 Chris Wilson
  0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2019-08-13 16:13 UTC (permalink / raw)
  To: intel-gfx; +Cc: igt-dev

On gen11 CI, we have vcs2 available which has a different base to gen9
vcs1. Gloss over the discrepancy while a proper fix is sought.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111330
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/gem_mocs_settings.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/tests/i915/gem_mocs_settings.c b/tests/i915/gem_mocs_settings.c
index 3ad941491..06240877e 100644
--- a/tests/i915/gem_mocs_settings.c
+++ b/tests/i915/gem_mocs_settings.c
@@ -62,6 +62,7 @@ static const char * const test_modes[] = {
 #define GEN9_MFX0_MOCS_0	(0xc900)	/* Media 0 MOCS base register*/
 #define GEN9_MFX1_MOCS_0	(0xcA00)	/* Media 1 MOCS base register*/
 #define GEN9_VEBOX_MOCS_0	(0xcB00)	/* Video MOCS base register*/
+#define GEN11_MFX2_MOCS_0	(0x10000)
 #define GEN9_BLT_MOCS_0		(0xcc00)	/* Blitter MOCS base register*/
 #define GEN12_GLOBAL_MOCS	(0x4000)
 #define ICELAKE_MOCS_PTE	{0x00000004, 0x0030, 0x1}
@@ -216,12 +217,27 @@ static uint32_t get_engine_base(int fd, uint32_t engine)
 		return GEN12_GLOBAL_MOCS;
 
 	switch (engine) {
-	case LOCAL_I915_EXEC_BSD1:	return GEN9_MFX0_MOCS_0;
-	case LOCAL_I915_EXEC_BSD2:	return GEN9_MFX1_MOCS_0;
-	case I915_EXEC_RENDER:		return GEN9_GFX_MOCS_0;
-	case I915_EXEC_BLT:		return GEN9_BLT_MOCS_0;
-	case I915_EXEC_VEBOX:		return GEN9_VEBOX_MOCS_0;
-	default:			return 0;
+	case LOCAL_I915_EXEC_BSD1:
+		return GEN9_MFX0_MOCS_0;
+
+	case LOCAL_I915_EXEC_BSD2:
+		if (intel_gen(intel_get_drm_devid(fd)) >= 11)
+			/* i915_query to find correct HW base */
+			return GEN11_MFX2_MOCS_0;
+		else
+			return GEN9_MFX1_MOCS_0;
+
+	case I915_EXEC_RENDER:
+		return GEN9_GFX_MOCS_0;
+
+	case I915_EXEC_BLT:
+		return GEN9_BLT_MOCS_0;
+
+	case I915_EXEC_VEBOX:
+		return GEN9_VEBOX_MOCS_0;
+
+	default:
+		return 0;
 	}
 }
 
-- 
2.23.0.rc1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-08-14  3:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-13 16:13 [PATCH i-g-t] i915/gem_mocs_settings: Fudge gen11:vcs2 mocs register base Chris Wilson
2019-08-13 16:56 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-08-14  3:34 ` ✓ Fi.CI.IGT: " Patchwork
2019-08-13 16:13 [PATCH i-g-t] " Chris Wilson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.