From patchwork Thu Jun 30 14:32:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9208235 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 8529F60752 for ; Thu, 30 Jun 2016 14:34:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 745A52866B for ; Thu, 30 Jun 2016 14:34:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 693402867E; Thu, 30 Jun 2016 14:34:44 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5C0028682 for ; Thu, 30 Jun 2016 14:34:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 94A776E8D0; Thu, 30 Jun 2016 14:34:38 +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 59DF76E8B5 for ; Thu, 30 Jun 2016 14:34:01 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id c82so23407893wme.3 for ; Thu, 30 Jun 2016 07:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=jgW7JeGUkl+/2LXuV8m1+PxPyhcgsh1v0HOqreEOy5U=; b=bsPKRdkleDjDF4ijf2zoPcJDAtDjR3PdRqHnAQ8vMre+QwYoLb9KC2/HKCzeQyJFfa tZKIdvftnNK2K/JIQwKyQF7oN2ueKNr4VCQS2rX0JWk1nFdbnJMh43VynCOLdtfYypw1 M5paScUD1Nr+UDNzrdVRgHftEMY1xNHV/xVtJpu1hsQ83kHTeFb7siy8+Fh75XRKoBzV khWenP0toCnC/CD0SfZNCc9m94oYfRWX+QUgpLuFtDo3Iecxy2Tt8a0rwOhad9M5+SDU NR6SOJ7coDCObLYLCD+cSrNKgWfCqQNMx1giEp/TIcyYPYXyuaUBN/DxDWwH8eprTEad esFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=jgW7JeGUkl+/2LXuV8m1+PxPyhcgsh1v0HOqreEOy5U=; b=hQ/zzGiMEJAQa/vsbmQnNPrsYtmfgDJvJoe/QM7e7YtmoUI79o4/UOPMeJAyFkpDCU em1iVi7r7gZAsJrvfKy4UOT9B4sA4bAn0IED6MAHlt+ioRcKL+cjRcUy16lXlIMjssci rlRQSgvXj8S701r1AoW0ZM7sYCHn3/F22BWiObhnWso0PHkv8lIvqhcvhCB9UMwRezdj wAnCNfQZzQJqZDnVItgOUHVktS1t14xixIyhi8IpBN1HIcKGOJuAACWVsf9oP+3vd+03 PDPhg+nnXls2Jt+8K3ZzLo66LMRXt8U+8AHE1uIL75zChtXwQeldBuRsWA0nZq5C0gvm XkIw== X-Gm-Message-State: ALyK8tIM7cMm4PJkD5IodIHNVoxrrn5zJrGkCrqu6NKG1xD0omOxGAt52a0m57eGNdLHaA== X-Received: by 10.194.168.225 with SMTP id zz1mr15841511wjb.114.1467297239688; Thu, 30 Jun 2016 07:33:59 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id o2sm3878278wjp.26.2016.06.30.07.33.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2016 07:33:58 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 30 Jun 2016 15:32:52 +0100 Message-Id: <1467297225-21379-9-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1467297225-21379-1-git-send-email-chris@chris-wilson.co.uk> References: <1467297225-21379-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 09/62] drm/i915: Convert wait_for(I915_READ(reg)) to intel_wait_for_register() 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 By using the out-of-line intel_wait_for_register() not only do we can efficiency from using the hybrid wait_for() contained within, but we avoid code bloat from the numerous inlined loops, in total (all patches): text data bss dec hex filename 1078551 4557 416 1083524 108884 drivers/gpu/drm/i915/i915.ko 1070775 4557 416 1075748 106a24 drivers/gpu/drm/i915/i915.ko Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/intel_ddi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index ad3b0ee5e55b..6bcd7ffbff43 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1808,7 +1808,10 @@ static u32 bxt_get_grc(struct drm_i915_private *dev_priv, enum dpio_phy phy) static void bxt_phy_wait_grc_done(struct drm_i915_private *dev_priv, enum dpio_phy phy) { - if (wait_for(I915_READ(BXT_PORT_REF_DW3(phy)) & GRC_DONE, 10)) + if (intel_wait_for_register(dev_priv, + BXT_PORT_REF_DW3(phy), + GRC_DONE, GRC_DONE, + 10)) DRM_ERROR("timeout waiting for PHY%d GRC\n", phy); }