From patchwork Wed Sep 28 12:25: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: 9353785 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 DF29E60756 for ; Wed, 28 Sep 2016 12:26:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D15862953B for ; Wed, 28 Sep 2016 12:26:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5F422953D; Wed, 28 Sep 2016 12:26:03 +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 7FE1C2953B for ; Wed, 28 Sep 2016 12:26:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A2B66E77A; Wed, 28 Sep 2016 12:25:59 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7DA806E779 for ; Wed, 28 Sep 2016 12:25:58 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id l132so5679059wmf.1 for ; Wed, 28 Sep 2016 05:25:58 -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=wAhhKBnKHBtOmg6NKeLzRKoxDI0vpH1vIoFDZCceTXA=; b=KImKSNCcPpb1XxkGbrT95JSX/TY50nhBw3WPP+r5BO/Tld8OeNa8/BLkZoQxD5aoR7 6G7mGFeL8qEkjTv8Kda6YOVUEDpi5EQVUFkZ3fiFHCkn7PX8jCvGlHSVrmZWB18SXeor NbJ1yBNIbJzVo2YjF7epJxoOh1vJkJfN8lVZMwCx2jCJ2WAxBN8UAkPYFV7KroZFe2jQ cz3ljHVEcJ7VwjRKuHY5hf467+V2tgxCcq+lVqpdtvMeCWU4oznrD2dFkm24ZgA8Bvsi PHg55jpXHuhdOM3TCP/8CU3KgDOOWGmPXMZJEgjHZTli0Y/+snGyaz6ethlU8w1rF4hW ieeg== 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=wAhhKBnKHBtOmg6NKeLzRKoxDI0vpH1vIoFDZCceTXA=; b=euhQ2ihRoNxhIyfODtgMQ8dpmQcb2mMknkasLyT1XNkWuYW6k7/tcFEBlfrrJ5uyDR OrJfa9/m0TyWwxv/xhVIfBDkBU7AEhHSbN3l+CEAgazRezRXwJiOVyCKRIwXrpLm4uN5 f7tF9wX/aZluLMe8lPBUzOKrvEsgiE2aTnkP/EiO/1/2hOUY4C/OLn20sDcGl+Wqcn4w p/bpLTuiKjylxQ/PiNbf7V4hyiVjXo/N8GRPrFM/2VrpP4qlkBqui1b6mN1XXzG7pZCv ehNzYs96Pjv/p5iGjbAHy5TU/tT1YtBL7Pd7JQfMrqmtbP3BRVgep5rQrUaGFqPeM9Zy ef6g== X-Gm-Message-State: AE9vXwNN1fQt4A86nI5sJLsvPWLqI56PyL1+g/PRR+MevxvooKJi7kTFGtzd1YVngrODuw== X-Received: by 10.194.249.74 with SMTP id ys10mr27609980wjc.145.1475065557149; Wed, 28 Sep 2016 05:25:57 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id a5sm8182653wjd.9.2016.09.28.05.25.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Sep 2016 05:25:56 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Wed, 28 Sep 2016 13:25:44 +0100 Message-Id: <1475065546-5481-2-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475065546-5481-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475065546-5481-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 1/3] 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);