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 3/6] drm/i915/gt: Remove FIRST_RENDER_COMPUTE in workaround
Date: Thu, 27 Mar 2025 00:40:02 +0100 [thread overview]
Message-ID: <20250326234005.1574688-4-andi.shyti@linux.intel.com> (raw)
In-Reply-To: <20250326234005.1574688-1-andi.shyti@linux.intel.com>
From: Andi Shyti <andi.shyti@intel.com>
All platforms supported by i915 have at least one RCS engine,
so there's no need to explicitly check for RCS or CCS presence.
Remove the redundant check and move the associated functions
to a more appropriate location in the code.
Signed-off-by: Andi Shyti <andi.shyti@intel.com>
---
drivers/gpu/drm/i915/gt/intel_workarounds.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index bedd88a15959..b8ea6505afa2 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -2894,20 +2894,14 @@ engine_init_workarounds(struct intel_engine_cs *engine, struct i915_wa_list *wal
engine_fake_wa_init(engine, wal);
- /*
- * These are common workarounds that just need to applied
- * to a single RCS/CCS engine's workaround list since
- * they're reset as part of the general render domain reset.
- */
- if (engine->flags & I915_ENGINE_FIRST_RENDER_COMPUTE)
+ if (engine->class == RENDER_CLASS) {
general_render_compute_wa_init(engine, wal);
-
- if (engine->class == COMPUTE_CLASS)
- ccs_engine_wa_init(engine, wal);
- else if (engine->class == RENDER_CLASS)
rcs_engine_wa_init(engine, wal);
- else
+ } else if (engine->class == COMPUTE_CLASS) {
+ ccs_engine_wa_init(engine, wal);
+ } else {
xcs_engine_wa_init(engine, wal);
+ }
}
void intel_engine_init_workarounds(struct intel_engine_cs *engine)
--
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 ` Andi Shyti [this message]
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 ` [PATCH v2 5/6] drm/i915/gt/uc: Use FIRST_CCS() helper for one-time CCS operations Andi Shyti
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-4-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.