Re: [PATCH v2] drm/xe: Move xe_uc_fw_abi.h to abi/

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Wed, May 27, 2026 at 01:26:07PM +0200, Michal Wajdeczko wrote:
> We aim to keep all pure ABI headers in the abi/ folder, but
> somehow we missed this file.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> ---
> v2: fix documentation link (Sashiko)
> ---
>  Documentation/gpu/xe/xe_firmware.rst                   | 4 ++--
>  drivers/gpu/drm/xe/{xe_uc_fw_abi.h => abi/uc_fw_abi.h} | 4 ++--
>  drivers/gpu/drm/xe/xe_late_bind_fw_types.h             | 3 ++-
>  drivers/gpu/drm/xe/xe_uc_fw.h                          | 2 +-
>  4 files changed, 7 insertions(+), 6 deletions(-)
>  rename drivers/gpu/drm/xe/{xe_uc_fw_abi.h => abi/uc_fw_abi.h} (99%)
> 
> diff --git a/Documentation/gpu/xe/xe_firmware.rst b/Documentation/gpu/xe/xe_firmware.rst
> index 9c15a300bc62..d3030d1c9a84 100644
> --- a/Documentation/gpu/xe/xe_firmware.rst
> +++ b/Documentation/gpu/xe/xe_firmware.rst
> @@ -7,10 +7,10 @@ Firmware
>  Firmware Layout
>  ===============
>  
> -.. kernel-doc:: drivers/gpu/drm/xe/xe_uc_fw_abi.h
> +.. kernel-doc:: drivers/gpu/drm/xe/abi/uc_fw_abi.h
>     :doc: CSS-based Firmware Layout
>  
> -.. kernel-doc:: drivers/gpu/drm/xe/xe_uc_fw_abi.h
> +.. kernel-doc:: drivers/gpu/drm/xe/abi/uc_fw_abi.h
>     :doc: GSC-based Firmware Layout
>  
>  Write Once Protected Content Memory (WOPCM) Layout
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw_abi.h b/drivers/gpu/drm/xe/abi/uc_fw_abi.h
> similarity index 99%
> rename from drivers/gpu/drm/xe/xe_uc_fw_abi.h
> rename to drivers/gpu/drm/xe/abi/uc_fw_abi.h
> index 74b888904fdc..198e949660e0 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw_abi.h
> +++ b/drivers/gpu/drm/xe/abi/uc_fw_abi.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2022 Intel Corporation
>   */
>  
> -#ifndef _XE_UC_FW_ABI_H_
> -#define _XE_UC_FW_ABI_H_
> +#ifndef _ABI_UC_FW_ABI_H
> +#define _ABI_UC_FW_ABI_H

I was going to complain about the duplicated 'ABI',
but I noticed that we already do this everywhere :/

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

>  
>  #include <linux/build_bug.h>
>  #include <linux/types.h>
> diff --git a/drivers/gpu/drm/xe/xe_late_bind_fw_types.h b/drivers/gpu/drm/xe/xe_late_bind_fw_types.h
> index 7fdb24e810b3..ee5efe60774e 100644
> --- a/drivers/gpu/drm/xe/xe_late_bind_fw_types.h
> +++ b/drivers/gpu/drm/xe/xe_late_bind_fw_types.h
> @@ -10,7 +10,8 @@
>  #include <linux/mutex.h>
>  #include <linux/types.h>
>  #include <linux/workqueue.h>
> -#include "xe_uc_fw_abi.h"
> +
> +#include "abi/uc_fw_abi.h"
>  
>  #define XE_LB_MAX_PAYLOAD_SIZE SZ_4K
>  
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.h b/drivers/gpu/drm/xe/xe_uc_fw.h
> index bb281b72a677..f2d3a3e7208b 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.h
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.h
> @@ -8,8 +8,8 @@
>  
>  #include <linux/errno.h>
>  
> +#include "abi/uc_fw_abi.h"
>  #include "xe_macros.h"
> -#include "xe_uc_fw_abi.h"
>  #include "xe_uc_fw_types.h"
>  
>  struct drm_printer;
> -- 
> 2.47.1
>