From: Michel Thierry <michel.thierry@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH] drm/i915: Update gen8_ppgtt_info to keep working in full ppgtt
Date: Fri, 8 Aug 2014 14:10:32 +0100 [thread overview]
Message-ID: <1407503432-14037-1-git-send-email-michel.thierry@intel.com> (raw)
The driver will no longer initialize the aliasing ppgtt if we have
full ppgtt enabled.
gen8_ppgtt_info uses the aliasing ppgtt or the ppgtt from the
default context. This patch makes it clear.
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 8dc82c3..a62ac66 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1995,8 +1995,14 @@ static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_engine_cs *ring;
struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
+ struct intel_context *ctx = dev_priv->ring[RCS].default_context;
int unused, i;
+ if (USES_FULL_PPGTT(dev))
+ ppgtt = ctx->ppgtt;
+ else
+ ppgtt = dev_priv->mm.aliasing_ppgtt;
+
if (!ppgtt)
return;
--
2.0.3
next reply other threads:[~2014-08-08 13:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-08 13:10 Michel Thierry [this message]
2014-08-08 13:47 ` [PATCH] drm/i915: Update gen8_ppgtt_info to keep working in full ppgtt Daniel Vetter
2014-08-09 0:14 ` 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=1407503432-14037-1-git-send-email-michel.thierry@intel.com \
--to=michel.thierry@intel.com \
--cc=daniel.vetter@ffwll.ch \
--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