[PATCH] drm/xe: change 'include' syntax for generate/xe_wa_oob.h

[Lucas De Marchi]

s/generate/generated/ in the title, but a better patch title
may be:

drm/xe: Do not include current dir for generated/xe_wa_oob.h

On Tue, Feb 20, 2024 at 11:00:03AM +0200, Dafna Hirschfeld wrote:
>The generated file 'generated/xe_wa_oob.h' is included using:
>"generated/xe_wa_oob.h"
>which first look inside the source code. But the file resides
>in the build directory and should therefore be included using:
><generated/xe_wa_oob.h>
>
>Signed-off-by: Dafna Hirschfeld <dhirschfeld at habana.ai>
>---
> drivers/gpu/drm/xe/xe_gsc.c            | 2 +-
> drivers/gpu/drm/xe/xe_guc.c            | 3 ++-
> drivers/gpu/drm/xe/xe_migrate.c        | 3 ++-
> drivers/gpu/drm/xe/xe_ring_ops.c       | 3 ++-
> drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 3 ++-
> drivers/gpu/drm/xe/xe_vm.c             | 3 ++-
> drivers/gpu/drm/xe/xe_wa.c             | 3 ++-
> 7 files changed, 13 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_gsc.c b/drivers/gpu/drm/xe/xe_gsc.c
>index 0b90fd9ef63a..ea01caeb423c 100644
>--- a/drivers/gpu/drm/xe/xe_gsc.c
>+++ b/drivers/gpu/drm/xe/xe_gsc.c
>@@ -6,9 +6,9 @@
> #include "xe_gsc.h"
>
> #include <drm/drm_managed.h>
>+#include <generated/xe_wa_oob.h>

let's be consistent with the other files and add a blank line above this
to separate the groups.

with the above changes feel free to add
my Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>


thanks
Lucas De Marchi

>
> #include "abi/gsc_mkhi_commands_abi.h"
>-#include "generated/xe_wa_oob.h"
> #include "xe_bb.h"
> #include "xe_bo.h"
> #include "xe_device.h"
>diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
>index 868208a39829..fa217f5a386e 100644
>--- a/drivers/gpu/drm/xe/xe_guc.c
>+++ b/drivers/gpu/drm/xe/xe_guc.c
>@@ -7,9 +7,10 @@
>
> #include <drm/drm_managed.h>
>
>+#include <generated/xe_wa_oob.h>
>+
> #include "abi/guc_actions_abi.h"
> #include "abi/guc_errors_abi.h"
>-#include "generated/xe_wa_oob.h"
> #include "regs/xe_gt_regs.h"
> #include "regs/xe_guc_regs.h"
> #include "xe_bo.h"
>diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
>index 3d2438dc86ee..a66fdf2d2991 100644
>--- a/drivers/gpu/drm/xe/xe_migrate.c
>+++ b/drivers/gpu/drm/xe/xe_migrate.c
>@@ -12,7 +12,8 @@
> #include <drm/ttm/ttm_tt.h>
> #include <drm/xe_drm.h>
>
>-#include "generated/xe_wa_oob.h"
>+#include <generated/xe_wa_oob.h>
>+
> #include "instructions/xe_mi_commands.h"
> #include "regs/xe_gpu_commands.h"
> #include "tests/xe_test.h"
>diff --git a/drivers/gpu/drm/xe/xe_ring_ops.c b/drivers/gpu/drm/xe/xe_ring_ops.c
>index d5e9621428ef..c4edffcd4a32 100644
>--- a/drivers/gpu/drm/xe/xe_ring_ops.c
>+++ b/drivers/gpu/drm/xe/xe_ring_ops.c
>@@ -5,7 +5,8 @@
>
> #include "xe_ring_ops.h"
>
>-#include "generated/xe_wa_oob.h"
>+#include <generated/xe_wa_oob.h>
>+
> #include "instructions/xe_mi_commands.h"
> #include "regs/xe_engine_regs.h"
> #include "regs/xe_gpu_commands.h"
>diff --git a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
>index 662f1e9bfc65..3107d2a12426 100644
>--- a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
>+++ b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
>@@ -11,7 +11,8 @@
> #include <drm/ttm/ttm_placement.h>
> #include <drm/ttm/ttm_range_manager.h>
>
>-#include "generated/xe_wa_oob.h"
>+#include <generated/xe_wa_oob.h>
>+
> #include "regs/xe_gt_regs.h"
> #include "regs/xe_regs.h"
> #include "xe_bo.h"
>diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
>index 836a6e849cda..efe9a0d300c0 100644
>--- a/drivers/gpu/drm/xe/xe_vm.c
>+++ b/drivers/gpu/drm/xe/xe_vm.c
>@@ -18,6 +18,8 @@
> #include <linux/mm.h>
> #include <linux/swap.h>
>
>+#include <generated/xe_wa_oob.h>
>+
> #include "xe_assert.h"
> #include "xe_bo.h"
> #include "xe_device.h"
>@@ -34,7 +36,6 @@
> #include "xe_res_cursor.h"
> #include "xe_sync.h"
> #include "xe_trace.h"
>-#include "generated/xe_wa_oob.h"
> #include "xe_wa.h"
>
> static struct drm_gem_object *xe_vm_obj(struct xe_vm *vm)
>diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
>index 3299130ba10a..a0264eedd443 100644
>--- a/drivers/gpu/drm/xe/xe_wa.c
>+++ b/drivers/gpu/drm/xe/xe_wa.c
>@@ -9,7 +9,8 @@
> #include <kunit/visibility.h>
> #include <linux/compiler_types.h>
>
>-#include "generated/xe_wa_oob.h"
>+#include <generated/xe_wa_oob.h>
>+
> #include "regs/xe_engine_regs.h"
> #include "regs/xe_gt_regs.h"
> #include "regs/xe_regs.h"
>-- 
>2.34.1
>