[Intel-xe] [PATCH i-g-t 1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC

[Intel-xe] [PATCH i-g-t 1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC

[Rodrigo Vivi]

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 ---
 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

[Intel-xe] [PATCH i-g-t 2/2] xe_debugfs: Remove guc_enable check.

[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

[Intel-xe] ✗ CI.Patch_applied: failure for series starting with [i-g-t,1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC

[Patchwork]

== 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/121332/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: ===
Base commit: 3eb59fdaf drm/xe: Invert guc vs execlists parameters and info.
=== git am output follows ===
error: include/drm-uapi/xe_drm.h: does not exist in index
error: tests/xe/xe_query.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC
Patch failed at 0001 xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC
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".

Re: [Intel-xe] [igt-dev] [PATCH i-g-t 1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC

[Matthew Auld]

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
>

Re: [Intel-xe] [igt-dev] [PATCH i-g-t 1/2] xe: Align uapi after removal of XE_QUERY_CONFIG_FLAGS_USE_GUC

[Kamil Konieczny]

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
> 

Re: [Intel-xe] [igt-dev] [PATCH i-g-t 2/2] xe_debugfs: Remove guc_enable check.

[Kamil Konieczny]

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
> 

Re: [Intel-xe] [igt-dev] [PATCH i-g-t 2/2] xe_debugfs: Remove guc_enable check.

[Rodrigo Vivi]

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
> >