Re: [PATCH i-g-t v2 05/11] lib/xe: Return boolean from xe_wa()

[Matt Atwood <matthew.s.atwood@intel.com>]

On Wed, Sep 23, 2026 at 06:41:12PM -0300, Gustavo Sousa wrote:
> The function xe_wa() will cause a warning to be printed when an error
> condition is found.  Since the current users of xe_wa() do not check
> for errors, let's just convert the function to return a boolean.
> 
> Checking for xe_wa(...) instead of xe_wa(...) > 0 feels more natural.
> 
Reviewed-by: Matt Atwood <matthew.s.atwood@intel.com>
> Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
> ---
>  lib/xe/xe_wa.c      | 11 ++++++-----
>  lib/xe/xe_wa.h      |  4 +++-
>  tests/intel/xe_oa.c |  2 +-
>  3 files changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/lib/xe/xe_wa.c b/lib/xe/xe_wa.c
> index 59064219cd96..05af64151e7c 100644
> --- a/lib/xe/xe_wa.c
> +++ b/lib/xe/xe_wa.c
> @@ -177,20 +177,21 @@ int xe_wa_test_debugfs_dump_has_wa(char *dump, const char *wa)
>   * @fd: A drm file descriptor.
>   * @wa: Name of the workaround to be checked.
>   *
> - * Returns 1 if enabled, 0 if disabled, -1 on error.
> + * Return a boolean indicating whether the workaround is enabled.
> + * On error, returns false and a warning is printed.
>   */
> -int xe_wa(int fd, const char *wa)
> +bool xe_wa(int fd, const char *wa)
>  {
>  	struct xe_wa_cache *wa_cache = xe_device_get(fd)->wa_cache;
>  
>  	if (igt_warn_on(!wa_cache))
> -		return -1;
> +		return false;
>  
>  	for (int i = 0; i < wa_cache->num_dumps; i++)
>  		if (debugfs_dump_has_wa(wa_cache->dumps[i], wa))
> -			return 1;
> +			return true;
>  
> -	return 0;
> +	return false;
>  }
>  
>  /**
> diff --git a/lib/xe/xe_wa.h b/lib/xe/xe_wa.h
> index f0a826553df8..aa1c50c0f9c9 100644
> --- a/lib/xe/xe_wa.h
> +++ b/lib/xe/xe_wa.h
> @@ -6,9 +6,11 @@
>  #ifndef XE_WA_H
>  #define XE_WA_H
>  
> +#include <stdbool.h>
> +
>  struct xe_device;
>  
> -int xe_wa(int fd, const char *wa);
> +bool xe_wa(int fd, const char *wa);
>  
>  void xe_wa_build_cache(struct xe_device *xe_dev);
>  void xe_wa_free_cache(struct xe_device *xe_dev);
> diff --git a/tests/intel/xe_oa.c b/tests/intel/xe_oa.c
> index 9571c62c115e..8ce39e6c5064 100644
> --- a/tests/intel/xe_oa.c
> +++ b/tests/intel/xe_oa.c
> @@ -2585,7 +2585,7 @@ test_non_zero_reason(const struct drm_xe_oa_unit *oau, size_t oa_buffer_size)
>  	 * can result in buffer overflows.
>  	 */
>  	if (oau->oa_unit_type == DRM_XE_OA_UNIT_TYPE_MERT &&
> -	    xe_wa(drm_fd, "14026633728") > 0) {
> +	    xe_wa(drm_fd, "14026633728")) {
>  		oa_exponent = max(oa_exponent, 8);
>  		properties[9] = oa_exponent;
>  	}
> 
> -- 
> 2.55.0
>