From: Andrzej Hajda <andrzej.hajda@intel.com>
To: Tejas Upadhyay <tejas.upadhyay@intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH V5] drm/i915/gt: Add workaround 14016712196
Date: Thu, 1 Jun 2023 16:59:56 +0200 [thread overview]
Message-ID: <6d288d23-458d-5559-bc6b-efa1fc869dcf@intel.com> (raw)
In-Reply-To: <20230601110959.1715927-1-tejas.upadhyay@intel.com>
On 01.06.2023 13:09, Tejas Upadhyay wrote:
> For mtl, workaround suggests that, SW insert a
> dummy PIPE_CONTROL prior to PIPE_CONTROL which
> contains a post sync: Timestamp or Write Immediate.
>
> Bspec: 72197
>
> V5:
> - Remove ret variable - Andi
> V4:
> - Update commit message, avoid returing cs - Andi/Matt
> V3:
> - Wrap dummy pipe control stuff in API - Andi
> V2:
> - Fix kernel test robot warnings
>
> Closes: https://lore.kernel.org/oe-kbuild-all/202305121525.3EWdGoBY-lkp@intel.com/
> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
> Signed-off-by: Tejas Upadhyay <tejas.upadhyay@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Regards
Andrzej
> ---
> drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 38 ++++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> index e1c76e5bfa82..23857cc08eca 100644
> --- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> +++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
> @@ -177,14 +177,40 @@ u32 *gen12_emit_aux_table_inv(struct intel_gt *gt, u32 *cs, const i915_reg_t inv
> return cs;
> }
>
> +static int mtl_dummy_pipe_control(struct i915_request *rq)
> +{
> + /* Wa_14016712196 */
> + if (IS_MTL_GRAPHICS_STEP(rq->engine->i915, M, STEP_A0, STEP_B0) ||
> + IS_MTL_GRAPHICS_STEP(rq->engine->i915, P, STEP_A0, STEP_B0)) {
> + u32 *cs;
> +
> + /* dummy PIPE_CONTROL + depth flush */
> + cs = intel_ring_begin(rq, 6);
> + if (IS_ERR(cs))
> + return PTR_ERR(cs);
> + cs = gen12_emit_pipe_control(cs,
> + 0,
> + PIPE_CONTROL_DEPTH_CACHE_FLUSH,
> + LRC_PPHWSP_SCRATCH_ADDR);
> + intel_ring_advance(rq, cs);
> + }
> +
> + return 0;
> +}
> +
> int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode)
> {
> struct intel_engine_cs *engine = rq->engine;
>
> if (mode & EMIT_FLUSH) {
> u32 flags = 0;
> + int err;
> u32 *cs;
>
> + err = mtl_dummy_pipe_control(rq);
> + if (err)
> + return err;
> +
> flags |= PIPE_CONTROL_TILE_CACHE_FLUSH;
> flags |= PIPE_CONTROL_FLUSH_L3;
> flags |= PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH;
> @@ -217,6 +243,11 @@ int gen12_emit_flush_rcs(struct i915_request *rq, u32 mode)
> if (mode & EMIT_INVALIDATE) {
> u32 flags = 0;
> u32 *cs, count;
> + int err;
> +
> + err = mtl_dummy_pipe_control(rq);
> + if (err)
> + return err;
>
> flags |= PIPE_CONTROL_COMMAND_CACHE_INVALIDATE;
> flags |= PIPE_CONTROL_TLB_INVALIDATE;
> @@ -733,6 +764,13 @@ u32 *gen12_emit_fini_breadcrumb_rcs(struct i915_request *rq, u32 *cs)
> PIPE_CONTROL_DC_FLUSH_ENABLE |
> PIPE_CONTROL_FLUSH_ENABLE);
>
> + /* Wa_14016712196 */
> + if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) ||
> + IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0))
> + /* dummy PIPE_CONTROL + depth flush */
> + cs = gen12_emit_pipe_control(cs, 0,
> + PIPE_CONTROL_DEPTH_CACHE_FLUSH, 0);
> +
> if (GRAPHICS_VER(i915) == 12 && GRAPHICS_VER_FULL(i915) < IP_VER(12, 50))
> /* Wa_1409600907 */
> flags |= PIPE_CONTROL_DEPTH_STALL;
next prev parent reply other threads:[~2023-06-01 15:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 11:09 [Intel-gfx] [PATCH V5] drm/i915/gt: Add workaround 14016712196 Tejas Upadhyay
2023-06-01 14:59 ` Andrzej Hajda [this message]
2023-06-01 19:50 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Add workaround 14016712196 (rev5) Patchwork
2023-06-03 20:42 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-06-05 9:43 ` [Intel-gfx] [PATCH V5] drm/i915/gt: Add workaround 14016712196 Andi Shyti
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=6d288d23-458d-5559-bc6b-efa1fc869dcf@intel.com \
--to=andrzej.hajda@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=tejas.upadhyay@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.