[PATCH 1/3] drm/xe: Don't rely on xe_assert.h to be included elsewhere

[Rodrigo Vivi]

On Tue, May 07, 2024 at 01:09:57PM +0200, Michal Wajdeczko wrote:
> While xe_assert.h is now included and used by the xe_force_wake.h,
> we want to stop include xe_force_wake.h from xe_device.h as it's
> not needed there.  Explicitly include xe_assert.h where needed.

I had recently bumped into one of these, last week...
Thanks for fixing it.
That's the problem of includes inside .h...

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

> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_bb.c         | 1 +
>  drivers/gpu/drm/xe/xe_gsc_submit.c | 1 +
>  drivers/gpu/drm/xe/xe_gt_clock.c   | 1 +
>  drivers/gpu/drm/xe/xe_uc.c         | 1 +
>  drivers/gpu/drm/xe/xe_vm.h         | 1 +
>  5 files changed, 5 insertions(+)
> 
> diff --git a/drivers/gpu/drm/xe/xe_bb.c b/drivers/gpu/drm/xe/xe_bb.c
> index 541361caff3b..37e056fde95d 100644
> --- a/drivers/gpu/drm/xe/xe_bb.c
> +++ b/drivers/gpu/drm/xe/xe_bb.c
> @@ -7,6 +7,7 @@
>  
>  #include "instructions/xe_mi_commands.h"
>  #include "regs/xe_gpu_commands.h"
> +#include "xe_assert.h"
>  #include "xe_device.h"
>  #include "xe_exec_queue_types.h"
>  #include "xe_gt.h"
> diff --git a/drivers/gpu/drm/xe/xe_gsc_submit.c b/drivers/gpu/drm/xe/xe_gsc_submit.c
> index d34d03248843..9ede483d37ef 100644
> --- a/drivers/gpu/drm/xe/xe_gsc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_gsc_submit.c
> @@ -8,6 +8,7 @@
>  #include <linux/poison.h>
>  
>  #include "abi/gsc_command_header_abi.h"
> +#include "xe_assert.h"
>  #include "xe_bb.h"
>  #include "xe_exec_queue.h"
>  #include "xe_gt_printk.h"
> diff --git a/drivers/gpu/drm/xe/xe_gt_clock.c b/drivers/gpu/drm/xe/xe_gt_clock.c
> index c7bca20f6b65..9ff2061133df 100644
> --- a/drivers/gpu/drm/xe/xe_gt_clock.c
> +++ b/drivers/gpu/drm/xe/xe_gt_clock.c
> @@ -7,6 +7,7 @@
>  
>  #include "regs/xe_gt_regs.h"
>  #include "regs/xe_regs.h"
> +#include "xe_assert.h"
>  #include "xe_device.h"
>  #include "xe_gt.h"
>  #include "xe_macros.h"
> diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c
> index 0f6cfe06e635..45035e38388b 100644
> --- a/drivers/gpu/drm/xe/xe_uc.c
> +++ b/drivers/gpu/drm/xe/xe_uc.c
> @@ -5,6 +5,7 @@
>  
>  #include "xe_uc.h"
>  
> +#include "xe_assert.h"
>  #include "xe_device.h"
>  #include "xe_gsc.h"
>  #include "xe_gsc_proxy.h"
> diff --git a/drivers/gpu/drm/xe/xe_vm.h b/drivers/gpu/drm/xe/xe_vm.h
> index 204a4ff63f88..3ac9021f970e 100644
> --- a/drivers/gpu/drm/xe/xe_vm.h
> +++ b/drivers/gpu/drm/xe/xe_vm.h
> @@ -6,6 +6,7 @@
>  #ifndef _XE_VM_H_
>  #define _XE_VM_H_
>  
> +#include "xe_assert.h"
>  #include "xe_bo_types.h"
>  #include "xe_macros.h"
>  #include "xe_map.h"
> -- 
> 2.43.0
>