From patchwork Fri Sep 30 17:48:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9358675 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 0F14E600C8 for ; Fri, 30 Sep 2016 17:49:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06C552A12A for ; Fri, 30 Sep 2016 17:49:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFC9A2A131; Fri, 30 Sep 2016 17:49:04 +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 AA60C2A12A for ; Fri, 30 Sep 2016 17:49:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F4116E243; Fri, 30 Sep 2016 17:49:03 +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 0DB146E1AF for ; Fri, 30 Sep 2016 17:49:00 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id b4so4473228wmb.2 for ; Fri, 30 Sep 2016 10:48:59 -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=OTaHdeKo2A6KT+bH+ZDTTHxpfc0fRRaz5ErUlVdvyTc=; b=fDhyynp4Z3C1EfPSZhqWBtPlAqfH4ZiDnx8dT9YXIBBKV51L/Nl80A3jy4tH9FDg3Z dNMIzsTEZeSpxnQyYdMTBqm//r3WX0hiqfnC7h88USPY7dMjiBldrMxgEIyOihJiMKnG 4cEzKK9Ga0SqMcXwoPDEst5GBt1GnlWw5B+BCKNTKJI4SIjN2SAemv/qwsL3FQoM3obm ITix9JIpCwHlcZ70CI5UDamYk7TpOv6sZ+Ko7fYDjlmpFRlGKaibXn7v424lhJJJSoay WzuezKYDOFy0y6BeDQ15xhlTCJNPZm3kkCHU5+hsJc5xpooxHDI2iduChWBgkT9aGiSs BzwA== 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=OTaHdeKo2A6KT+bH+ZDTTHxpfc0fRRaz5ErUlVdvyTc=; b=dAJoyOvqsapcoj2+/ph+8jw9/9E9ZVlARvH0RLJkYPeXQGR1/7S5IYZN8J2efl87jc Zzy3OTsIZah8MhMSQVWGzOuDeN8soaRO8odEnnu82iV3LsnmU7jaZYhihuCY9diUE9Xm d1XeKyR/ZBRN8zMMA4WjS9Q4md5MpY5UW18jVtxx2M7g+OCkJRRd5lbiXH9k+AEiqKt8 QDD0vk3FexT6n+f6dYxAWYlCriZDD6jGI33IVGA7JdhzQa7H6/rM/QVOhn2aunbk8fRl nVfGfP5gqKDnwsu+S3mAGYT7Y5ML0mxGv/xZ0S3sTJwg1DPSU3kTCuMKD8x+GFnlRQEr J6DQ== X-Gm-Message-State: AA6/9RlcFcdFcEKDSgQ9+NL7VdGCGopoE7ImA5ooJkNelwZMuZUIa9bXyA37Bs7UCSBqhA== X-Received: by 10.28.146.69 with SMTP id u66mr5348531wmd.57.1475257738487; Fri, 30 Sep 2016 10:48:58 -0700 (PDT) Received: from e31.Home ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id a1sm246125wjl.28.2016.09.30.10.48.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Sep 2016 10:48:58 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Fri, 30 Sep 2016 18:48:36 +0100 Message-Id: <1475257729-11283-2-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475257729-11283-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475257729-11283-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 01/14] drm/i915: Remove redundant hsw_write* mmio functions 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 They are completely identical to gen6_write* ones. Signed-off-by: Tvrtko Ursulin Reviewed-by: Joonas Lahtinen Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/intel_uncore.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index a9b6c936aadd..478364057812 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1055,21 +1055,6 @@ gen6_write##x(struct drm_i915_private *dev_priv, i915_reg_t reg, u##x val, bool GEN6_WRITE_FOOTER; \ } -#define __hsw_write(x) \ -static void \ -hsw_write##x(struct drm_i915_private *dev_priv, i915_reg_t reg, u##x val, bool trace) { \ - u32 __fifo_ret = 0; \ - GEN6_WRITE_HEADER; \ - if (NEEDS_FORCE_WAKE(offset)) { \ - __fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \ - } \ - __raw_i915_write##x(dev_priv, reg, val); \ - if (unlikely(__fifo_ret)) { \ - gen6_gt_check_fifodbg(dev_priv); \ - } \ - GEN6_WRITE_FOOTER; \ -} - #define __gen8_write(x) \ static void \ gen8_write##x(struct drm_i915_private *dev_priv, i915_reg_t reg, u##x val, bool trace) { \ @@ -1116,9 +1101,6 @@ __chv_write(32) __gen8_write(8) __gen8_write(16) __gen8_write(32) -__hsw_write(8) -__hsw_write(16) -__hsw_write(32) __gen6_write(8) __gen6_write(16) __gen6_write(32) @@ -1126,7 +1108,6 @@ __gen6_write(32) #undef __gen9_write #undef __chv_write #undef __gen8_write -#undef __hsw_write #undef __gen6_write #undef GEN6_WRITE_FOOTER #undef GEN6_WRITE_HEADER @@ -1343,11 +1324,7 @@ void intel_uncore_init(struct drm_i915_private *dev_priv) break; case 7: case 6: - if (IS_HASWELL(dev_priv)) { - ASSIGN_WRITE_MMIO_VFUNCS(hsw); - } else { - ASSIGN_WRITE_MMIO_VFUNCS(gen6); - } + ASSIGN_WRITE_MMIO_VFUNCS(gen6); if (IS_VALLEYVIEW(dev_priv)) { ASSIGN_READ_MMIO_VFUNCS(vlv);