* [igt-dev] [PATCH i-g-t 2/2] xe_debugfs: Remove guc_enable check.
2023-07-25 20:56 [igt-dev] [PATCH i-g-t 1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC Rodrigo Vivi
@ 2023-07-25 20:56 ` Rodrigo Vivi
2023-07-26 10:14 ` Kamil Konieczny
2023-07-25 22:03 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC Patchwork
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Rodrigo Vivi @ 2023-07-25 20:56 UTC (permalink / raw)
To: igt-dev; +Cc: intel-xe, Rodrigo Vivi
drm-xe-next commit "drm/xe: Invert guc vs execlists parameters and info.")
inverted the param to expose the status of the non-default config.
And commit ("drm/xe/uapi: Remove XE_QUERY_CONFIG_FLAGS_USE_GUC")
entirely removed the query check.
So, let's simply stop doing this debugfs check here.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
tests/xe/xe_debugfs.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/tests/xe/xe_debugfs.c b/tests/xe/xe_debugfs.c
index 5e16a71a0..5434d4645 100644
--- a/tests/xe/xe_debugfs.c
+++ b/tests/xe/xe_debugfs.c
@@ -104,10 +104,6 @@ test_base(int fd, struct drm_xe_query_config *config)
igt_assert(igt_debugfs_search(fd, "info", reference));
- sprintf(reference, "enable_guc %s", config->info[XE_QUERY_CONFIG_FLAGS] &
- XE_QUERY_CONFIG_FLAGS_USE_GUC ? "yes" : "no");
- igt_assert(igt_debugfs_search(fd, "info", reference));
-
sprintf(reference, "tile_count %lld", config->info[XE_QUERY_CONFIG_GT_COUNT]);
igt_assert(igt_debugfs_search(fd, "info", reference));
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [igt-dev] [PATCH i-g-t 2/2] xe_debugfs: Remove guc_enable check.
2023-07-25 20:56 ` [igt-dev] [PATCH i-g-t 2/2] xe_debugfs: Remove guc_enable check Rodrigo Vivi
@ 2023-07-26 10:14 ` Kamil Konieczny
2023-07-26 14:23 ` [igt-dev] [Intel-xe] " Rodrigo Vivi
0 siblings, 1 reply; 7+ messages in thread
From: Kamil Konieczny @ 2023-07-26 10:14 UTC (permalink / raw)
To: igt-dev; +Cc: intel-xe, Rodrigo Vivi
Hi Rodrigo,
On 2023-07-25 at 16:56:25 -0400, Rodrigo Vivi wrote:
> drm-xe-next commit "drm/xe: Invert guc vs execlists parameters and info.")
> inverted the param to expose the status of the non-default config.
>
> And commit ("drm/xe/uapi: Remove XE_QUERY_CONFIG_FLAGS_USE_GUC")
> entirely removed the query check.
>
> So, let's simply stop doing this debugfs check here.
>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
I am sorry, please drop my reply for 1/2 because separate 2/2 patch
break incremental compile, so merge all this into one commit.
With that you can add my r-b tag.
Regards,
Kamil
> ---
> tests/xe/xe_debugfs.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/tests/xe/xe_debugfs.c b/tests/xe/xe_debugfs.c
> index 5e16a71a0..5434d4645 100644
> --- a/tests/xe/xe_debugfs.c
> +++ b/tests/xe/xe_debugfs.c
> @@ -104,10 +104,6 @@ test_base(int fd, struct drm_xe_query_config *config)
>
> igt_assert(igt_debugfs_search(fd, "info", reference));
>
> - sprintf(reference, "enable_guc %s", config->info[XE_QUERY_CONFIG_FLAGS] &
> - XE_QUERY_CONFIG_FLAGS_USE_GUC ? "yes" : "no");
> - igt_assert(igt_debugfs_search(fd, "info", reference));
> -
> sprintf(reference, "tile_count %lld", config->info[XE_QUERY_CONFIG_GT_COUNT]);
> igt_assert(igt_debugfs_search(fd, "info", reference));
>
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [igt-dev] [Intel-xe] [PATCH i-g-t 2/2] xe_debugfs: Remove guc_enable check.
2023-07-26 10:14 ` Kamil Konieczny
@ 2023-07-26 14:23 ` Rodrigo Vivi
0 siblings, 0 replies; 7+ messages in thread
From: Rodrigo Vivi @ 2023-07-26 14:23 UTC (permalink / raw)
To: Kamil Konieczny, igt-dev, intel-xe, Matthew Auld
On Wed, Jul 26, 2023 at 12:14:31PM +0200, Kamil Konieczny wrote:
> Hi Rodrigo,
>
> On 2023-07-25 at 16:56:25 -0400, Rodrigo Vivi wrote:
> > drm-xe-next commit "drm/xe: Invert guc vs execlists parameters and info.")
> > inverted the param to expose the status of the non-default config.
> >
> > And commit ("drm/xe/uapi: Remove XE_QUERY_CONFIG_FLAGS_USE_GUC")
> > entirely removed the query check.
> >
> > So, let's simply stop doing this debugfs check here.
> >
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> I am sorry, please drop my reply for 1/2 because separate 2/2 patch
> break incremental compile, so merge all this into one commit.
>
> With that you can add my r-b tag.
Thank you both for the reviews. I squashed both patches together and pushed.
>
> Regards,
> Kamil
>
> > ---
> > tests/xe/xe_debugfs.c | 4 ----
> > 1 file changed, 4 deletions(-)
> >
> > diff --git a/tests/xe/xe_debugfs.c b/tests/xe/xe_debugfs.c
> > index 5e16a71a0..5434d4645 100644
> > --- a/tests/xe/xe_debugfs.c
> > +++ b/tests/xe/xe_debugfs.c
> > @@ -104,10 +104,6 @@ test_base(int fd, struct drm_xe_query_config *config)
> >
> > igt_assert(igt_debugfs_search(fd, "info", reference));
> >
> > - sprintf(reference, "enable_guc %s", config->info[XE_QUERY_CONFIG_FLAGS] &
> > - XE_QUERY_CONFIG_FLAGS_USE_GUC ? "yes" : "no");
> > - igt_assert(igt_debugfs_search(fd, "info", reference));
> > -
> > sprintf(reference, "tile_count %lld", config->info[XE_QUERY_CONFIG_GT_COUNT]);
> > igt_assert(igt_debugfs_search(fd, "info", reference));
> >
> > --
> > 2.41.0
> >
^ permalink raw reply [flat|nested] 7+ messages in thread
* [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC
2023-07-25 20:56 [igt-dev] [PATCH i-g-t 1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC Rodrigo Vivi
2023-07-25 20:56 ` [igt-dev] [PATCH i-g-t 2/2] xe_debugfs: Remove guc_enable check Rodrigo Vivi
@ 2023-07-25 22:03 ` Patchwork
2023-07-26 8:28 ` [igt-dev] [PATCH i-g-t 1/2] " Matthew Auld
2023-07-26 10:06 ` Kamil Konieczny
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2023-07-25 22:03 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 11028 bytes --]
== Series Details ==
Series: series starting with [i-g-t,1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC
URL : https://patchwork.freedesktop.org/series/121331/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_13422 -> IGTPW_9459
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_9459 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_9459, 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_9459/index.html
Participating hosts (44 -> 42)
------------------------------
Missing (2): fi-kbl-soraka fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_9459:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@execlists:
- fi-cfl-8700k: [PASS][1] -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/fi-cfl-8700k/igt@i915_selftest@live@execlists.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/fi-cfl-8700k/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@ring_submission:
- fi-cfl-8700k: [PASS][3] -> [DMESG-FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/fi-cfl-8700k/igt@i915_selftest@live@ring_submission.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/fi-cfl-8700k/igt@i915_selftest@live@ring_submission.html
Known issues
------------
Here are the changes found in IGTPW_9459 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@core_auth@basic-auth:
- bat-adlp-11: NOTRUN -> [ABORT][5] ([i915#8011])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-adlp-11/igt@core_auth@basic-auth.html
* igt@gem_lmem_swapping@parallel-random-engines:
- bat-adlp-9: NOTRUN -> [SKIP][6] ([i915#4613]) +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-adlp-9/igt@gem_lmem_swapping@parallel-random-engines.html
* igt@i915_pm_rpm@basic-rte:
- fi-cfl-8109u: [PASS][7] -> [FAIL][8] ([i915#7940]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/fi-cfl-8109u/igt@i915_pm_rpm@basic-rte.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/fi-cfl-8109u/igt@i915_pm_rpm@basic-rte.html
* igt@i915_pm_rpm@module-reload:
- bat-adlp-9: NOTRUN -> [FAIL][9] ([i915#7940])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-adlp-9/igt@i915_pm_rpm@module-reload.html
* igt@i915_pm_rps@basic-api:
- bat-adlp-9: NOTRUN -> [SKIP][10] ([i915#6621])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-adlp-9/igt@i915_pm_rps@basic-api.html
* igt@i915_selftest@live@gt_pm:
- bat-rpls-2: [PASS][11] -> [DMESG-FAIL][12] ([i915#4258] / [i915#7913])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@requests:
- bat-mtlp-6: [PASS][13] -> [ABORT][14] ([i915#7982])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-mtlp-6/igt@i915_selftest@live@requests.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-mtlp-6/igt@i915_selftest@live@requests.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-adlp-9: NOTRUN -> [SKIP][15] ([i915#7828])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-adlp-9/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
- bat-jsl-3: NOTRUN -> [SKIP][16] ([i915#7828])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-jsl-3/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_pipe_crc_basic@read-crc-frame-sequence:
- bat-dg2-11: NOTRUN -> [SKIP][17] ([i915#1845] / [i915#5354])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-dg2-11/igt@kms_pipe_crc_basic@read-crc-frame-sequence.html
* igt@kms_psr@sprite_plane_onoff:
- bat-rplp-1: NOTRUN -> [ABORT][18] ([i915#8442] / [i915#8712])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-rplp-1/igt@kms_psr@sprite_plane_onoff.html
* igt@prime_vgem@basic-fence-read:
- bat-adlp-9: NOTRUN -> [SKIP][19] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-adlp-9/igt@prime_vgem@basic-fence-read.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- bat-jsl-3: [ABORT][20] ([i915#5122]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-jsl-3/igt@gem_exec_suspend@basic-s0@smem.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-jsl-3/igt@gem_exec_suspend@basic-s0@smem.html
* igt@i915_pm_rpm@basic-pci-d3-state:
- bat-adlp-9: [FAIL][22] ([i915#7940]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-adlp-9/igt@i915_pm_rpm@basic-pci-d3-state.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-adlp-9/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@i915_pm_rpm@basic-rte:
- bat-adlp-9: [ABORT][24] ([i915#7977] / [i915#8668]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-adlp-9/igt@i915_pm_rpm@basic-rte.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-adlp-9/igt@i915_pm_rpm@basic-rte.html
* igt@i915_pm_rpm@module-reload:
- fi-tgl-1115g4: [FAIL][26] ([i915#7940]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/fi-tgl-1115g4/igt@i915_pm_rpm@module-reload.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/fi-tgl-1115g4/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live@gt_mocs:
- bat-mtlp-6: [DMESG-FAIL][28] ([i915#7059]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
* igt@i915_selftest@live@requests:
- bat-mtlp-8: [DMESG-FAIL][30] ([i915#8497]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-mtlp-8/igt@i915_selftest@live@requests.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-mtlp-8/igt@i915_selftest@live@requests.html
* igt@i915_selftest@live@slpc:
- bat-mtlp-8: [DMESG-WARN][32] ([i915#6367]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-mtlp-8/igt@i915_selftest@live@slpc.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-mtlp-8/igt@i915_selftest@live@slpc.html
* igt@i915_suspend@basic-s3-without-i915:
- bat-jsl-3: [FAIL][34] ([fdo#103375]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-jsl-3/igt@i915_suspend@basic-s3-without-i915.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-jsl-3/igt@i915_suspend@basic-s3-without-i915.html
#### Warnings ####
* igt@i915_module_load@load:
- bat-adlp-11: [ABORT][36] ([i915#4423]) -> [DMESG-WARN][37] ([i915#4423])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-adlp-11/igt@i915_module_load@load.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-adlp-11/igt@i915_module_load@load.html
* igt@i915_pm_rpm@basic-rte:
- fi-kbl-8809g: [FAIL][38] ([i915#8843]) -> [FAIL][39] ([i915#7940])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/fi-kbl-8809g/igt@i915_pm_rpm@basic-rte.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/fi-kbl-8809g/igt@i915_pm_rpm@basic-rte.html
- fi-kbl-guc: [FAIL][40] ([i915#7940]) -> [FAIL][41] ([i915#8843])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
* igt@kms_psr@cursor_plane_move:
- bat-rplp-1: [ABORT][42] ([i915#8434] / [i915#8668]) -> [SKIP][43] ([i915#1072])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13422/bat-rplp-1/igt@kms_psr@cursor_plane_move.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/bat-rplp-1/igt@kms_psr@cursor_plane_move.html
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#7059]: https://gitlab.freedesktop.org/drm/intel/issues/7059
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7940]: https://gitlab.freedesktop.org/drm/intel/issues/7940
[i915#7977]: https://gitlab.freedesktop.org/drm/intel/issues/7977
[i915#7982]: https://gitlab.freedesktop.org/drm/intel/issues/7982
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8434]: https://gitlab.freedesktop.org/drm/intel/issues/8434
[i915#8442]: https://gitlab.freedesktop.org/drm/intel/issues/8442
[i915#8497]: https://gitlab.freedesktop.org/drm/intel/issues/8497
[i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
[i915#8712]: https://gitlab.freedesktop.org/drm/intel/issues/8712
[i915#8843]: https://gitlab.freedesktop.org/drm/intel/issues/8843
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7403 -> IGTPW_9459
CI-20190529: 20190529
CI_DRM_13422: a19adfa38acfde9a7a6e9f99b598c065e4f190bb @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_9459: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/index.html
IGT_7403: c93b4e6ff2f3cd1a41667e63c7414cc239d88240 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9459/index.html
[-- Attachment #2: Type: text/html, Size: 12872 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [igt-dev] [PATCH i-g-t 1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC
2023-07-25 20:56 [igt-dev] [PATCH i-g-t 1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC Rodrigo Vivi
2023-07-25 20:56 ` [igt-dev] [PATCH i-g-t 2/2] xe_debugfs: Remove guc_enable check Rodrigo Vivi
2023-07-25 22:03 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC Patchwork
@ 2023-07-26 8:28 ` Matthew Auld
2023-07-26 10:06 ` Kamil Konieczny
3 siblings, 0 replies; 7+ messages in thread
From: Matthew Auld @ 2023-07-26 8:28 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: igt-dev, intel-xe
On Tue, 25 Jul 2023 at 21:56, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
>
> drm-xe-next commit ("drm/xe/uapi: Remove XE_QUERY_CONFIG_FLAGS_USE_GUC")
>
> Also this is the header generated with:
> make -j21 headers_install INSTALL_HDR_PATH=.
> ,as it should,
> what explains some other unrelated changes that are appearing
> in the diff below.
>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Does IGT build here? The second patch is still depending on
XE_QUERY_CONFIG_FLAGS_USE_GUC? Should the order be switched around or
maybe everything squashed into a single patch?
Otherwise for the series,
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
> ---
> include/drm-uapi/xe_drm.h | 9 ++++-----
> tests/xe/xe_query.c | 3 ---
> 2 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/include/drm-uapi/xe_drm.h b/include/drm-uapi/xe_drm.h
> index 02419c1d5..1ea453737 100644
> --- a/include/drm-uapi/xe_drm.h
> +++ b/include/drm-uapi/xe_drm.h
> @@ -3,8 +3,8 @@
> * Copyright © 2023 Intel Corporation
> */
>
> -#ifndef _UAPI_XE_DRM_H_
> -#define _UAPI_XE_DRM_H_
> +#ifndef _XE_DRM_H_
> +#define _XE_DRM_H_
>
> #include "drm.h"
>
> @@ -180,7 +180,7 @@ struct drm_xe_query_mem_region {
> * zero.
> */
> __u64 used;
> - /*
> + /**
> * @cpu_visible_size: How much of this region can be CPU
> * accessed, in bytes.
> *
> @@ -246,7 +246,6 @@ struct drm_xe_query_config {
> #define XE_QUERY_CONFIG_REV_AND_DEVICE_ID 0
> #define XE_QUERY_CONFIG_FLAGS 1
> #define XE_QUERY_CONFIG_FLAGS_HAS_VRAM (0x1 << 0)
> - #define XE_QUERY_CONFIG_FLAGS_USE_GUC (0x1 << 1)
> #define XE_QUERY_CONFIG_MIN_ALIGNEMENT 2
> #define XE_QUERY_CONFIG_VA_BITS 3
> #define XE_QUERY_CONFIG_GT_COUNT 4
> @@ -1051,4 +1050,4 @@ struct drm_xe_vm_madvise {
> }
> #endif
>
> -#endif /* _UAPI_XE_DRM_H_ */
> +#endif /* _XE_DRM_H_ */
> diff --git a/tests/xe/xe_query.c b/tests/xe/xe_query.c
> index 47aa98a8f..a4e40afdd 100644
> --- a/tests/xe/xe_query.c
> +++ b/tests/xe/xe_query.c
> @@ -371,9 +371,6 @@ test_query_config(int fd)
> igt_info(" XE_QUERY_CONFIG_FLAGS_HAS_VRAM\t%s\n",
> config->info[XE_QUERY_CONFIG_FLAGS] &
> XE_QUERY_CONFIG_FLAGS_HAS_VRAM ? "ON":"OFF");
> - igt_info(" XE_QUERY_CONFIG_FLAGS_USE_GUC\t\t%s\n",
> - config->info[XE_QUERY_CONFIG_FLAGS] &
> - XE_QUERY_CONFIG_FLAGS_USE_GUC ? "ON":"OFF");
> igt_info("XE_QUERY_CONFIG_MIN_ALIGNEMENT\t\t%#llx\n",
> config->info[XE_QUERY_CONFIG_MIN_ALIGNEMENT]);
> igt_info("XE_QUERY_CONFIG_VA_BITS\t\t\t%llu\n",
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [igt-dev] [PATCH i-g-t 1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC
2023-07-25 20:56 [igt-dev] [PATCH i-g-t 1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC Rodrigo Vivi
` (2 preceding siblings ...)
2023-07-26 8:28 ` [igt-dev] [PATCH i-g-t 1/2] " Matthew Auld
@ 2023-07-26 10:06 ` Kamil Konieczny
3 siblings, 0 replies; 7+ messages in thread
From: Kamil Konieczny @ 2023-07-26 10:06 UTC (permalink / raw)
To: igt-dev; +Cc: intel-xe, Rodrigo Vivi
Hi Rodrigo,
On 2023-07-25 at 16:56:24 -0400, Rodrigo Vivi wrote:
> drm-xe-next commit ("drm/xe/uapi: Remove XE_QUERY_CONFIG_FLAGS_USE_GUC")
>
> Also this is the header generated with:
> make -j21 headers_install INSTALL_HDR_PATH=.
> ,as it should,
> what explains some other unrelated changes that are appearing
> in the diff below.
>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> include/drm-uapi/xe_drm.h | 9 ++++-----
> tests/xe/xe_query.c | 3 ---
-- ^^^^^^^^^^^^^^^^^^^
May you move this into second patch?
With that you can add my acked-by,
Regards,
Kamil
> 2 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/include/drm-uapi/xe_drm.h b/include/drm-uapi/xe_drm.h
> index 02419c1d5..1ea453737 100644
> --- a/include/drm-uapi/xe_drm.h
> +++ b/include/drm-uapi/xe_drm.h
> @@ -3,8 +3,8 @@
> * Copyright © 2023 Intel Corporation
> */
>
> -#ifndef _UAPI_XE_DRM_H_
> -#define _UAPI_XE_DRM_H_
> +#ifndef _XE_DRM_H_
> +#define _XE_DRM_H_
>
> #include "drm.h"
>
> @@ -180,7 +180,7 @@ struct drm_xe_query_mem_region {
> * zero.
> */
> __u64 used;
> - /*
> + /**
> * @cpu_visible_size: How much of this region can be CPU
> * accessed, in bytes.
> *
> @@ -246,7 +246,6 @@ struct drm_xe_query_config {
> #define XE_QUERY_CONFIG_REV_AND_DEVICE_ID 0
> #define XE_QUERY_CONFIG_FLAGS 1
> #define XE_QUERY_CONFIG_FLAGS_HAS_VRAM (0x1 << 0)
> - #define XE_QUERY_CONFIG_FLAGS_USE_GUC (0x1 << 1)
> #define XE_QUERY_CONFIG_MIN_ALIGNEMENT 2
> #define XE_QUERY_CONFIG_VA_BITS 3
> #define XE_QUERY_CONFIG_GT_COUNT 4
> @@ -1051,4 +1050,4 @@ struct drm_xe_vm_madvise {
> }
> #endif
>
> -#endif /* _UAPI_XE_DRM_H_ */
> +#endif /* _XE_DRM_H_ */
> diff --git a/tests/xe/xe_query.c b/tests/xe/xe_query.c
> index 47aa98a8f..a4e40afdd 100644
> --- a/tests/xe/xe_query.c
> +++ b/tests/xe/xe_query.c
> @@ -371,9 +371,6 @@ test_query_config(int fd)
> igt_info(" XE_QUERY_CONFIG_FLAGS_HAS_VRAM\t%s\n",
> config->info[XE_QUERY_CONFIG_FLAGS] &
> XE_QUERY_CONFIG_FLAGS_HAS_VRAM ? "ON":"OFF");
> - igt_info(" XE_QUERY_CONFIG_FLAGS_USE_GUC\t\t%s\n",
> - config->info[XE_QUERY_CONFIG_FLAGS] &
> - XE_QUERY_CONFIG_FLAGS_USE_GUC ? "ON":"OFF");
> igt_info("XE_QUERY_CONFIG_MIN_ALIGNEMENT\t\t%#llx\n",
> config->info[XE_QUERY_CONFIG_MIN_ALIGNEMENT]);
> igt_info("XE_QUERY_CONFIG_VA_BITS\t\t\t%llu\n",
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread