From patchwork Tue Oct 11 13:21:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9370985 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 C40256048F for ; Tue, 11 Oct 2016 13:22:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B54E92900C for ; Tue, 11 Oct 2016 13:22:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9EE829016; Tue, 11 Oct 2016 13:22:27 +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 644292900C for ; Tue, 11 Oct 2016 13:22:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3058E6E673; Tue, 11 Oct 2016 13:22:25 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-qk0-x242.google.com (mail-qk0-x242.google.com [IPv6:2607:f8b0:400d:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 67D896E668 for ; Tue, 11 Oct 2016 13:22:22 +0000 (UTC) Received: by mail-qk0-x242.google.com with SMTP id n189so1385673qke.1 for ; Tue, 11 Oct 2016 06:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pSx77BYgqWJoIOW+lJKzLBQKB+BBzG7FQ7SQH3PtUJA=; b=DR11ZQkSdjme74sPyzzAt69h+IgCpvuVxH54D2KF/NJyX6o7tpkYQDDogIJi1VVdja y7NhuU9DCobyPdi7CVCjUjunsBMRge7hxZiuZ0L6yYlpI3WiS+0LOyA1f3BKt6Bl7KEo jJL05v5CHGrY+nivL3fNr2Rc3lfkjwnQJhhlfBCLfIPnKwsbz2phnTA2MiGQiZpvtLUK se3J+u1umqd5XXY94UmbrOXrh2KpIR1LE+eFTmofOF+WqM3dt78RLc5sz4jD8qdNJvnm ZpFfilqgaAYWSo5xn/1lwrg+kL7bZte/eaU55AcLJl/a9gBz10CbUnGPPbxv2DIlU8w+ PG0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pSx77BYgqWJoIOW+lJKzLBQKB+BBzG7FQ7SQH3PtUJA=; b=ItWx0ESdiIfjM8WX3m6kCK9l/JglCaoZ9yvHjyuZs4RT2/0Xb/R30QAXoacEs8yeOo YO/KCNj8B0ATEgRxwu9ciZkwSUNI7RullaaGxvtkKcty4LdlTJY1Gu4D3XLkxpBOPUCh PzXXRdB98X+4RsoGjK+POKFqwL3Oxq4ZjPnhyWolUoW5EvqpkvFfMf3uZRZLwfKrfrRI vJJVCev3JwvIOf+5HTmrCerH0J0fF9Xi61qtZZoot2rkawT4/aNVQ85/tmJ1ZBliADgI /HOkfEzu1YJFDRN7FcS+K/sJiJHFRajRQ8dhdPFrxKAiJFKk7u5naPETqbOmvpTzhYBC iTpw== X-Gm-Message-State: AA6/9RnuLqM99sBztpD9aCwRHDPQnzZd0F3T0Dr2egs0vHHTyWR/MpMxO+DPTQuITwCijg== X-Received: by 10.194.60.106 with SMTP id g10mr4877043wjr.151.1476192140948; Tue, 11 Oct 2016 06:22:20 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id zz9sm6387037wjb.36.2016.10.11.06.22.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Oct 2016 06:22:20 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 11 Oct 2016 14:21:47 +0100 Message-Id: <1476192112-25336-15-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476192112-25336-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476192112-25336-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 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 --- 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 ad9299196d13..c264e703b686 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2869,7 +2869,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 75f4ba935ebc..079ba7cfc971 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);