From patchwork Wed Oct 5 12:33:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9362855 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 6E3AF607D6 for ; Wed, 5 Oct 2016 12:34:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 601D3287FD for ; Wed, 5 Oct 2016 12:34:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54D922893D; Wed, 5 Oct 2016 12:34:22 +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 137C72893E for ; Wed, 5 Oct 2016 12:34:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A4FCE6E830; Wed, 5 Oct 2016 12:34:19 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7CC716E83E for ; Wed, 5 Oct 2016 12:34:17 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id f193so19745470wmg.2 for ; Wed, 05 Oct 2016 05:34:17 -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=6naLlgaFTzW6UIM86pWrJhi0fom/ahnJF5LBCPwI8bg=; b=aCiXiGPyZ0x3+V2W405eiNk0EPlqZ6yKpEigZqchlJPz/L948ha182ir3ZlgfXSb0Y wSS7rVAe0pW+ZT7OeFdaZ+b1k5tvGzvi+FAS+WZDEiWWFMQk67fdaaJyQnduH+Kzu98m luD85YKRyJu+OV3LuWso9RCI9RTHrXZmTtmZz4NFTPfJWLO5uV3RitLJVIkNsmsxq3IN FTRgmy0OW1+lREn4e6bTr0sQWi2Ev0Sss6gJKJFJkn2PjJxyVh5Dkw4bWhRcyipNFBJC e0AH3tszTdN5UmP6XyyXp0VunY6+8CCSZLekwZD4doCDcNz8w3rrI15JR/KH2cMHFaeG kgxA== 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=6naLlgaFTzW6UIM86pWrJhi0fom/ahnJF5LBCPwI8bg=; b=MGy8r+nxSZWhMR2VMS4fvmXYZ1qYebLtEcd8XnhPWcLju7A3Erqnh9zNBk5mghtoCC p8iFeue081m7MKX/vXlRKA4ptV+jFUqIioC5CBUjfS/Zt82HQ0dvTUpav0rfqlZdOn/S PW0tcQrH00dDa9NFIPtNj5321C7+TVHuFYSeOX9Tbyy7nJLB4hIQIo90s5PFJn3WkuPw 6kOaTRI/LJTQhah/rKy/2kRKegZ6Auu7VjgAh4+zDKlvPbt2C0wlgshjnnaqn3MC1joD CgQIoTkJV10umqqOVAnSnPcR5hqvAkAh4tiSnRnbvfWujHwypsi88S5cxU5SH0jsL8/7 M3QA== X-Gm-Message-State: AA6/9Rl1r4HnFOkLZhGmLxWc6k2uZFzJm25lwzQhuUkodokAc1Igy03H4wbkJ483pYfdCQ== X-Received: by 10.28.185.202 with SMTP id j193mr3316598wmf.78.1475670855823; Wed, 05 Oct 2016 05:34:15 -0700 (PDT) Received: from e31.Home ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id t138sm29428317wmt.5.2016.10.05.05.34.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Oct 2016 05:34:15 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Wed, 5 Oct 2016 13:33:44 +0100 Message-Id: <1475670829-14025-18-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475670829-14025-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475670829-14025-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 17/22] 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. Signed-off-by: Tvrtko Ursulin --- 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 3a5aac21f133..38f1d7b8121c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2871,7 +2871,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);