Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ashutosh Dixit <ashutosh.dixit@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Subject: [PATCH] drm/xe/oa: Insert wmb/sfence before enabling OA
Date: Mon,  9 Sep 2024 19:59:07 -0700	[thread overview]
Message-ID: <20240910025907.2667875-1-ashutosh.dixit@intel.com> (raw)

We are occasionally seeing that OA Buffer register is not programmed (has
value 0) when OA is enabled. This means OA has been enabled before it has
been fully configured. Or, the register write enabling OA has overtaken
previous OA configuration register writes.

Therefore, insert a wmb/sfence to preserve OA register write ordering
before enabling OA.

v2: s/wmb()/xe_device_wmb()/

Fixes: e936f885f1e9 ("drm/xe/oa/uapi: Expose OA stream fd")
Reported-by: Guy Zadicario <guy.zadicario@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/xe/xe_oa.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
index 63286ed8457fa..4fb7aae37a94f 100644
--- a/drivers/gpu/drm/xe/xe_oa.c
+++ b/drivers/gpu/drm/xe/xe_oa.c
@@ -440,6 +440,9 @@ static void xe_oa_enable(struct xe_oa_stream *stream)
 	val = __format_to_oactrl(format, regs->oa_ctrl_counter_select_mask) |
 		__oa_ccs_select(stream) | OAG_OACONTROL_OA_COUNTER_ENABLE;
 
+	/* Flush previous writes to HW before enabling OA */
+	xe_device_wmb(stream->oa->xe);
+
 	xe_mmio_write32(stream->gt, regs->oa_ctrl, val);
 }
 
-- 
2.41.0


             reply	other threads:[~2024-09-10  2:59 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-10  2:59 Ashutosh Dixit [this message]
2024-09-10  3:16 ` ✓ CI.Patch_applied: success for drm/xe/oa: Insert wmb/sfence before enabling OA (rev6) Patchwork
2024-09-10  3:16 ` ✗ CI.checkpatch: warning " Patchwork
2024-09-10  3:19 ` ✓ CI.KUnit: success " Patchwork
2024-09-10  3:31 ` ✓ CI.Build: " Patchwork
2024-09-10  3:34 ` ✓ CI.Hooks: " Patchwork
2024-09-10  3:35 ` ✓ CI.checksparse: " Patchwork
2024-09-10  4:37 ` ✗ CI.BAT: failure " Patchwork
2024-09-10  6:36 ` ✗ CI.FULL: " Patchwork
2024-09-10 10:14 ` [PATCH] drm/xe/oa: Insert wmb/sfence before enabling OA Jani Nikula
2024-09-10 16:17   ` Dixit, Ashutosh
2024-09-10 16:14 ` Matthew Brost
2024-09-10 20:28   ` Dixit, Ashutosh
  -- strict thread matches above, loose matches on Subject: below --
2024-09-10  1:39 Ashutosh Dixit
2024-09-10  0:43 Ashutosh Dixit
2024-08-28 15:55 Ashutosh Dixit
2024-08-26 23:34 Ashutosh Dixit
2024-08-26 23:29 Ashutosh Dixit

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=20240910025907.2667875-1-ashutosh.dixit@intel.com \
    --to=ashutosh.dixit@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=umesh.nerlige.ramappa@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