public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Ben Widawsky <benjamin.widawsky@intel.com>
To: Intel GFX <intel-gfx@lists.freedesktop.org>
Subject: [PATCH 2/3] [v2] drm/i915/bdw: Render ring PDP is restored with context
Date: Tue,  1 Apr 2014 17:43:06 -0700	[thread overview]
Message-ID: <1396399386-3825-1-git-send-email-benjamin.widawsky@intel.com> (raw)
In-Reply-To: <1396399052-20612-2-git-send-email-benjamin.widawsky@intel.com>

So let's not do it every time we switch.

v2: v1 skipped the switch for all gens. We still need it pre-gen8.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 drivers/gpu/drm/i915/i915_gem_context.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 0e8fd1e..3b5b8ab 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -710,7 +710,8 @@ static int do_switch(struct intel_ring_buffer *ring,
 	if (ret)
 		goto unpin_out;
 
-	if (USES_FULL_PPGTT(ring->dev)) {
+	if (USES_FULL_PPGTT(ring->dev) &&
+	    (!IS_GEN8(ring->dev) || !to->is_initialized)) {
 		ret = ppgtt->switch_mm(ppgtt, ring, false);
 		/* The hardware context switch is emitted, but we haven't
 		 * actually changed the state - so it's probably safe to bail
-- 
1.9.1

  reply	other threads:[~2014-04-02  0:43 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-01 15:55 [PATCH] drm/i915/bdw: Enable full PPGTT Ben Widawsky
2014-04-01 23:12 ` Ben Widawsky
2014-04-02  0:37   ` [PATCH 1/3] drm/i915/ppgtt: Load address space after mi_set_context Ben Widawsky
2014-04-02  0:37     ` [PATCH 2/3] drm/i915/bdw: Render ring PDP is restored with context Ben Widawsky
2014-04-02  0:43       ` Ben Widawsky [this message]
2014-04-02  3:35         ` [PATCH 2/3] [v2] " Ben Widawsky
2014-04-02  0:37     ` [PATCH 3/3] drm/i915/bdw: Enable full PPGTT Ben Widawsky

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=1396399386-3825-1-git-send-email-benjamin.widawsky@intel.com \
    --to=benjamin.widawsky@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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