[Intel-xe] [PATCH v2 07/17] drm/xe/guc: Move GuC registers to regs/

[Matt Roper]

On Fri, Apr 21, 2023 at 03:32:48PM -0700, Lucas De Marchi wrote:
> There's no good reason to keep the GuC registers outside the regs/
> directory: move the header with GuC registers under that.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  drivers/gpu/drm/xe/{xe_guc_reg.h => regs/xe_guc_regs.h} | 4 ++--
>  drivers/gpu/drm/xe/xe_guc.c                             | 2 +-
>  drivers/gpu/drm/xe/xe_guc_ads.c                         | 2 +-
>  drivers/gpu/drm/xe/xe_huc.c                             | 2 +-
>  drivers/gpu/drm/xe/xe_uc_fw.c                           | 2 +-
>  drivers/gpu/drm/xe/xe_wopcm.c                           | 2 +-
>  6 files changed, 7 insertions(+), 7 deletions(-)
>  rename drivers/gpu/drm/xe/{xe_guc_reg.h => regs/xe_guc_regs.h} (99%)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_reg.h b/drivers/gpu/drm/xe/regs/xe_guc_regs.h
> similarity index 99%
> rename from drivers/gpu/drm/xe/xe_guc_reg.h
> rename to drivers/gpu/drm/xe/regs/xe_guc_regs.h
> index 0cd38d51cc60..011868ff38aa 100644
> --- a/drivers/gpu/drm/xe/xe_guc_reg.h
> +++ b/drivers/gpu/drm/xe/regs/xe_guc_regs.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2022 Intel Corporation
>   */
>  
> -#ifndef _XE_GUC_REG_H_
> -#define _XE_GUC_REG_H_
> +#ifndef _XE_GUC_REGS_H_
> +#define _XE_GUC_REGS_H_
>  
>  #include <linux/compiler.h>
>  #include <linux/types.h>
> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
> index ff2df4f30e97..e00177f4d294 100644
> --- a/drivers/gpu/drm/xe/xe_guc.c
> +++ b/drivers/gpu/drm/xe/xe_guc.c
> @@ -6,6 +6,7 @@
>  #include "xe_guc.h"
>  
>  #include "regs/xe_gt_regs.h"
> +#include "regs/xe_guc_regs.h"
>  #include "xe_bo.h"
>  #include "xe_device.h"
>  #include "xe_force_wake.h"
> @@ -15,7 +16,6 @@
>  #include "xe_guc_hwconfig.h"
>  #include "xe_guc_log.h"
>  #include "xe_guc_pc.h"
> -#include "xe_guc_reg.h"
>  #include "xe_guc_submit.h"
>  #include "xe_mmio.h"
>  #include "xe_platform_types.h"
> diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
> index fd9911ffeae4..fe1d5be1241e 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ads.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ads.c
> @@ -9,10 +9,10 @@
>  
>  #include "regs/xe_engine_regs.h"
>  #include "regs/xe_gt_regs.h"
> +#include "regs/xe_guc_regs.h"
>  #include "xe_bo.h"
>  #include "xe_gt.h"
>  #include "xe_guc.h"
> -#include "xe_guc_reg.h"
>  #include "xe_hw_engine.h"
>  #include "xe_lrc.h"
>  #include "xe_map.h"
> diff --git a/drivers/gpu/drm/xe/xe_huc.c b/drivers/gpu/drm/xe/xe_huc.c
> index a9448c6f6418..a1c3e54faa6e 100644
> --- a/drivers/gpu/drm/xe/xe_huc.c
> +++ b/drivers/gpu/drm/xe/xe_huc.c
> @@ -5,12 +5,12 @@
>  
>  #include "xe_huc.h"
>  
> +#include "regs/xe_guc_regs.h"
>  #include "xe_bo.h"
>  #include "xe_device.h"
>  #include "xe_force_wake.h"
>  #include "xe_gt.h"
>  #include "xe_guc.h"
> -#include "xe_guc_reg.h"
>  #include "xe_mmio.h"
>  #include "xe_uc_fw.h"
>  
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
> index 97328e441f0f..cd5433b5c970 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.c
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c
> @@ -8,11 +8,11 @@
>  
>  #include <drm/drm_managed.h>
>  
> +#include "regs/xe_guc_regs.h"
>  #include "xe_bo.h"
>  #include "xe_device_types.h"
>  #include "xe_force_wake.h"
>  #include "xe_gt.h"
> -#include "xe_guc_reg.h"
>  #include "xe_map.h"
>  #include "xe_mmio.h"
>  #include "xe_uc_fw.h"
> diff --git a/drivers/gpu/drm/xe/xe_wopcm.c b/drivers/gpu/drm/xe/xe_wopcm.c
> index c8cc3f5e6154..7b5014aea9c8 100644
> --- a/drivers/gpu/drm/xe/xe_wopcm.c
> +++ b/drivers/gpu/drm/xe/xe_wopcm.c
> @@ -5,10 +5,10 @@
>  
>  #include "xe_wopcm.h"
>  
> +#include "regs/xe_guc_regs.h"
>  #include "xe_device.h"
>  #include "xe_force_wake.h"
>  #include "xe_gt.h"
> -#include "xe_guc_reg.h"
>  #include "xe_mmio.h"
>  #include "xe_uc_fw.h"
>  
> -- 
> 2.39.0
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation