From: Andi Shyti <andi.shyti@linux.intel.com>
To: intel-gfx <intel-gfx@lists.freedesktop.org>,
dri-devel <dri-devel@lists.freedesktop.org>
Cc: Arshad Mehmood <arshad.mehmood@intel.com>,
Chris Wilson <chris.p.wilson@linux.intel.com>,
Lucas De Marchi <lucas.demarchi@intel.com>,
Andi Shyti <andi.shyti@linux.intel.com>,
Andi Shyti <andi.shyti@kernel.org>
Subject: [PATCH v2 5/6] drm/i915/gt/uc: Use FIRST_CCS() helper for one-time CCS operations
Date: Thu, 27 Mar 2025 00:40:04 +0100 [thread overview]
Message-ID: <20250326234005.1574688-6-andi.shyti@linux.intel.com> (raw)
In-Reply-To: <20250326234005.1574688-1-andi.shyti@linux.intel.com>
From: Andi Shyti <andi.shyti@intel.com>
Replace checks for I915_ENGINE_FIRST_RENDER_COMPUTE combined
with CCS_MASK() with the FIRST_CCS() helper. This improves
readability and ensures that certain CCS-specific actions, such
as enabling GEN12_RCU_MODE and calling xehp_enable_ccs_engines(),
are performed only once, on the first CCS engine encountered.
This is particularly relevant for platforms like DG2, which
support multiple CCS engines.
Signed-off-by: Andi Shyti <andi.shyti@intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 3 +--
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
index 46fabbfc775e..bf1686af29e7 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
@@ -392,8 +392,7 @@ static int guc_mmio_regset_init(struct temp_regset *regset,
ret |= GUC_MMIO_REG_ADD(gt, regset, RING_HWS_PGA(base), false);
ret |= GUC_MMIO_REG_ADD(gt, regset, RING_IMR(base), false);
- if ((engine->flags & I915_ENGINE_FIRST_RENDER_COMPUTE) &&
- CCS_MASK(engine->gt))
+ if (FIRST_CCS(engine))
ret |= GUC_MMIO_REG_ADD(gt, regset, GEN12_RCU_MODE, true);
/*
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index f8cb7c630d5b..18545196c9f4 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -4422,7 +4422,7 @@ static int guc_resume(struct intel_engine_cs *engine)
setup_hwsp(engine);
start_engine(engine);
- if (engine->flags & I915_ENGINE_FIRST_RENDER_COMPUTE)
+ if (FIRST_CCS(engine))
xehp_enable_ccs_engines(engine);
return 0;
--
2.47.2
next prev parent reply other threads:[~2025-03-26 23:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-26 23:39 [PATCH v2 0/6] Remove I915_ENGINE_FIRST_RENDER_COMPUTE Andi Shyti
2025-03-26 23:40 ` [PATCH v2 1/6] drm/i915: Add the FIRST_CCS() helper Andi Shyti
2025-03-27 10:42 ` Jani Nikula
2025-03-27 11:05 ` Andi Shyti
2025-03-26 23:40 ` [PATCH v2 2/6] drm/i915/gt: Move CCS workaround to the correct section Andi Shyti
2025-04-23 14:06 ` Lucas De Marchi
2025-03-26 23:40 ` [PATCH v2 3/6] drm/i915/gt: Remove FIRST_RENDER_COMPUTE in workaround Andi Shyti
2025-03-26 23:40 ` [PATCH v2 4/6] drm/i915/gt: Check for the first CCS instead of FIRST_RENDER_COMPUTE Andi Shyti
2025-03-26 23:40 ` Andi Shyti [this message]
2025-03-26 23:40 ` [PATCH v2 6/6] drm/i915/gt: Remove unused I915_ENGINE_FIRST_RENDER_COMPUTE flag Andi Shyti
2025-04-23 13:57 ` Lucas De Marchi
2025-03-27 0:13 ` ✗ Fi.CI.CHECKPATCH: warning for Remove I915_ENGINE_FIRST_RENDER_COMPUTE Patchwork
2025-03-27 0:14 ` ✗ Fi.CI.SPARSE: " Patchwork
2025-03-27 3:13 ` ✓ i915.CI.BAT: success " Patchwork
2025-03-27 4:52 ` ✗ i915.CI.Full: failure " Patchwork
2025-04-23 13:54 ` [PATCH v2 0/6] " Lucas De Marchi
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=20250326234005.1574688-6-andi.shyti@linux.intel.com \
--to=andi.shyti@linux.intel.com \
--cc=andi.shyti@kernel.org \
--cc=arshad.mehmood@intel.com \
--cc=chris.p.wilson@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lucas.demarchi@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.