From: Michael Cheng <michael.cheng@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: michael.cheng@intel.com, wayne.boyer@intel.com,
lucas.demarchi@intel.com, chris@chris-wilson.co.uk,
mika.kuoppala@intel.com
Subject: [Intel-gfx] [PATCH 1/2] drm/i915/gt: Re-work intel_write_status_page
Date: Thu, 27 Jan 2022 15:41:17 -0800 [thread overview]
Message-ID: <20220127234118.111015-2-michael.cheng@intel.com> (raw)
In-Reply-To: <20220127234118.111015-1-michael.cheng@intel.com>
Re-work intel_write_status_page to use drm_clflush_virt_range. This
will prevent compiler errors when building for non-x86 architectures.
Signed-off-by: Michael Cheng <michael.cheng@intel.com>
---
drivers/gpu/drm/i915/gt/intel_engine.h | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h
index 08559ace0ada..e6189fffa7a3 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine.h
@@ -4,6 +4,7 @@
#include <asm/cacheflush.h>
#include <drm/drm_util.h>
+#include <drm/drm_cache.h>
#include <linux/hashtable.h>
#include <linux/irq_work.h>
@@ -144,15 +145,9 @@ intel_write_status_page(struct intel_engine_cs *engine, int reg, u32 value)
* of extra paranoia to try and ensure that the HWS takes the value
* we give and that it doesn't end up trapped inside the CPU!
*/
- if (static_cpu_has(X86_FEATURE_CLFLUSH)) {
- mb();
- clflush(&engine->status_page.addr[reg]);
- engine->status_page.addr[reg] = value;
- clflush(&engine->status_page.addr[reg]);
- mb();
- } else {
- WRITE_ONCE(engine->status_page.addr[reg], value);
- }
+ drm_clflush_virt_range(&engine->status_page.addr[reg], PAGE_SIZE);
+ WRITE_ONCE(engine->status_page.addr[reg], value);
+ drm_clflush_virt_range(&engine->status_page.addr[reg], PAGE_SIZE);
}
/*
--
2.25.1
next prev parent reply other threads:[~2022-01-27 23:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 23:41 [Intel-gfx] [PATCH 0/2] Use drm_clflush* instead of clflush Michael Cheng
2022-01-27 23:41 ` Michael Cheng [this message]
2022-01-28 9:50 ` [Intel-gfx] [PATCH 1/2] drm/i915/gt: Re-work intel_write_status_page Matthew Auld
2022-01-29 7:20 ` Bowman, Casey G
2022-01-27 23:41 ` [Intel-gfx] [PATCH 2/2] drm/i915/gt: Re-work invalidate_csb_entries Michael Cheng
2022-01-28 10:00 ` Matthew Auld
2022-01-28 1:41 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Use drm_clflush* instead of clflush Patchwork
2022-01-28 2:15 ` [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=20220127234118.111015-2-michael.cheng@intel.com \
--to=michael.cheng@intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
--cc=mika.kuoppala@intel.com \
--cc=wayne.boyer@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