From patchwork Mon Feb 18 22:00:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 2160521 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id C8440DF25A for ; Mon, 18 Feb 2013 22:02:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C25B2E636B for ; Mon, 18 Feb 2013 14:02:35 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ye0-f177.google.com (mail-ye0-f177.google.com [209.85.213.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 830ABE643D for ; Mon, 18 Feb 2013 14:01:03 -0800 (PST) Received: by mail-ye0-f177.google.com with SMTP id m14so1098296yen.8 for ; Mon, 18 Feb 2013 14:01:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tYDxzpMn9xNE40aQZwzf7OGA0XPEF6D8jm5ohalIJQQ=; b=ouzAVKWXEDLYZ1LrEMQigfDjxKBnAF58KDEbfV9yh6J8hlT8u97KEJ9OsfTUIdXXCU xoZlLbRvG2LkWy0+9PeoGjGAwDByTuyXukqHYjNsKCzsFSU1TccF1oL8NKCRmORzt93S W+SOsh/41RVkrUYo/vI1zuPjbyANzfzu3Dzc26tT6XW3c4zGk+3N/fT3AETEveow/NMt 1CFQQQ8obcKnaEuxruBslUgMs+wulJSqXKHuDkovIRV+EHpM4pFtt1gVMcl25d2JUE97 TqMcna6AhuiFl7YNapi6vf96ovIYerCsVzxfqVkdxDv13TaNWGVls5qii1UVHChao7Az uelA== X-Received: by 10.236.152.5 with SMTP id c5mr23993745yhk.22.1361224862807; Mon, 18 Feb 2013 14:01:02 -0800 (PST) Received: from localhost.localdomain ([177.96.10.96]) by mx.google.com with ESMTPS id f29sm64517530anj.17.2013.02.18.14.01.01 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Feb 2013 14:01:02 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Mon, 18 Feb 2013 19:00:22 -0300 Message-Id: <1361224828-3730-4-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361224828-3730-1-git-send-email-przanoni@gmail.com> References: <1361224828-3730-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 3/8] drm/i915: clear the FPGA_DBG_RM_NOCLAIM bit at driver init 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 From: Paulo Zanoni Otherwise, if the BIOS did anything wrong, our first I915_{WRITE,READ} will give us "unclaimed register" messages. V2: Even earlier. Bugzilla: http://bugs.freedesktop.org/show_bug.cgi?id=58897 Reviewed-by: Ben Widawsky Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_dma.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 4fa6beb..6d8672e 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1542,6 +1542,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) goto put_gmch; } + /* This must happen before any I915_{READ,WRITE}: */ + if (IS_HASWELL(dev)) + I915_WRITE_NOTRACE(FPGA_DBG, FPGA_DBG_RM_NOCLAIM); + aperture_size = dev_priv->gtt.mappable_end; dev_priv->gtt.mappable =