From patchwork Thu Oct 13 10:03:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9374691 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3B66D607FD for ; Thu, 13 Oct 2016 10:03:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D94029F7E for ; Thu, 13 Oct 2016 10:03:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2299129F80; Thu, 13 Oct 2016 10:03:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B55DE29F7E for ; Thu, 13 Oct 2016 10:03:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8951C6EA1B; Thu, 13 Oct 2016 10:03:57 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7DD9D6EA06 for ; Thu, 13 Oct 2016 10:03:32 +0000 (UTC) Received: by mail-lf0-x241.google.com with SMTP id x79so11857685lff.2 for ; Thu, 13 Oct 2016 03:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=1Z84E+TkbY81fw+yL/KiqKWYqYLq4I/Yue5+rT22edI=; b=flItL/opVpJ6YdT5irOQHa12wLJvMZTY96HgwpPb+9t+rx6YixXGmJiOz2iRrLvsiV TYTEkCSDrzHZxZucHk53n1JOJYRACdQXDdiU9HMtBbqOeXTh4auhOxHwYeHwtGAxu6d/ q2lpsn/rJMZl9B60FZX4bzHwYutUUHcZMT+N9WZdNH/pE+fnIFVPB2ydsU5qw1xrxPzP KGvFxq/u4veGvquBH8hRNZFmcoXyoT1pyNadVRcZ4s6rD0MFyGeby32SVI21IUGsZKXb 1ApQKseUz3CcsdYrpavJ9ORrfQ9ZgbcLlJF4q2or1tQ5eWGX/rRHGachXV0jrannfpic giUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=1Z84E+TkbY81fw+yL/KiqKWYqYLq4I/Yue5+rT22edI=; b=WZEH/LJbeEfiuol/GrpCl4R2bHRVm7eA2U5lmQIEJ9+qLPVIfAofhjKcdmPUYMJxZx 1XJahdi3hH7zBDeWFDjffnMTnNVh4yEKPCyYuDLYIbSSloL1viwCPv1Rbp6XUahxCWK1 GNyZOgbxFPrYmWKmHEPZDWnVrzXu/KDy8OGpqJcp/ovwf26zYbB1/YIVOLUoFYhIuxcy UEzXKDghxfQV+NUAefH5S6fuPX7OFJ/SfgRHvVGwe4oJXkNmw3Xj2iMwuL+9R8vqHLM8 V2vybsSt3uVxTToNfnLXaEbMqPuCooBd2zzHOSyVvTxdlRD4FoXLsiJO60Yz2GMLg9+k 5SRw== X-Gm-Message-State: AA6/9RklsoKXzKnf/CpsU33+9UAUEIUhEt6wY1RFmuiXTjaQp55UzlHsrYgcDPRyrGMzwA== X-Received: by 10.28.54.209 with SMTP id y78mr1570357wmh.94.1476353010480; Thu, 13 Oct 2016 03:03:30 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id yo1sm21209210wjc.16.2016.10.13.03.03.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:29 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Thu, 13 Oct 2016 11:03:05 +0100 Message-Id: <1476352990-2504-14-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476352990-2504-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476352990-2504-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [CI 14/19] drm/i915: Make HAS_L3_DPF only take dev_priv X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Saves 472 bytes of .rodata strings. v2: Add parantheses around dev_priv. (Ville Syrjala) Signed-off-by: Tvrtko Ursulin Reviewed-by: David Weinehall Acked-by: Daniel Vetter Acked-by: Jani Nikula Acked-by: Chris Wilson Acked-by: Maarten Lankhorst --- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 9ad79d196a73..ec3536d0c343 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2872,7 +2872,7 @@ struct drm_i915_cmd_table { #define HAS_GMCH_DISPLAY(dev_priv) ((dev_priv)->info.has_gmch_display) /* DPF == dynamic parity feature */ -#define HAS_L3_DPF(dev) (INTEL_INFO(dev)->has_l3_dpf) +#define HAS_L3_DPF(dev_priv) ((dev_priv)->info.has_l3_dpf) #define NUM_L3_SLICES(dev_priv) (IS_HSW_GT3(dev_priv) ? \ 2 : HAS_L3_DPF(dev_priv)) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index a9a73c4b4933..bcd4b8fe819d 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -3592,7 +3592,7 @@ static void gen5_gt_irq_postinstall(struct drm_device *dev) pm_irqs = gt_irqs = 0; dev_priv->gt_irq_mask = ~0; - if (HAS_L3_DPF(dev)) { + if (HAS_L3_DPF(dev_priv)) { /* L3 parity interrupt is always unmasked. */ dev_priv->gt_irq_mask = ~GT_PARITY_ERROR(dev_priv); gt_irqs |= GT_PARITY_ERROR(dev_priv);