[igt-dev] [PATCH i-g-t] lib/xe_query: Recover original vram_* macros semantics

[igt-dev] [PATCH i-g-t] lib/xe_query: Recover original vram_* macros semantics

[Zbigniew Kempczyński]

On multi tile vram_possible() semantics was changed what was wrong
and must be recover.

Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
---
 lib/xe/xe_query.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c
index 1835232804..4598c0d5a1 100644
--- a/lib/xe/xe_query.c
+++ b/lib/xe/xe_query.c
@@ -356,13 +356,9 @@ uint64_t system_memory(int fd)
  */
 uint64_t vram_memory(int fd, int gt)
 {
-	struct xe_device *xe_dev;
-
-	xe_dev = find_in_cache(fd);
-	igt_assert(xe_dev);
-	igt_assert(gt >= 0 && gt < xe_dev->number_gt);
+	uint64_t regions = all_memory_regions(fd);
 
-	return native_region_for_gt(xe_dev->gts, gt);
+	return regions & (0x2 << gt);
 }
 
 /**
@@ -375,11 +371,10 @@ uint64_t vram_memory(int fd, int gt)
  */
 uint64_t vram_if_possible(int fd, int gt)
 {
-	uint64_t regions = all_memory_regions(fd);
-	uint64_t system_memory = regions & 0x1;
-	uint64_t vram = regions & (~0x1);
+	uint64_t smemory = system_memory(fd);
+	uint64_t vram = vram_memory(fd, gt);
 
-	return vram ? vram : system_memory;
+	return vram ? vram : smemory;
 }
 
 /**
-- 
2.34.1

[igt-dev] ✓ Fi.CI.BAT: success for lib/xe_query: Recover original vram_* macros semantics

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 2325 bytes --]

== Series Details ==

Series: lib/xe_query: Recover original vram_* macros semantics
URL   : https://patchwork.freedesktop.org/series/115409/
State : success

== Summary ==

CI Bug Log - changes from IGT_7208 -> IGTPW_8647
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

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

Participating hosts (35 -> 35)
------------------------------

  No changes in participating hosts

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_exec_suspend@basic-s3@smem:
    - bat-rpls-1:         NOTRUN -> [ABORT][1] ([i915#6687] / [i915#7978])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/bat-rpls-1/igt@gem_exec_suspend@basic-s3@smem.html

  
#### Possible fixes ####

  * igt@gem_exec_suspend@basic-s0@smem:
    - fi-rkl-11600:       [FAIL][2] ([fdo#103375]) -> [PASS][3]
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/fi-rkl-11600/igt@gem_exec_suspend@basic-s0@smem.html
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/fi-rkl-11600/igt@gem_exec_suspend@basic-s0@smem.html

  * igt@i915_selftest@live@reset:
    - bat-rpls-1:         [ABORT][4] ([i915#4983]) -> [PASS][5]
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/bat-rpls-1/igt@i915_selftest@live@reset.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/bat-rpls-1/igt@i915_selftest@live@reset.html

  
  [fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
  [i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
  [i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
  [i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978


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

  * CI: CI-20190529 -> None
  * IGT: IGT_7208 -> IGTPW_8647

  CI-20190529: 20190529
  CI_DRM_12883: 5619fa2b4a9b93019f6ca27a2f391fc39e152993 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_8647: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/index.html
  IGT_7208: f327c5d77b6ea6adff1ef6d08f21f232dfe093e3 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git

== Logs ==

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

[-- Attachment #2: Type: text/html, Size: 2970 bytes --]

[igt-dev] ✓ Fi.CI.IGT: success for lib/xe_query: Recover original vram_* macros semantics

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 22947 bytes --]

== Series Details ==

Series: lib/xe_query: Recover original vram_* macros semantics
URL   : https://patchwork.freedesktop.org/series/115409/
State : success

== Summary ==

CI Bug Log - changes from IGT_7208_full -> IGTPW_8647_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

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

Participating hosts (7 -> 8)
------------------------------

  Additional (1): shard-rkl0 

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

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

### IGT changes ###

#### Suppressed ####

  The following results come from untrusted machines, tests, or statuses.
  They do not affect the overall result.

  * igt@kms_ccs@pipe-c-bad-pixel-format-4_tiled_dg2_mc_ccs:
    - {shard-rkl}:        [SKIP][1] ([i915#4098]) -> [SKIP][2] +1 similar issue
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-2/igt@kms_ccs@pipe-c-bad-pixel-format-4_tiled_dg2_mc_ccs.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-6/igt@kms_ccs@pipe-c-bad-pixel-format-4_tiled_dg2_mc_ccs.html

  * igt@kms_ccs@pipe-d-bad-aux-stride-y_tiled_ccs:
    - {shard-rkl}:        [SKIP][3] ([i915#1845] / [i915#4098]) -> [SKIP][4] +9 similar issues
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-5/igt@kms_ccs@pipe-d-bad-aux-stride-y_tiled_ccs.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-6/igt@kms_ccs@pipe-d-bad-aux-stride-y_tiled_ccs.html

  * igt@kms_plane@plane-panning-bottom-right:
    - {shard-tglu}:       NOTRUN -> [SKIP][5] +2 similar issues
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-tglu-9/igt@kms_plane@plane-panning-bottom-right.html

  * igt@kms_plane@plane-position-hole-dpms:
    - {shard-rkl}:        NOTRUN -> [SKIP][6] +1 similar issue
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-1/igt@kms_plane@plane-position-hole-dpms.html

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_ctx_persistence@engines-hang:
    - shard-snb:          NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#1099])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-snb7/igt@gem_ctx_persistence@engines-hang.html

  * igt@gem_exec_fair@basic-pace-solo@rcs0:
    - shard-apl:          [PASS][8] -> [FAIL][9] ([i915#2842])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-apl2/igt@gem_exec_fair@basic-pace-solo@rcs0.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-apl7/igt@gem_exec_fair@basic-pace-solo@rcs0.html

  * igt@gem_exec_fair@basic-pace@vcs0:
    - shard-glk:          [PASS][10] -> [FAIL][11] ([i915#2842]) +2 similar issues
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-glk7/igt@gem_exec_fair@basic-pace@vcs0.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-glk1/igt@gem_exec_fair@basic-pace@vcs0.html

  * igt@gen9_exec_parse@allowed-single:
    - shard-apl:          [PASS][12] -> [ABORT][13] ([i915#5566])
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-apl6/igt@gen9_exec_parse@allowed-single.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-apl7/igt@gen9_exec_parse@allowed-single.html

  * igt@kms_big_fb@4-tiled-32bpp-rotate-90:
    - shard-snb:          NOTRUN -> [SKIP][14] ([fdo#109271]) +57 similar issues
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-snb4/igt@kms_big_fb@4-tiled-32bpp-rotate-90.html

  * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
    - shard-glk:          [PASS][15] -> [FAIL][16] ([i915#2346])
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-glk3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-glk9/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html

  
#### Possible fixes ####

  * igt@drm_fdinfo@idle@rcs0:
    - {shard-rkl}:        [FAIL][17] ([i915#7742]) -> [PASS][18] +1 similar issue
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-4/igt@drm_fdinfo@idle@rcs0.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-6/igt@drm_fdinfo@idle@rcs0.html

  * igt@fbdev@read:
    - {shard-rkl}:        [SKIP][19] ([i915#2582]) -> [PASS][20] +1 similar issue
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-4/igt@fbdev@read.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-6/igt@fbdev@read.html

  * igt@fbdev@write:
    - {shard-tglu}:       [SKIP][21] ([i915#2582]) -> [PASS][22]
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-tglu-10/igt@fbdev@write.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-tglu-2/igt@fbdev@write.html

  * igt@gem_eio@suspend:
    - {shard-rkl}:        [FAIL][23] ([i915#5115] / [i915#7052]) -> [PASS][24]
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-4/igt@gem_eio@suspend.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-1/igt@gem_eio@suspend.html

  * igt@gem_exec_fair@basic-pace-share@rcs0:
    - shard-apl:          [FAIL][25] ([i915#2842]) -> [PASS][26]
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-apl6/igt@gem_exec_fair@basic-pace-share@rcs0.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-apl3/igt@gem_exec_fair@basic-pace-share@rcs0.html

  * igt@gem_exec_reloc@basic-gtt-cpu:
    - {shard-rkl}:        [SKIP][27] ([i915#3281]) -> [PASS][28] +8 similar issues
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-3/igt@gem_exec_reloc@basic-gtt-cpu.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-5/igt@gem_exec_reloc@basic-gtt-cpu.html

  * igt@gem_softpin@noreloc-s3:
    - {shard-rkl}:        [FAIL][29] ([fdo#103375]) -> [PASS][30]
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-3/igt@gem_softpin@noreloc-s3.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-1/igt@gem_softpin@noreloc-s3.html

  * igt@gem_userptr_blits@forbidden-operations:
    - {shard-rkl}:        [SKIP][31] ([i915#3282]) -> [PASS][32] +4 similar issues
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-1/igt@gem_userptr_blits@forbidden-operations.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-5/igt@gem_userptr_blits@forbidden-operations.html

  * igt@gen9_exec_parse@unaligned-jump:
    - {shard-rkl}:        [SKIP][33] ([i915#2527]) -> [PASS][34] +1 similar issue
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-4/igt@gen9_exec_parse@unaligned-jump.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-5/igt@gen9_exec_parse@unaligned-jump.html

  * igt@i915_hangman@gt-engine-error@bcs0:
    - {shard-rkl}:        [SKIP][35] ([i915#6258]) -> [PASS][36]
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-5/igt@i915_hangman@gt-engine-error@bcs0.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-3/igt@i915_hangman@gt-engine-error@bcs0.html

  * igt@i915_pm_dc@dc9-dpms:
    - shard-apl:          [SKIP][37] ([fdo#109271]) -> [PASS][38]
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-apl6/igt@i915_pm_dc@dc9-dpms.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-apl3/igt@i915_pm_dc@dc9-dpms.html

  * igt@i915_pm_rpm@dpms-mode-unset-lpsp:
    - {shard-rkl}:        [SKIP][39] ([i915#1397]) -> [PASS][40]
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-3/igt@i915_pm_rpm@dpms-mode-unset-lpsp.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-6/igt@i915_pm_rpm@dpms-mode-unset-lpsp.html

  * igt@i915_pm_rpm@fences:
    - {shard-rkl}:        [SKIP][41] ([i915#1849]) -> [PASS][42]
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-1/igt@i915_pm_rpm@fences.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-6/igt@i915_pm_rpm@fences.html

  * igt@i915_pm_rpm@modeset-non-lpsp-stress:
    - {shard-dg1}:        [SKIP][43] ([i915#1397]) -> [PASS][44]
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-dg1-14/igt@i915_pm_rpm@modeset-non-lpsp-stress.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-dg1-17/igt@i915_pm_rpm@modeset-non-lpsp-stress.html

  * igt@i915_pm_rpm@pm-tiling:
    - {shard-rkl}:        [SKIP][45] ([fdo#109308]) -> [PASS][46]
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-4/igt@i915_pm_rpm@pm-tiling.html
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-6/igt@i915_pm_rpm@pm-tiling.html

  * igt@kms_ccs@pipe-a-crc-primary-basic-y_tiled_gen12_rc_ccs_cc:
    - {shard-tglu}:       [SKIP][47] ([i915#1845] / [i915#7651]) -> [PASS][48] +3 similar issues
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-tglu-9/igt@kms_ccs@pipe-a-crc-primary-basic-y_tiled_gen12_rc_ccs_cc.html
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-tglu-1/igt@kms_ccs@pipe-a-crc-primary-basic-y_tiled_gen12_rc_ccs_cc.html

  * igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs:
    - {shard-rkl}:        [SKIP][49] ([i915#1845] / [i915#4098]) -> [PASS][50] +25 similar issues
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-5/igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs.html
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-6/igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs.html

  * igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_gen12_rc_ccs:
    - {shard-tglu}:       [SKIP][51] ([i915#1845]) -> [PASS][52] +34 similar issues
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-tglu-10/igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_gen12_rc_ccs.html
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-tglu-1/igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_gen12_rc_ccs.html

  * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
    - shard-glk:          [FAIL][53] ([i915#2346]) -> [PASS][54]
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-glk7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-glk5/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html

  * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
    - shard-apl:          [FAIL][55] ([i915#2346]) -> [PASS][56]
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-apl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-apl1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html

  * igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
    - {shard-tglu}:       [SKIP][57] ([i915#1849]) -> [PASS][58] +7 similar issues
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-tglu-9/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite.html
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-tglu-5/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite.html

  * igt@kms_frontbuffer_tracking@fbc-shrfb-scaledprimary:
    - {shard-rkl}:        [SKIP][59] ([i915#1849] / [i915#4098]) -> [PASS][60] +11 similar issues
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-1/igt@kms_frontbuffer_tracking@fbc-shrfb-scaledprimary.html
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-6/igt@kms_frontbuffer_tracking@fbc-shrfb-scaledprimary.html

  * igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes:
    - shard-snb:          [INCOMPLETE][61] -> [PASS][62]
   [61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-snb5/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes.html
   [62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-snb4/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes.html

  * igt@kms_psr@cursor_mmap_cpu:
    - {shard-rkl}:        [SKIP][63] ([i915#1072]) -> [PASS][64] +2 similar issues
   [63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-3/igt@kms_psr@cursor_mmap_cpu.html
   [64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-6/igt@kms_psr@cursor_mmap_cpu.html

  * igt@perf@gen12-oa-tlb-invalidate:
    - {shard-rkl}:        [SKIP][65] ([fdo#109289]) -> [PASS][66]
   [65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7208/shard-rkl-5/igt@perf@gen12-oa-tlb-invalidate.html
   [66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/shard-rkl-1/igt@perf@gen12-oa-tlb-invalidate.html

  
  {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#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
  [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
  [fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
  [fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
  [fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
  [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#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#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
  [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
  [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
  [i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
  [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#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#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
  [i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
  [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#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
  [i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
  [i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
  [i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
  [i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
  [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#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
  [i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
  [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#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#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
  [i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
  [i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
  [i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
  [i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
  [i915#3938]: https://gitlab.freedesktop.org/drm/intel/issues/3938
  [i915#3952]: https://gitlab.freedesktop.org/drm/intel/issues/3952
  [i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
  [i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
  [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#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
  [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#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
  [i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
  [i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
  [i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
  [i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
  [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#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771
  [i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
  [i915#4818]: https://gitlab.freedesktop.org/drm/intel/issues/4818
  [i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
  [i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
  [i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
  [i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
  [i915#4879]: https://gitlab.freedesktop.org/drm/intel/issues/4879
  [i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
  [i915#4958]: https://gitlab.freedesktop.org/drm/intel/issues/4958
  [i915#5115]: https://gitlab.freedesktop.org/drm/intel/issues/5115
  [i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122
  [i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
  [i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
  [i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
  [i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
  [i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
  [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
  [i915#5431]: https://gitlab.freedesktop.org/drm/intel/issues/5431
  [i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
  [i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
  [i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
  [i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
  [i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
  [i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
  [i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
  [i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
  [i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
  [i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252
  [i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258
  [i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
  [i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
  [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
  [i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
  [i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
  [i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
  [i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
  [i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
  [i915#7037]: https://gitlab.freedesktop.org/drm/intel/issues/7037
  [i915#7052]: https://gitlab.freedesktop.org/drm/intel/issues/7052
  [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#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
  [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#7949]: https://gitlab.freedesktop.org/drm/intel/issues/7949
  [i915#7957]: https://gitlab.freedesktop.org/drm/intel/issues/7957
  [i915#8152]: https://gitlab.freedesktop.org/drm/intel/issues/8152
  [i915#8154]: https://gitlab.freedesktop.org/drm/intel/issues/8154
  [i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
  [i915#8228]: https://gitlab.freedesktop.org/drm/intel/issues/8228
  [i915#8282]: https://gitlab.freedesktop.org/drm/intel/issues/8282


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

  * CI: CI-20190529 -> None
  * IGT: IGT_7208 -> IGTPW_8647

  CI-20190529: 20190529
  CI_DRM_12883: 5619fa2b4a9b93019f6ca27a2f391fc39e152993 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_8647: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8647/index.html
  IGT_7208: f327c5d77b6ea6adff1ef6d08f21f232dfe093e3 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git

== Logs ==

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

[-- Attachment #2: Type: text/html, Size: 17631 bytes --]

Re: [igt-dev] [PATCH i-g-t] lib/xe_query: Recover original vram_* macros semantics

[Matthew Brost]

On Mon, Mar 20, 2023 at 05:32:59PM +0100, Zbigniew Kempczyński wrote:
> On multi tile vram_possible() semantics was changed what was wrong
> and must be recover.
> 
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>

This works for now to fix PVC and all current platforms but at some
point this will break if media GTs have VRAM.

Let's properly fix this in a follow up but for now this works.

With that:
Reviewed-by: Matthew Brost <matthew.brost@intel.com>

> ---
>  lib/xe/xe_query.c | 15 +++++----------
>  1 file changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c
> index 1835232804..4598c0d5a1 100644
> --- a/lib/xe/xe_query.c
> +++ b/lib/xe/xe_query.c
> @@ -356,13 +356,9 @@ uint64_t system_memory(int fd)
>   */
>  uint64_t vram_memory(int fd, int gt)
>  {
> -	struct xe_device *xe_dev;
> -
> -	xe_dev = find_in_cache(fd);
> -	igt_assert(xe_dev);
> -	igt_assert(gt >= 0 && gt < xe_dev->number_gt);
> +	uint64_t regions = all_memory_regions(fd);
>  
> -	return native_region_for_gt(xe_dev->gts, gt);
> +	return regions & (0x2 << gt);
>  }
>  
>  /**
> @@ -375,11 +371,10 @@ uint64_t vram_memory(int fd, int gt)
>   */
>  uint64_t vram_if_possible(int fd, int gt)
>  {
> -	uint64_t regions = all_memory_regions(fd);
> -	uint64_t system_memory = regions & 0x1;
> -	uint64_t vram = regions & (~0x1);
> +	uint64_t smemory = system_memory(fd);
> +	uint64_t vram = vram_memory(fd, gt);
>  
> -	return vram ? vram : system_memory;
> +	return vram ? vram : smemory;
>  }
>  
>  /**
> -- 
> 2.34.1
> 

Re: [igt-dev] [PATCH i-g-t] lib/xe_query: Recover original vram_* macros semantics

[Matthew Brost]

On Wed, Mar 22, 2023 at 05:05:46AM +0000, Matthew Brost wrote:
> On Mon, Mar 20, 2023 at 05:32:59PM +0100, Zbigniew Kempczyński wrote:
> > On multi tile vram_possible() semantics was changed what was wrong
> > and must be recover.
> > 
> > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> > Cc: Matthew Brost <matthew.brost@intel.com>
> 
> This works for now to fix PVC and all current platforms but at some
> point this will break if media GTs have VRAM.
> 
> Let's properly fix this in a follow up but for now this works.
> 
> With that:
> Reviewed-by: Matthew Brost <matthew.brost@intel.com>
> 

Actually, let's just fix this properly... This should do it:

diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c
index a6926057..b80df61f 100644
--- a/lib/xe/xe_query.c
+++ b/lib/xe/xe_query.c
@@ -361,7 +361,8 @@ uint64_t vram_memory(int fd, int gt)
        igt_assert(xe_dev);
        igt_assert(gt >= 0 && gt < xe_dev->number_gt);

-       return native_region_for_gt(xe_dev->gts, gt);
+       return xe_has_vram(fd) ?
+               native_region_for_gt(xe_dev->gts, gt) : 0;
 }

 /**
@@ -374,11 +375,7 @@ uint64_t vram_memory(int fd, int gt)
  */
 uint64_t vram_if_possible(int fd, int gt)
 {
-       uint64_t regions = all_memory_regions(fd);
-       uint64_t system_memory = regions & 0x1;
-       uint64_t vram = regions & (~0x1);
-
-       return vram ? vram : system_memory;
+       return vram_memory(fd, gt) ? vram_memory(fd, gt) : system_memory(fd);
 }

 /**

Matt

> > ---
> >  lib/xe/xe_query.c | 15 +++++----------
> >  1 file changed, 5 insertions(+), 10 deletions(-)
> > 
> > diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c
> > index 1835232804..4598c0d5a1 100644
> > --- a/lib/xe/xe_query.c
> > +++ b/lib/xe/xe_query.c
> > @@ -356,13 +356,9 @@ uint64_t system_memory(int fd)
> >   */
> >  uint64_t vram_memory(int fd, int gt)
> >  {
> > -	struct xe_device *xe_dev;
> > -
> > -	xe_dev = find_in_cache(fd);
> > -	igt_assert(xe_dev);
> > -	igt_assert(gt >= 0 && gt < xe_dev->number_gt);
> > +	uint64_t regions = all_memory_regions(fd);
> >  
> > -	return native_region_for_gt(xe_dev->gts, gt);
> > +	return regions & (0x2 << gt);
> >  }
> >  
> >  /**
> > @@ -375,11 +371,10 @@ uint64_t vram_memory(int fd, int gt)
> >   */
> >  uint64_t vram_if_possible(int fd, int gt)
> >  {
> > -	uint64_t regions = all_memory_regions(fd);
> > -	uint64_t system_memory = regions & 0x1;
> > -	uint64_t vram = regions & (~0x1);
> > +	uint64_t smemory = system_memory(fd);
> > +	uint64_t vram = vram_memory(fd, gt);
> >  
> > -	return vram ? vram : system_memory;
> > +	return vram ? vram : smemory;
> >  }
> >  
> >  /**
> > -- 
> > 2.34.1
> > 

Re: [igt-dev] [PATCH i-g-t] lib/xe_query: Recover original vram_* macros semantics

[Zbigniew Kempczyński]

On Wed, Mar 22, 2023 at 05:16:06AM +0000, Matthew Brost wrote:
> On Wed, Mar 22, 2023 at 05:05:46AM +0000, Matthew Brost wrote:
> > On Mon, Mar 20, 2023 at 05:32:59PM +0100, Zbigniew Kempczyński wrote:
> > > On multi tile vram_possible() semantics was changed what was wrong
> > > and must be recover.
> > > 
> > > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> > > Cc: Matthew Brost <matthew.brost@intel.com>
> > 
> > This works for now to fix PVC and all current platforms but at some
> > point this will break if media GTs have VRAM.
> > 
> > Let's properly fix this in a follow up but for now this works.
> > 
> > With that:
> > Reviewed-by: Matthew Brost <matthew.brost@intel.com>
> > 
> 
> Actually, let's just fix this properly... This should do it:
> 
> diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c
> index a6926057..b80df61f 100644
> --- a/lib/xe/xe_query.c
> +++ b/lib/xe/xe_query.c
> @@ -361,7 +361,8 @@ uint64_t vram_memory(int fd, int gt)
>         igt_assert(xe_dev);
>         igt_assert(gt >= 0 && gt < xe_dev->number_gt);
> 
> -       return native_region_for_gt(xe_dev->gts, gt);
> +       return xe_has_vram(fd) ?
> +               native_region_for_gt(xe_dev->gts, gt) : 0;
>  }
> 
>  /**
> @@ -374,11 +375,7 @@ uint64_t vram_memory(int fd, int gt)
>   */
>  uint64_t vram_if_possible(int fd, int gt)
>  {
> -       uint64_t regions = all_memory_regions(fd);
> -       uint64_t system_memory = regions & 0x1;
> -       uint64_t vram = regions & (~0x1);
> -
> -       return vram ? vram : system_memory;
> +       return vram_memory(fd, gt) ? vram_memory(fd, gt) : system_memory(fd);

Why calling vram_memory() twice?

	vram = vram_memory(fd, gt);
	return vram ? vram : system_memory(fd);

Fix is yours, please resend the patch.

--
Zbigniew

>  }
> 
>  /**
> 
> Matt
> 
> > > ---
> > >  lib/xe/xe_query.c | 15 +++++----------
> > >  1 file changed, 5 insertions(+), 10 deletions(-)
> > > 
> > > diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c
> > > index 1835232804..4598c0d5a1 100644
> > > --- a/lib/xe/xe_query.c
> > > +++ b/lib/xe/xe_query.c
> > > @@ -356,13 +356,9 @@ uint64_t system_memory(int fd)
> > >   */
> > >  uint64_t vram_memory(int fd, int gt)
> > >  {
> > > -	struct xe_device *xe_dev;
> > > -
> > > -	xe_dev = find_in_cache(fd);
> > > -	igt_assert(xe_dev);
> > > -	igt_assert(gt >= 0 && gt < xe_dev->number_gt);
> > > +	uint64_t regions = all_memory_regions(fd);
> > >  
> > > -	return native_region_for_gt(xe_dev->gts, gt);
> > > +	return regions & (0x2 << gt);
> > >  }
> > >  
> > >  /**
> > > @@ -375,11 +371,10 @@ uint64_t vram_memory(int fd, int gt)
> > >   */
> > >  uint64_t vram_if_possible(int fd, int gt)
> > >  {
> > > -	uint64_t regions = all_memory_regions(fd);
> > > -	uint64_t system_memory = regions & 0x1;
> > > -	uint64_t vram = regions & (~0x1);
> > > +	uint64_t smemory = system_memory(fd);
> > > +	uint64_t vram = vram_memory(fd, gt);
> > >  
> > > -	return vram ? vram : system_memory;
> > > +	return vram ? vram : smemory;
> > >  }
> > >  
> > >  /**
> > > -- 
> > > 2.34.1
> > > 

[igt-dev] ✗ Fi.CI.BUILD: failure for lib/xe_query: Recover original vram_* macros semantics (rev2)

[Patchwork]

== Series Details ==

Series: lib/xe_query: Recover original vram_* macros semantics (rev2)
URL   : https://patchwork.freedesktop.org/series/115409/
State : failure

== Summary ==

Applying: lib/xe_query: Recover original vram_* macros semantics
Using index info to reconstruct a base tree...
M	lib/xe/xe_query.c
Patch failed at 0001 lib/xe_query: Recover original vram_* macros semantics
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".