diff options
| author | Michal Wajdeczko <michal.wajdeczko@intel.com> | 2023-11-28 21:32:03 +0100 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-21 11:45:08 -0500 |
| commit | b67cb798e4227d312fd221deb6a3f0b88b51fc6b (patch) | |
| tree | 274c6eb4e5f4c446f99cb5439ddfc89aab26cb01 | |
| parent | 0a39ad21796f2f67b7d384c0f0ec0ac901f76519 (diff) | |
drm/xe/guc: Include only required GuC ABI headers
On i915 we were adding new GuC ABI headers directly to guc_fwif.h
file since we were replacing old definitions from that file.
On xe driver we could do more and better by including ABI headers
only in files that need those definitions.
Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/741
Cc: Jani Nikula <jani.nikula@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20231128203203.1147-3-michal.wajdeczko@intel.com
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
| -rw-r--r-- | drivers/gpu/drm/xe/xe_gt_pagefault.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_ct.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_fwif.h | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_hwconfig.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_pc.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_submit.c | 2 |
8 files changed, 11 insertions, 6 deletions
diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c index 1e083dda0679..0a278df6a97f 100644 --- a/drivers/gpu/drm/xe/xe_gt_pagefault.c +++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c @@ -12,6 +12,7 @@ #include <drm/drm_managed.h> #include <drm/ttm/ttm_execbuf_util.h> +#include "abi/guc_actions_abi.h" #include "xe_bo.h" #include "xe_gt.h" #include "xe_gt_tlb_invalidation.h" diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c index a28f31c05b1b..7eef23a00d77 100644 --- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c +++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c @@ -5,6 +5,7 @@ #include "xe_gt_tlb_invalidation.h" +#include "abi/guc_actions_abi.h" #include "xe_device.h" #include "xe_gt.h" #include "xe_guc.h" diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index 08142d8ee052..e6f680efb29e 100644 --- a/drivers/gpu/drm/xe/xe_guc.c +++ b/drivers/gpu/drm/xe/xe_guc.c @@ -7,6 +7,8 @@ #include <drm/drm_managed.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" diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c index c44e75074695..6295d916e39f 100644 --- a/drivers/gpu/drm/xe/xe_guc_ct.c +++ b/drivers/gpu/drm/xe/xe_guc_ct.c @@ -11,6 +11,8 @@ #include <drm/drm_managed.h> +#include "abi/guc_actions_abi.h" +#include "abi/guc_klvs_abi.h" #include "xe_bo.h" #include "xe_device.h" #include "xe_gt.h" diff --git a/drivers/gpu/drm/xe/xe_guc_fwif.h b/drivers/gpu/drm/xe/xe_guc_fwif.h index 4216a6d9e478..4dd5a88a7826 100644 --- a/drivers/gpu/drm/xe/xe_guc_fwif.h +++ b/drivers/gpu/drm/xe/xe_guc_fwif.h @@ -8,13 +8,7 @@ #include <linux/bits.h> -#include "abi/guc_actions_abi.h" -#include "abi/guc_actions_slpc_abi.h" -#include "abi/guc_communication_ctb_abi.h" -#include "abi/guc_communication_mmio_abi.h" -#include "abi/guc_errors_abi.h" #include "abi/guc_klvs_abi.h" -#include "abi/guc_messages_abi.h" #define G2H_LEN_DW_SCHED_CONTEXT_MODE_SET 4 #define G2H_LEN_DW_DEREGISTER_CONTEXT 3 diff --git a/drivers/gpu/drm/xe/xe_guc_hwconfig.c b/drivers/gpu/drm/xe/xe_guc_hwconfig.c index 57d325ec8ce3..98bb9bb30705 100644 --- a/drivers/gpu/drm/xe/xe_guc_hwconfig.c +++ b/drivers/gpu/drm/xe/xe_guc_hwconfig.c @@ -7,6 +7,7 @@ #include <drm/drm_managed.h> +#include "abi/guc_actions_abi.h" #include "xe_bo.h" #include "xe_device.h" #include "xe_gt.h" diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c index e9dd6c3d750b..2919c6aea403 100644 --- a/drivers/gpu/drm/xe/xe_guc_pc.c +++ b/drivers/gpu/drm/xe/xe_guc_pc.c @@ -9,6 +9,8 @@ #include <drm/drm_managed.h> +#include "abi/guc_actions_abi.h" +#include "abi/guc_actions_slpc_abi.h" #include "regs/xe_gt_regs.h" #include "regs/xe_regs.h" #include "xe_bo.h" diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 32c234d753fd..ad5e19ecd33c 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -13,6 +13,8 @@ #include <drm/drm_managed.h> +#include "abi/guc_actions_abi.h" +#include "abi/guc_klvs_abi.h" #include "regs/xe_lrc_layout.h" #include "xe_assert.h" #include "xe_devcoredump.h" |