From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 3/3] drm/i915: clear the FPGA_DBG_RM_NOCLAIM bit at driver init Date: Tue, 29 Jan 2013 17:02:52 -0200 Message-ID: <1359486172-3649-1-git-send-email-przanoni@gmail.com> References: <1359147462-3902-4-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-gg0-f179.google.com (mail-gg0-f179.google.com [209.85.161.179]) by gabe.freedesktop.org (Postfix) with ESMTP id 44D36E64F8 for ; Tue, 29 Jan 2013 11:03:08 -0800 (PST) Received: by mail-gg0-f179.google.com with SMTP id h4so122630ggn.38 for ; Tue, 29 Jan 2013 11:03:08 -0800 (PST) In-Reply-To: <1359147462-3902-4-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@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 Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_dma.c | 4 ++++ 1 file changed, 4 insertions(+) If no one is opposed, I'd like to suggest applying patches 1-3 from this series first, then we worry about the others later. diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index cf06103..d295445 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 = -- 1.7.10.4