From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 3/7] drm/i915: clear the FPGA_DBG_RM_NOCLAIM bit at driver init Date: Fri, 25 Jan 2013 18:57:38 -0200 Message-ID: <1359147462-3902-4-git-send-email-przanoni@gmail.com> References: <1359147462-3902-1-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-f181.google.com (mail-gg0-f181.google.com [209.85.161.181]) by gabe.freedesktop.org (Postfix) with ESMTP id AB8F4E6EEC for ; Fri, 25 Jan 2013 12:58:03 -0800 (PST) Received: by mail-gg0-f181.google.com with SMTP id e5so130378ggh.26 for ; Fri, 25 Jan 2013 12:58:03 -0800 (PST) In-Reply-To: <1359147462-3902-1-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_{READ,WRITE} will give us "unclaimed regsiter" messages. 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 11c7aa8..505d7eb 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1578,6 +1578,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) /* This must be called before any calls to HAS_PCH_* */ intel_detect_pch(dev); + /* This must happen before any I915_{READ,WRITE}: */ + if (IS_HASWELL(dev)) + I915_WRITE_NOTRACE(FPGA_DBG, FPGA_DBG_RM_NOCLAIM); + intel_irq_init(dev); intel_gt_init(dev); -- 1.7.10.4