From patchwork Sat Jan 19 03:18:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 2006101 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 3B0E83FD86 for ; Sat, 19 Jan 2013 03:28:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E1E5EE5D50 for ; Fri, 18 Jan 2013 19:28:23 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from shiva.chad-versace.us (209-20-75-48.static.cloud-ips.com [209.20.75.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 39848E5D50 for ; Fri, 18 Jan 2013 19:17:18 -0800 (PST) Received: by shiva.chad-versace.us (Postfix, from userid 1005) id 0798E88120; Sat, 19 Jan 2013 03:19:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on shiva.chad-versace.us X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 Received: from lundgren.kumite (c-24-21-100-90.hsd1.or.comcast.net [24.21.100.90]) by shiva.chad-versace.us (Postfix) with ESMTPSA id B10F4880FF; Sat, 19 Jan 2013 03:19:42 +0000 (UTC) From: Ben Widawsky To: intel-gfx@lists.freedesktop.org Date: Fri, 18 Jan 2013 19:18:19 -0800 Message-Id: <1358565499-1388-1-git-send-email-ben@bwidawsk.net> X-Mailer: git-send-email 1.8.1.1 Cc: Daniel Vetter , Ben Widawsky Subject: [Intel-gfx] [PATCH] drm/i915: re-add dropped dma_mask configuration 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org I'm pretty sure without this, and with DMAR, things explode spectacularly. I got to this patch via bisecting broken i-g-t on my machine. If I had wired ethernet, I would figure out exactly what's failing with netconsole. To be honest, nothing particularly stands out to me looking over the code as to why it should fail though. If someone is more inquisitive than I, I would be interested to know why we actually need this bit of code. Not sure if things are broken without DMAR. Daniel noticed this was accidentally dropped after I rebased my branch, but figured it wasn't really needed. Seems it is. Given that my patch: commit 2ca466ae28f25e62090e4b57c90bcfee080a47a9 Author: Ben Widawsky Date: Fri Jan 18 12:30:33 2013 -0800 drm/i915: Needs_dmar, not I'd suggest just squashing this into 2ca466ae28 since this was never intentional anyway. Cc: Daniel Vetter Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index f8fb7e3..a0ba4a9 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -721,6 +721,9 @@ int i915_gem_gtt_init(struct drm_device *dev) return 0; } + if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(40))) + pci_set_consistent_dma_mask(dev->pdev, DMA_BIT_MASK(40)); + dev_priv->mm.gtt = kzalloc(sizeof(*dev_priv->mm.gtt), GFP_KERNEL); if (!dev_priv->mm.gtt) return -ENOMEM;