From: Jani Nikula <jani.nikula@intel.com>
To: Michal Wajdeczko <michal.wajdeczko@intel.com>,
intel-xe@lists.freedesktop.org
Subject: Re: [Intel-xe] [PATCH 3/3] drm/xe/guc: Include only required GuC ABI headers
Date: Wed, 29 Nov 2023 10:31:12 +0200 [thread overview]
Message-ID: <87a5qx6jvz.fsf@intel.com> (raw)
In-Reply-To: <20231128203203.1147-3-michal.wajdeczko@intel.com>
On Tue, 28 Nov 2023, Michal Wajdeczko <michal.wajdeczko@intel.com> wrote:
> 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
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
Yes, please!
Acked-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/xe/xe_gt_pagefault.c | 1 +
> drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 1 +
> drivers/gpu/drm/xe/xe_guc.c | 2 ++
> drivers/gpu/drm/xe/xe_guc_ct.c | 2 ++
> drivers/gpu/drm/xe/xe_guc_fwif.h | 6 ------
> drivers/gpu/drm/xe/xe_guc_hwconfig.c | 1 +
> drivers/gpu/drm/xe/xe_guc_pc.c | 2 ++
> 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 03c1ab0ab0ca..a33f4a37bf2d 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 97e87c701af5..46b132ee1d3a 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"
--
Jani Nikula, Intel
next prev parent reply other threads:[~2023-11-29 8:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-28 20:32 [Intel-xe] [PATCH 1/3] drm/xe/guc: Drop ancient GuC CTB definitions Michal Wajdeczko
2023-11-28 20:32 ` [Intel-xe] [PATCH 2/3] drm/xe/guc: Remove obsolete GuC CTB documentation Michal Wajdeczko
2023-11-29 9:25 ` Matthew Brost
2023-11-28 20:32 ` [Intel-xe] [PATCH 3/3] drm/xe/guc: Include only required GuC ABI headers Michal Wajdeczko
2023-11-29 8:31 ` Jani Nikula [this message]
2023-11-29 9:27 ` Matthew Brost
2023-11-29 0:17 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [1/3] drm/xe/guc: Drop ancient GuC CTB definitions Patchwork
2023-11-29 0:17 ` [Intel-xe] ✓ CI.checkpatch: " Patchwork
2023-11-29 0:18 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-11-29 0:25 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-11-29 0:26 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-11-29 0:27 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-11-29 1:01 ` [Intel-xe] ✓ CI.BAT: " Patchwork
2023-11-29 9:20 ` [Intel-xe] [PATCH 1/3] " Matthew Brost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a5qx6jvz.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=michal.wajdeczko@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.