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>
Cc: Ben Widawsky <ben@bwidawsk.net>,
	Ben Widawsky <benjamin.widawsky@intel.com>
Subject: [PATCH] drm/i915/bdw: Fix 4g GGTT insert entries regression
Date: Tue,  4 Mar 2014 21:23:19 -0800	[thread overview]
Message-ID: <1393996999-1930-1-git-send-email-benjamin.widawsky@intel.com> (raw)

The PDE needs to wrap after writing all the PTEs. Quite a small/silly
bug to find in the massive change. It was introduced:
commit 307dc4f99f6d3a74a78b0e776838f35b2004f14d
Author: Ben Widawsky <benjamin.widawsky@intel.com>
Date:   Thu Feb 20 11:51:21 2014 -0800

    drm/i915/bdw: Reorganize PT allocations

I can't actually test this patch at the moment because my Broadwell is
unresponsive. This should be squashed if possible.

Cc: Imre Deak <imre.deak@intel.com>
Reported-by: Timo Aaltonen <tjaalton@ubuntu.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75763
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 5462037..2bde703 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -335,7 +335,7 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm,
 		if (++pte == GEN8_PTES_PER_PAGE) {
 			kunmap_atomic(pt_vaddr);
 			pt_vaddr = NULL;
-			if (pde + 1 == GEN8_PDES_PER_PAGE) {
+			if (++pde == GEN8_PDES_PER_PAGE) {
 				pdpe++;
 				pde = 0;
 			}
-- 
1.9.0

             reply	other threads:[~2014-03-05  5:23 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-05  5:23 Ben Widawsky [this message]
2014-03-05  9:13 ` [PATCH] drm/i915/bdw: Fix 4g GGTT insert entries regression Jani Nikula
2014-03-05 15:24   ` Ben Widawsky
2014-03-05 20:19     ` Ben Widawsky
2014-03-05 20:28       ` Daniel Vetter
2014-03-06  5:31         ` Jani Nikula

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=1393996999-1930-1-git-send-email-benjamin.widawsky@intel.com \
    --to=benjamin.widawsky@intel.com \
    --cc=ben@bwidawsk.net \
    --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