From: Lucas De Marchi <lucas.demarchi@intel.com>
To: <intel-xe@lists.freedesktop.org>
Cc: <vinay.belgaumkar@intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
<michal.winiarski@intel.com>, <matthew.brost@intel.com>
Subject: Re: [PATCH 1/5] drm/xe: Drop __engine_mask
Date: Mon, 13 May 2024 16:35:31 -0500 [thread overview]
Message-ID: <77amteukxppdiwas4uhyi734ateqj6qi7qmu7q5evrljh3fepn@yq4jfb6chvty> (raw)
In-Reply-To: <20240425182410.2705061-2-lucas.demarchi@intel.com>
On Thu, Apr 25, 2024 at 11:24:06AM GMT, Lucas De Marchi wrote:
>Not really used, it's just a copy of engine_mask, which already reads
>the fuses to mark engines as available/not-available.
>
>While at it, use XE_HW_ENGINE_BCS_MASK to span all copy engines.
>
>Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>---
> drivers/gpu/drm/xe/xe_gt.c | 3 ---
> drivers/gpu/drm/xe/xe_gt_types.h | 6 ------
> drivers/gpu/drm/xe/xe_migrate.c | 3 +--
> drivers/gpu/drm/xe/xe_pci.c | 6 +++---
> 4 files changed, 4 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
>index e922e77f5010..00a22cf2f5b5 100644
>--- a/drivers/gpu/drm/xe/xe_gt.c
>+++ b/drivers/gpu/drm/xe/xe_gt.c
>@@ -515,9 +515,6 @@ int xe_gt_init_hwconfig(struct xe_gt *gt)
> if (err)
> goto out_fw;
>
>- /* XXX: Fake that we pull the engine mask from hwconfig blob */
>- gt->info.engine_mask = gt->info.__engine_mask;
>-
> out_fw:
> xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
> out:
>diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h
>index cfdc761ff7f4..72568414fb7d 100644
>--- a/drivers/gpu/drm/xe/xe_gt_types.h
>+++ b/drivers/gpu/drm/xe/xe_gt_types.h
>@@ -116,12 +116,6 @@ struct xe_gt {
> u32 reference_clock;
> /** @info.engine_mask: mask of engines present on GT */
> u64 engine_mask;
>- /**
>- * @info.__engine_mask: mask of engines present on GT read from
>- * xe_pci.c, used to fake reading the engine_mask from the
>- * hwconfig blob.
>- */
>- u64 __engine_mask;
> /** @info.gmdid: raw GMD_ID value from hardware */
> u32 gmdid;
> } info;
>diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
>index 9f6e9b7f11c8..59a3f24d31e6 100644
>--- a/drivers/gpu/drm/xe/xe_migrate.c
>+++ b/drivers/gpu/drm/xe/xe_migrate.c
>@@ -936,8 +936,7 @@ static bool has_service_copy_support(struct xe_gt *gt)
> * all of the actual service copy engines (BCS1-BCS8) have been fused
> * off.
> */
>- return gt->info.__engine_mask & GENMASK(XE_HW_ENGINE_BCS8,
>- XE_HW_ENGINE_BCS1);
>+ return gt->info.engine_mask & XE_HW_ENGINE_BCS_MASK;
oh well, stupid me
has_service_copy_support() means bcs1 to bcs8, not bcs0.
Lucas De Marchi
next prev parent reply other threads:[~2024-05-13 21:35 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 18:24 [PATCH 0/5] drm/xe: Fix early probe order Lucas De Marchi
2024-04-25 18:24 ` [PATCH 1/5] drm/xe: Drop __engine_mask Lucas De Marchi
2024-04-29 20:29 ` Rodrigo Vivi
2024-04-29 20:36 ` Matthew Brost
2024-04-29 21:03 ` Lucas De Marchi
2024-04-30 15:56 ` Matthew Brost
2024-05-02 11:54 ` Michal Wajdeczko
2024-05-02 12:55 ` Lucas De Marchi
2024-05-02 14:12 ` Michal Wajdeczko
2024-05-02 17:26 ` Lucas De Marchi
2024-05-02 20:36 ` Michal Wajdeczko
2024-05-09 0:02 ` Michał Winiarski
2024-05-13 21:35 ` Lucas De Marchi [this message]
2024-04-25 18:24 ` [PATCH 2/5] drm/xe: Drop useless forcewake get/put Lucas De Marchi
2024-04-26 5:19 ` Matthew Brost
2024-04-26 14:45 ` Dong, Zhanjun
2024-05-09 0:03 ` Michał Winiarski
2024-04-25 18:24 ` [PATCH 3/5] drm/xe: Move xe_gt_init_early() where it belongs Lucas De Marchi
2024-04-26 15:52 ` Belgaumkar, Vinay
2024-05-09 0:03 ` Michał Winiarski
2024-04-25 18:24 ` [PATCH 4/5] drm/xe: Move xe_force_wake_init_gt() inside gt initialization Lucas De Marchi
2024-04-29 20:25 ` Rodrigo Vivi
2024-05-09 0:04 ` Michał Winiarski
2024-04-25 18:24 ` [PATCH 5/5] drm/xe: Move sw-only pcode initialization Lucas De Marchi
2024-04-29 20:24 ` Rodrigo Vivi
2024-05-09 0:04 ` Michał Winiarski
2024-04-25 19:16 ` ✓ CI.Patch_applied: success for drm/xe: Fix early probe order Patchwork
2024-04-25 19:16 ` ✓ CI.checkpatch: " Patchwork
2024-04-25 19:17 ` ✓ CI.KUnit: " Patchwork
2024-04-25 19:29 ` ✓ CI.Build: " Patchwork
2024-04-25 19:31 ` ✗ CI.Hooks: failure " Patchwork
2024-04-25 19:37 ` ✗ CI.checksparse: warning " Patchwork
2024-04-25 20:36 ` ✗ CI.BAT: failure " Patchwork
2024-04-26 14:38 ` ✓ CI.Patch_applied: success for drm/xe: Fix early probe order (rev2) Patchwork
2024-04-26 14:39 ` ✓ CI.checkpatch: " Patchwork
2024-04-26 14:40 ` ✓ CI.KUnit: " Patchwork
2024-04-26 14:52 ` ✓ CI.Build: " Patchwork
2024-04-26 14:55 ` ✓ CI.Hooks: " Patchwork
2024-04-26 14:56 ` ✓ CI.checksparse: " Patchwork
2024-04-26 15:23 ` ✗ CI.BAT: failure " Patchwork
2024-04-26 19:50 ` ✗ CI.FULL: " Patchwork
2024-04-30 14:59 ` [PATCH 0/5] drm/xe: Fix early probe order Rodrigo Vivi
2024-05-09 3:54 ` ✗ CI.Patch_applied: failure for drm/xe: Fix early probe order (rev3) Patchwork
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=77amteukxppdiwas4uhyi734ateqj6qi7qmu7q5evrljh3fepn@yq4jfb6chvty \
--to=lucas.demarchi@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=matthew.brost@intel.com \
--cc=michal.winiarski@intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=vinay.belgaumkar@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).