From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org, stable@vger.kernel.org,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: [Intel-gfx] [PATCH 3/4] drm/i915: Catch yet another unconditioal clflush
Date: Thu, 14 Oct 2021 12:09:40 +0300 [thread overview]
Message-ID: <20211014090941.12159-4-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20211014090941.12159-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Replace the unconditional clflush() with drm_clflush_virt_range()
which does the wbinvd() fallback when clflush is not available.
This time no justification is given for the clflush in the
offending commit.
Cc: stable@vger.kernel.org
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Fixes: 2c8ab3339e39 ("drm/i915: Pin timeline map after first timeline pin, v4.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/gt/intel_timeline.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c b/drivers/gpu/drm/i915/gt/intel_timeline.c
index 23d7328892ed..438bbc7b8147 100644
--- a/drivers/gpu/drm/i915/gt/intel_timeline.c
+++ b/drivers/gpu/drm/i915/gt/intel_timeline.c
@@ -64,7 +64,7 @@ intel_timeline_pin_map(struct intel_timeline *timeline)
timeline->hwsp_map = vaddr;
timeline->hwsp_seqno = memset(vaddr + ofs, 0, TIMELINE_SEQNO_BYTES);
- clflush(vaddr + ofs);
+ drm_clflush_virt_range(vaddr + ofs, TIMELINE_SEQNO_BYTES);
return 0;
}
--
2.32.0
next prev parent reply other threads:[~2021-10-14 9:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-14 9:09 [Intel-gfx] [PATCH 0/4] drm/i915: Make the driver not oops on load on old machines Ville Syrjala
2021-10-14 9:09 ` [Intel-gfx] [PATCH 1/4] drm/i915: Replace the unconditional clflush with drm_clflush_virt_range() Ville Syrjala
2021-10-14 9:09 ` [Intel-gfx] [PATCH 2/4] drm/i915: Convert unconditional clflush to drm_clflush_virt_range() Ville Syrjala
2021-10-14 9:09 ` Ville Syrjala [this message]
2021-10-14 9:09 ` [Intel-gfx] [PATCH 4/4] drm/i915: Fix oops on platforms w/o hpd support Ville Syrjala
2021-10-14 9:18 ` Jani Nikula
2021-10-14 9:20 ` Jani Nikula
2021-10-14 9:27 ` Ville Syrjälä
2021-10-14 9:29 ` Ville Syrjälä
2021-10-14 9:31 ` Sarvela, Tomi P
2021-10-14 9:36 ` Ville Syrjälä
2021-10-14 9:42 ` Sarvela, Tomi P
2021-10-14 10:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Make the driver not oops on load on old machines Patchwork
2021-10-14 11:24 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-10-17 23:54 ` [Intel-gfx] [PATCH 0/4] " Dave Airlie
2021-10-19 9:08 ` Ville Syrjälä
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=20211014090941.12159-4-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=stable@vger.kernel.org \
--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