From patchwork Wed Mar 5 05:23:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 3770681 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9CAC3BF13A for ; Wed, 5 Mar 2014 05:23:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF26620221 for ; Wed, 5 Mar 2014 05:23:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CF05820218 for ; Wed, 5 Mar 2014 05:23:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 17B4FFA2F3; Tue, 4 Mar 2014 21:23:27 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 65AF0FA2F3 for ; Tue, 4 Mar 2014 21:23:24 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 04 Mar 2014 21:18:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,590,1389772800"; d="scan'208";a="494268050" Received: from statham.jf.intel.com ([10.7.197.81]) by orsmga002.jf.intel.com with ESMTP; 04 Mar 2014 21:23:23 -0800 From: Ben Widawsky To: Intel GFX Date: Tue, 4 Mar 2014 21:23:19 -0800 Message-Id: <1393996999-1930-1-git-send-email-benjamin.widawsky@intel.com> X-Mailer: git-send-email 1.9.0 Cc: Ben Widawsky , Ben Widawsky Subject: [Intel-gfx] [PATCH] drm/i915/bdw: Fix 4g GGTT insert entries regression X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 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 Reported-by: Timo Aaltonen Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75763 Signed-off-by: Ben Widawsky --- 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; }