From: Andi Shyti <andi.shyti@linux.intel.com>
To: "Krzysztofik, Janusz" <janusz.krzysztofik@intel.com>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>,
"Cavitt, Jonathan" <jonathan.cavitt@intel.com>,
linux-stable <stable@vger.kernel.org>,
Chris Wilson <chris@chris-wilson.co.uk>,
dri-evel <dri-devel@lists.freedesktop.org>,
"Hajda, Andrzej" <andrzej.hajda@intel.com>,
"Roper, Matthew D" <matthew.d.roper@intel.com>,
"Das, Nirmoy" <nirmoy.das@intel.com>
Subject: Re: [Intel-gfx] [v7, 9/9] drm/i915/gt: Support aux invalidation on all engines
Date: Fri, 21 Jul 2023 16:02:50 +0200 [thread overview]
Message-ID: <ZLqQCq5eDId4zRFa@ashyti-mobl2.lan> (raw)
In-Reply-To: <3494477.V25eIC5XRa@jkrzyszt-mobl2.ger.corp.intel.com>
Hi Janusz,
> > diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> > index 3ded597f002a2..30fb4e0af6134 100644
> > --- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> > +++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> > @@ -165,9 +165,36 @@ static u32 preparser_disable(bool state)
> > return MI_ARB_CHECK | 1 << 8 | state;
> > }
> >
> > -u32 *gen12_emit_aux_table_inv(struct intel_gt *gt, u32 *cs, const i915_reg_t inv_reg)
> > +static i915_reg_t gen12_get_aux_inv_reg(struct intel_engine_cs *engine)
> > {
> > - u32 gsi_offset = gt->uncore->gsi_offset;
> > + if (!HAS_AUX_CCS(engine->i915))
> > + return INVALID_MMIO_REG;
> > +
> > + switch (engine->id) {
> > + case RCS0:
> > + return GEN12_CCS_AUX_INV;
> > + case BCS0:
> > + return GEN12_BCS0_AUX_INV;
> > + case VCS0:
> > + return GEN12_VD0_AUX_INV;
> > + case VCS2:
> > + return GEN12_VD2_AUX_INV;
> > + case VECS0:
> > + return GEN12_VE0_AUX_INV;
> > + case CCS0:
> > + return GEN12_CCS0_AUX_INV;
> > + default:
> > + return INVALID_MMIO_REG;
> > + }
> > +}
> > +
> > +u32 *gen12_emit_aux_table_inv(struct intel_engine_cs *engine, u32 *cs)
> > +{
> > + i915_reg_t inv_reg = gen12_get_aux_inv_reg(engine);
> > + u32 gsi_offset = engine->gt->uncore->gsi_offset;
> > +
> > + if (i915_mmio_reg_valid(inv_reg))
> > + return cs;
>
> Is that correct? Now the original body of gen12_emit_aux_table_inv() will be
> executed only if either (!HAS_AUX_CCS(engine->i915) or the engine is not one
> of (RCS0, BCS0, VCS0, VCS2 or CCS0), ...
>
> >
> > *cs++ = MI_LOAD_REGISTER_IMM(1) | MI_LRI_MMIO_REMAP_EN;
> > *cs++ = i915_mmio_reg_offset(inv_reg) + gsi_offset;
> > @@ -201,6 +228,11 @@ static u32 *intel_emit_pipe_control_cs(struct i915_request *rq, u32 bit_group_0,
> > return cs;
> > }
> >
> > +static bool gen12_engine_has_aux_inv(struct intel_engine_cs *engine)
> > +{
> > + return i915_mmio_reg_valid(gen12_get_aux_inv_reg(engine));
> > +}
> > +
> > static int mtl_dummy_pipe_control(struct i915_request *rq)
> > {
> > /* Wa_14016712196 */
> > @@ -307,11 +339,7 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode)
> >
> > cs = gen8_emit_pipe_control(cs, flags, LRC_PPHWSP_SCRATCH_ADDR);
> >
> > - if (!HAS_FLAT_CCS(rq->engine->i915)) {
>
> ... while before it was executed only if (!HAS_FLAT_CCS(rq->engine->i915)),
> which, according to commit description of PATCH 2/9, rather had the opposite
> meaning. Am I missing something?
flat_ccs and aux_ccs are not mutually exclusive, so far the can
both miss like in PVC. So that the !HAS_FLAT_CCS() is an
approximation and that's why we need a better evaluation.
Aux invalidation is needed only on platforms from TGL and beyond
excluding PVC. The above engines are the only engines where AUX
invalidation happens, but there are no cases when we reach the
default condition, as the emit_flush_rcs is already called within
that set of engines. The default is there just for completeness.
Does this answer?
Thanks,
Andi
next prev parent reply other threads:[~2023-07-21 14:03 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 21:07 [Intel-gfx] [PATCH v7 0/9] Update AUX invalidation sequence Andi Shyti
2023-07-20 21:07 ` [Intel-gfx] [PATCH v7 1/9] drm/i915/gt: Cleanup aux invalidation registers Andi Shyti
2023-07-20 21:07 ` [Intel-gfx] [PATCH v7 2/9] drm/i915: Add the has_aux_ccs device property Andi Shyti
2023-07-21 9:25 ` [Intel-gfx] [v7, " Krzysztofik, Janusz
2023-07-21 10:02 ` Andi Shyti
2023-07-21 9:41 ` [Intel-gfx] [PATCH v7 " Andrzej Hajda
2023-07-21 10:00 ` Andi Shyti
2023-07-20 21:07 ` [Intel-gfx] [PATCH v7 3/9] drm/i915/gt: Ensure memory quiesced before invalidation Andi Shyti
2023-07-20 21:07 ` [Intel-gfx] [PATCH v7 4/9] drm/i915/gt: Rename flags with bit_group_X according to the datasheet Andi Shyti
2023-07-20 21:07 ` [Intel-gfx] [PATCH v7 5/9] drm/i915/gt: Enable the CCS_FLUSH bit in the pipe control Andi Shyti
2023-07-21 10:05 ` Andrzej Hajda
2023-07-21 10:10 ` Andi Shyti
2023-07-21 10:17 ` Andrzej Hajda
2023-07-21 10:23 ` Andi Shyti
2023-07-21 11:41 ` [Intel-gfx] [v7, " Krzysztofik, Janusz
2023-07-21 12:09 ` Andi Shyti
2023-07-20 21:07 ` [Intel-gfx] [PATCH v7 6/9] drm/i915/gt: Refactor intel_emit_pipe_control_cs() in a single function Andi Shyti
2023-07-21 10:10 ` Andrzej Hajda
2023-07-21 10:12 ` Andi Shyti
2023-07-21 11:54 ` [Intel-gfx] [v7, " Krzysztofik, Janusz
2023-07-20 21:07 ` [Intel-gfx] [PATCH v7 7/9] drm/i915/gt: Ensure memory quiesced before invalidation for all engines Andi Shyti
2023-07-21 12:10 ` [Intel-gfx] [v7, " Krzysztofik, Janusz
2023-07-21 12:45 ` Andi Shyti
2023-07-20 21:07 ` [Intel-gfx] [PATCH v7 8/9] drm/i915/gt: Poll aux invalidation register bit on invalidation Andi Shyti
2023-07-20 21:07 ` [Intel-gfx] [PATCH v7 9/9] drm/i915/gt: Support aux invalidation on all engines Andi Shyti
2023-07-21 13:39 ` [Intel-gfx] [v7, " Krzysztofik, Janusz
2023-07-21 14:02 ` Andi Shyti [this message]
2023-07-20 21:37 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Update AUX invalidation sequence (rev8) Patchwork
2023-07-20 21:37 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-07-20 21:52 ` [Intel-gfx] ✗ Fi.CI.BAT: 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=ZLqQCq5eDId4zRFa@ashyti-mobl2.lan \
--to=andi.shyti@linux.intel.com \
--cc=andrzej.hajda@intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=janusz.krzysztofik@intel.com \
--cc=jonathan.cavitt@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=nirmoy.das@intel.com \
--cc=stable@vger.kernel.org \
/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