All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Cc: matthew.auld@intel.com
Subject: [PATCH 04/15] drm/i915/gt: Assume we hold forcewake for execlists resume
Date: Wed,  3 Jul 2019 10:17:15 +0100	[thread overview]
Message-ID: <20190703091726.11690-4-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <20190703091726.11690-1-chris@chris-wilson.co.uk>

We can assume the caller is holding a blanket forcewake for the
register writes during resume, and so we can skip taking individual
locks around each write inside execlists resume.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/gt/intel_lrc.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 953b3938a85f..497ca52381a7 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -2076,22 +2076,23 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)
 
 static void enable_execlists(struct intel_engine_cs *engine)
 {
+	u32 mode;
+
+	assert_forcewakes_active(engine->uncore, FORCEWAKE_ALL);
+
 	intel_engine_set_hwsp_writemask(engine, ~0u); /* HWSTAM */
 
 	if (INTEL_GEN(engine->i915) >= 11)
-		ENGINE_WRITE(engine,
-			     RING_MODE_GEN7,
-			     _MASKED_BIT_ENABLE(GEN11_GFX_DISABLE_LEGACY_MODE));
+		mode = _MASKED_BIT_ENABLE(GEN11_GFX_DISABLE_LEGACY_MODE);
 	else
-		ENGINE_WRITE(engine,
-			     RING_MODE_GEN7,
-			     _MASKED_BIT_ENABLE(GFX_RUN_LIST_ENABLE));
+		mode = _MASKED_BIT_ENABLE(GFX_RUN_LIST_ENABLE);
+	ENGINE_WRITE_FW(engine, RING_MODE_GEN7, mode);
 
-	ENGINE_WRITE(engine, RING_MI_MODE, _MASKED_BIT_DISABLE(STOP_RING));
+	ENGINE_WRITE_FW(engine, RING_MI_MODE, _MASKED_BIT_DISABLE(STOP_RING));
 
-	ENGINE_WRITE(engine,
-		     RING_HWS_PGA,
-		     i915_ggtt_offset(engine->status_page.vma));
+	ENGINE_WRITE_FW(engine,
+			RING_HWS_PGA,
+			i915_ggtt_offset(engine->status_page.vma));
 	ENGINE_POSTING_READ(engine, RING_HWS_PGA);
 }
 
@@ -2099,7 +2100,7 @@ static bool unexpected_starting_state(struct intel_engine_cs *engine)
 {
 	bool unexpected = false;
 
-	if (ENGINE_READ(engine, RING_MI_MODE) & STOP_RING) {
+	if (ENGINE_READ_FW(engine, RING_MI_MODE) & STOP_RING) {
 		DRM_DEBUG_DRIVER("STOP_RING still set in RING_MI_MODE\n");
 		unexpected = true;
 	}
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-07-03  9:19 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-03  9:17 [PATCH 01/15] drm/i915/selftests: Common live setup/teardown Chris Wilson
2019-07-03  9:17 ` [PATCH 02/15] drm/i915/selftests: Lock the drm_mm while modifying Chris Wilson
2019-07-03  9:50   ` Matthew Auld
2019-07-03  9:17 ` [PATCH 03/15] drm/i915/gt: Use caller provided forcewake for intel_mocs_init_engine Chris Wilson
2019-07-03 11:23   ` Tvrtko Ursulin
2019-07-03 11:47     ` Chris Wilson
2019-07-03 12:01       ` Tvrtko Ursulin
2019-07-03  9:17 ` Chris Wilson [this message]
2019-07-03 12:03   ` [PATCH 04/15] drm/i915/gt: Assume we hold forcewake for execlists resume Tvrtko Ursulin
2019-07-03  9:17 ` [PATCH 05/15] drm/i915/gt: Ignore forcewake acquisition for posting_reads Chris Wilson
2019-07-03 11:26   ` Tvrtko Ursulin
2019-07-03 11:44     ` Chris Wilson
2019-07-03  9:17 ` [PATCH 06/15] drm/i915/gem: Free pages before rcu-freeing the object Chris Wilson
2019-07-03 10:37   ` Matthew Auld
2019-07-03  9:17 ` [PATCH 07/15] drm/i915: Markup potential lock for i915_active Chris Wilson
2019-07-03 10:38   ` Matthew Auld
2019-07-03  9:17 ` [PATCH 08/15] drm/i915: Mark up vma->active as safe for use inside shrinkers Chris Wilson
2019-07-03 10:53   ` Matthew Auld
2019-07-03  9:17 ` [PATCH 09/15] drm/i915/execlists: Hesitate before slicing Chris Wilson
2019-07-03  9:17 ` [PATCH 10/15] drm/i915: Teach execbuffer to take the engine wakeref not GT Chris Wilson
2019-07-03  9:17 ` [PATCH 11/15] drm/i915/gt: Track timeline activeness in enter/exit Chris Wilson
2019-07-03  9:17 ` [PATCH 12/15] drm/i915/gt: Convert timeline tracking to spinlock Chris Wilson
2019-07-03  9:17 ` [PATCH 13/15] drm/i915/gt: Guard timeline pinning with its own mutex Chris Wilson
2019-07-03  9:17 ` [PATCH 14/15] drm/i915: Protect request retirement with timeline->mutex Chris Wilson
2019-07-03  9:17 ` [PATCH 15/15] drm/i915: Replace struct_mutex for batch pool serialisation Chris Wilson
2019-07-03  9:41 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/15] drm/i915/selftests: Common live setup/teardown Patchwork
2019-07-03  9:47 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-07-03  9:48 ` [PATCH 01/15] " Matthew Auld
2019-07-03 10:04   ` Chris Wilson
2019-07-03  9:59 ` ✓ Fi.CI.BAT: success for series starting with [01/15] " Patchwork
2019-07-04  3:22 ` ✗ 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=20190703091726.11690-4-chris@chris-wilson.co.uk \
    --to=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=matthew.auld@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.