From patchwork Fri Jan 25 20:57:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 2048391 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 943063FD1A for ; Fri, 25 Jan 2013 23:27:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63A2AE6F59 for ; Fri, 25 Jan 2013 15:27:08 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 393BC7AD79 for ; Fri, 25 Jan 2013 12:58:00 -0800 (PST) Received: by mail-gg0-f180.google.com with SMTP id e5so133381ggk.11 for ; Fri, 25 Jan 2013 12:57:59 -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=UUbtWtZFqu5QDxRn8jHWLDt6gl9SWiIlWeLG4TuKbkM=; b=Jpozn0K3ZkbtV+RagtFxeWUJvs/NfhHbvOJODCn7s0wG46/iVRqzFz7y+mb8t56wHS SwPKVC+1sQT8JOGDUDbLEZ2fSPNd5qubd42L8SI6++TYyHCEtxnwBdRX7EaNM/I0FeEA QUVT4x6zuOntksE6gLJFafYK3iWoUsj2IbnidnKLGjWgLCeC10RRcp56AxK7NP8SEIQn jF4f2rP1x8UsOtrvPwXAoJKmQzJgJCa2LG2ydxrr3XoMBWe8AD1ZrMpruIQoXPQ78/XA p8Y5LZaUTeidfGmBXrOZc7Pw/e/eyjMgRQ8itJjhK38EFm2dw/cJGrffKCviI4RMUBAh 3zZg== X-Received: by 10.236.130.235 with SMTP id k71mr7573991yhi.57.1359147479675; Fri, 25 Jan 2013 12:57:59 -0800 (PST) Received: from vicky.domain.invalid ([177.42.13.174]) by mx.google.com with ESMTPS id k63sm2088659yhj.20.2013.01.25.12.57.58 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 25 Jan 2013 12:57:59 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Fri, 25 Jan 2013 18:57:36 -0200 Message-Id: <1359147462-3902-2-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359147462-3902-1-git-send-email-przanoni@gmail.com> References: <1359147462-3902-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 1/7] drm/i915: create macros for the "unclaimed register" checks 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 This avoids polluting i915_write##x and also allows us to reuse code on i915_read##x. Signed-off-by: Paulo Zanoni Reviewed-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9cc8f87..ae0a55a 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1224,6 +1224,20 @@ ilk_dummy_write(struct drm_i915_private *dev_priv) I915_WRITE_NOTRACE(MI_MODE, 0); } +#define UNCLAIMED_REG_CLEAR(dev_priv, reg) \ + if (IS_HASWELL(dev_priv->dev) && \ + (I915_READ_NOTRACE(GEN7_ERR_INT) & ERR_INT_MMIO_UNCLAIMED)) { \ + DRM_ERROR("Unknown unclaimed register before writing to %x\n", reg); \ + I915_WRITE_NOTRACE(GEN7_ERR_INT, ERR_INT_MMIO_UNCLAIMED); \ + } + +#define UNCLAIMED_REG_CHECK(dev_priv, reg) \ + if (IS_HASWELL(dev_priv->dev) && \ + (I915_READ_NOTRACE(GEN7_ERR_INT) & ERR_INT_MMIO_UNCLAIMED)) { \ + DRM_ERROR("Unclaimed write to %x\n", reg); \ + writel(ERR_INT_MMIO_UNCLAIMED, dev_priv->regs + GEN7_ERR_INT); \ + } + #define __i915_read(x, y) \ u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \ u##x val = 0; \ @@ -1262,10 +1276,7 @@ void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val) { \ } \ if (IS_GEN5(dev_priv->dev)) \ ilk_dummy_write(dev_priv); \ - if (IS_HASWELL(dev_priv->dev) && (I915_READ_NOTRACE(GEN7_ERR_INT) & ERR_INT_MMIO_UNCLAIMED)) { \ - DRM_ERROR("Unknown unclaimed register before writing to %x\n", reg); \ - I915_WRITE_NOTRACE(GEN7_ERR_INT, ERR_INT_MMIO_UNCLAIMED); \ - } \ + UNCLAIMED_REG_CLEAR(dev_priv, reg); \ if (IS_VALLEYVIEW(dev_priv->dev) && IS_DISPLAYREG(reg)) { \ write##y(val, dev_priv->regs + reg + 0x180000); \ } else { \ @@ -1274,10 +1285,7 @@ void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val) { \ if (unlikely(__fifo_ret)) { \ gen6_gt_check_fifodbg(dev_priv); \ } \ - if (IS_HASWELL(dev_priv->dev) && (I915_READ_NOTRACE(GEN7_ERR_INT) & ERR_INT_MMIO_UNCLAIMED)) { \ - DRM_ERROR("Unclaimed write to %x\n", reg); \ - writel(ERR_INT_MMIO_UNCLAIMED, dev_priv->regs + GEN7_ERR_INT); \ - } \ + UNCLAIMED_REG_CHECK(dev_priv, reg); \ } __i915_write(8, b) __i915_write(16, w)