From: Ramalingam C <ramalingam.c@intel.com>
To: intel-gfx <intel-gfx@lists.freedesktop.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Hellstrom Thomas <thomas.hellstrom@intel.com>
Cc: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>,
Hellstrom Thomas <thomas.hellstrom@intel.com>,
Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [Intel-gfx] [PATCH v4 1/4] drm/i915/gt: Explicitly clear BB_OFFSET for new contexts
Date: Mon, 2 May 2022 18:11:02 +0530 [thread overview]
Message-ID: <20220502124101.GF31513@intel.com> (raw)
In-Reply-To: <20220502111003.32397-2-ramalingam.c@intel.com>
On 2022-05-02 at 16:40:00 +0530, Ramalingam C wrote:
> From: Chris Wilson <chris@chris-wilson.co.uk>
>
> Even though the initial protocontext we load onto HW has the register
> cleared, by the time we save it into the default image, BB_OFFSET has
> had the enable bit set. Reclear BB_OFFSET for each new context.
>
> Testcase: igt/i915_selftests/gt_lrc
>
> v2:
> Extend it for gen8.
> v3:
> BB_OFFSET is recorded per engine from Gen9 onwards
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> Reviewed-by: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Thomas,
Could you please reconfirm your R-b for v3? This R-b was given for v1.
Ram
> ---
> drivers/gpu/drm/i915/gt/intel_engine_regs.h | 1 +
> drivers/gpu/drm/i915/gt/intel_lrc.c | 20 ++++++++++++++++++++
> drivers/gpu/drm/i915/gt/selftest_lrc.c | 5 +++++
> 3 files changed, 26 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_regs.h b/drivers/gpu/drm/i915/gt/intel_engine_regs.h
> index 75a0c55c5aa5..8c65f3a7acfb 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_regs.h
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_regs.h
> @@ -109,6 +109,7 @@
> #define RING_SBBSTATE(base) _MMIO((base) + 0x118) /* hsw+ */
> #define RING_SBBADDR_UDW(base) _MMIO((base) + 0x11c) /* gen8+ */
> #define RING_BBADDR(base) _MMIO((base) + 0x140)
> +#define RING_BB_OFFSET(base) _MMIO((base) + 0x158)
> #define RING_BBADDR_UDW(base) _MMIO((base) + 0x168) /* gen8+ */
> #define CCID(base) _MMIO((base) + 0x180)
> #define CCID_EN BIT(0)
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index eec73c66406c..ee8ab7470a62 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -662,6 +662,21 @@ static int lrc_ring_mi_mode(const struct intel_engine_cs *engine)
> return -1;
> }
>
> +static int lrc_ring_bb_offset(const struct intel_engine_cs *engine)
> +{
> + if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50))
> + return 0x80;
> + else if (GRAPHICS_VER(engine->i915) >= 12)
> + return 0x70;
> + else if (GRAPHICS_VER(engine->i915) >= 9)
> + return 0x64;
> + else if (GRAPHICS_VER(engine->i915) >= 8 &&
> + engine->class == RENDER_CLASS)
> + return 0xc4;
> + else
> + return -1;
> +}
> +
> static int lrc_ring_gpr0(const struct intel_engine_cs *engine)
> {
> if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50))
> @@ -768,6 +783,7 @@ static void init_common_regs(u32 * const regs,
> bool inhibit)
> {
> u32 ctl;
> + int loc;
>
> ctl = _MASKED_BIT_ENABLE(CTX_CTRL_INHIBIT_SYN_CTX_SWITCH);
> ctl |= _MASKED_BIT_DISABLE(CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT);
> @@ -779,6 +795,10 @@ static void init_common_regs(u32 * const regs,
> regs[CTX_CONTEXT_CONTROL] = ctl;
>
> regs[CTX_TIMESTAMP] = ce->stats.runtime.last;
> +
> + loc = lrc_ring_bb_offset(engine);
> + if (loc != -1)
> + regs[loc + 1] = 0;
> }
>
> static void init_wa_bb_regs(u32 * const regs,
> diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> index 8b2c11dbe354..c4bd4e1ac5ef 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> @@ -357,6 +357,11 @@ static int live_lrc_fixed(void *arg)
> lrc_ring_cmd_buf_cctl(engine),
> "RING_CMD_BUF_CCTL"
> },
> + {
> + i915_mmio_reg_offset(RING_BB_OFFSET(engine->mmio_base)),
> + lrc_ring_bb_offset(engine),
> + "RING_BB_OFFSET"
> + },
> { },
> }, *t;
> u32 *hw;
> --
> 2.20.1
>
next prev parent reply other threads:[~2022-05-02 12:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-02 11:09 [Intel-gfx] [PATCH v4 0/4] lrc selftest fixes Ramalingam C
2022-05-02 11:10 ` [Intel-gfx] [PATCH v4 1/4] drm/i915/gt: Explicitly clear BB_OFFSET for new contexts Ramalingam C
2022-05-02 12:41 ` Ramalingam C [this message]
2022-05-02 11:10 ` [Intel-gfx] [PATCH v4 2/4] drm/i915/selftests: Check for incomplete LRI from the context image Ramalingam C
2022-05-02 11:10 ` [Intel-gfx] [PATCH v4 3/4] drm/i915/selftest: Always cancel semaphore on error Ramalingam C
2022-05-02 11:10 ` [Intel-gfx] [PATCH v4 4/4] drm/i915/selftest: Clear the output buffers before GPU writes Ramalingam C
2022-05-02 11:39 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for lrc selftest fixes (rev6) Patchwork
2022-05-02 12:03 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-05-02 15:12 ` [Intel-gfx] ✗ Fi.CI.IGT: 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=20220502124101.GF31513@intel.com \
--to=ramalingam.c@intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=thomas.hellstrom@intel.com \
--cc=thomas.hellstrom@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