From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org
Subject: Re: [PATCH 2/4] drm/i915/gt: s/gen3/gen2/
Date: Wed, 09 Oct 2024 14:12:43 +0300 [thread overview]
Message-ID: <87iku1a5sk.fsf@intel.com> (raw)
In-Reply-To: <20241008214349.23331-3-ville.syrjala@linux.intel.com>
On Wed, 09 Oct 2024, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Now that we use the gen3 codepaths also for gen2
> rename everything to gen2_ to match.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 8 ++++----
> drivers/gpu/drm/i915/gt/gen2_engine_cs.h | 8 ++++----
> drivers/gpu/drm/i915/gt/intel_ring_submission.c | 8 ++++----
> 3 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/gen2_engine_cs.c b/drivers/gpu/drm/i915/gt/gen2_engine_cs.c
> index 54077cab8e16..4904d0f4162c 100644
> --- a/drivers/gpu/drm/i915/gt/gen2_engine_cs.c
> +++ b/drivers/gpu/drm/i915/gt/gen2_engine_cs.c
> @@ -169,7 +169,7 @@ static u32 *__gen2_emit_breadcrumb(struct i915_request *rq, u32 *cs,
> return cs;
> }
>
> -u32 *gen3_emit_breadcrumb(struct i915_request *rq, u32 *cs)
> +u32 *gen2_emit_breadcrumb(struct i915_request *rq, u32 *cs)
> {
> return __gen2_emit_breadcrumb(rq, cs, 16, 8);
> }
> @@ -248,7 +248,7 @@ int i830_emit_bb_start(struct i915_request *rq,
> return 0;
> }
>
> -int gen3_emit_bb_start(struct i915_request *rq,
> +int gen2_emit_bb_start(struct i915_request *rq,
> u64 offset, u32 len,
> unsigned int dispatch_flags)
> {
> @@ -290,14 +290,14 @@ int gen4_emit_bb_start(struct i915_request *rq,
> return 0;
> }
>
> -void gen3_irq_enable(struct intel_engine_cs *engine)
> +void gen2_irq_enable(struct intel_engine_cs *engine)
> {
> engine->i915->irq_mask &= ~engine->irq_enable_mask;
> intel_uncore_write(engine->uncore, GEN2_IMR, engine->i915->irq_mask);
> intel_uncore_posting_read_fw(engine->uncore, GEN2_IMR);
> }
>
> -void gen3_irq_disable(struct intel_engine_cs *engine)
> +void gen2_irq_disable(struct intel_engine_cs *engine)
> {
> engine->i915->irq_mask |= engine->irq_enable_mask;
> intel_uncore_write(engine->uncore, GEN2_IMR, engine->i915->irq_mask);
> diff --git a/drivers/gpu/drm/i915/gt/gen2_engine_cs.h b/drivers/gpu/drm/i915/gt/gen2_engine_cs.h
> index 2f707620b3d4..7b37560fc356 100644
> --- a/drivers/gpu/drm/i915/gt/gen2_engine_cs.h
> +++ b/drivers/gpu/drm/i915/gt/gen2_engine_cs.h
> @@ -15,21 +15,21 @@ int gen2_emit_flush(struct i915_request *rq, u32 mode);
> int gen4_emit_flush_rcs(struct i915_request *rq, u32 mode);
> int gen4_emit_flush_vcs(struct i915_request *rq, u32 mode);
>
> -u32 *gen3_emit_breadcrumb(struct i915_request *rq, u32 *cs);
> +u32 *gen2_emit_breadcrumb(struct i915_request *rq, u32 *cs);
> u32 *gen5_emit_breadcrumb(struct i915_request *rq, u32 *cs);
>
> int i830_emit_bb_start(struct i915_request *rq,
> u64 offset, u32 len,
> unsigned int dispatch_flags);
> -int gen3_emit_bb_start(struct i915_request *rq,
> +int gen2_emit_bb_start(struct i915_request *rq,
> u64 offset, u32 len,
> unsigned int dispatch_flags);
> int gen4_emit_bb_start(struct i915_request *rq,
> u64 offset, u32 length,
> unsigned int dispatch_flags);
>
> -void gen3_irq_enable(struct intel_engine_cs *engine);
> -void gen3_irq_disable(struct intel_engine_cs *engine);
> +void gen2_irq_enable(struct intel_engine_cs *engine);
> +void gen2_irq_disable(struct intel_engine_cs *engine);
> void gen5_irq_enable(struct intel_engine_cs *engine);
> void gen5_irq_disable(struct intel_engine_cs *engine);
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> index 694cb79d5452..3ec8bc01058b 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> @@ -1091,8 +1091,8 @@ static void setup_irq(struct intel_engine_cs *engine)
> engine->irq_enable = gen5_irq_enable;
> engine->irq_disable = gen5_irq_disable;
> } else {
> - engine->irq_enable = gen3_irq_enable;
> - engine->irq_disable = gen3_irq_disable;
> + engine->irq_enable = gen2_irq_enable;
> + engine->irq_disable = gen2_irq_disable;
> }
> }
>
> @@ -1143,7 +1143,7 @@ static void setup_common(struct intel_engine_cs *engine)
> * equivalent to our next initial bread so we can elide
> * engine->emit_init_breadcrumb().
> */
> - engine->emit_fini_breadcrumb = gen3_emit_breadcrumb;
> + engine->emit_fini_breadcrumb = gen2_emit_breadcrumb;
> if (GRAPHICS_VER(i915) == 5)
> engine->emit_fini_breadcrumb = gen5_emit_breadcrumb;
>
> @@ -1156,7 +1156,7 @@ static void setup_common(struct intel_engine_cs *engine)
> else if (IS_I830(i915) || IS_I845G(i915))
> engine->emit_bb_start = i830_emit_bb_start;
> else
> - engine->emit_bb_start = gen3_emit_bb_start;
> + engine->emit_bb_start = gen2_emit_bb_start;
> }
>
> static void setup_rcs(struct intel_engine_cs *engine)
--
Jani Nikula, Intel
next prev parent reply other threads:[~2024-10-09 11:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-08 21:43 [PATCH 0/4] drm/i915: gen2 stuff Ville Syrjala
2024-10-08 21:43 ` [PATCH 1/4] drm/i915/gt: Nuke gen2_irq_{enable,disable}() Ville Syrjala
2024-10-09 11:12 ` Jani Nikula
2024-10-08 21:43 ` [PATCH 2/4] drm/i915/gt: s/gen3/gen2/ Ville Syrjala
2024-10-09 11:12 ` Jani Nikula [this message]
2024-10-08 21:43 ` [PATCH 3/4] drm/i915/irq: s/gen3/gen2/ Ville Syrjala
2024-10-09 10:20 ` Jani Nikula
2024-10-10 12:00 ` Ville Syrjälä
2024-10-10 12:22 ` Jani Nikula
2024-10-08 21:43 ` [PATCH 4/4] drm/i915/pmu: Add support for gen2 Ville Syrjala
2024-10-09 11:17 ` Jani Nikula
2024-10-08 21:49 ` ✓ CI.Patch_applied: success for drm/i915: gen2 stuff Patchwork
2024-10-08 21:49 ` ✓ CI.checkpatch: " Patchwork
2024-10-08 21:51 ` ✓ CI.KUnit: " Patchwork
2024-10-08 22:02 ` ✓ CI.Build: " Patchwork
2024-10-08 22:04 ` ✓ CI.Hooks: " Patchwork
2024-10-08 22:06 ` ✗ CI.checksparse: warning " Patchwork
2024-10-08 22:24 ` ✓ CI.BAT: success " Patchwork
2024-10-09 5:34 ` ✗ CI.FULL: failure " 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=87iku1a5sk.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=ville.syrjala@linux.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 NNTP newsgroup(s).