From patchwork Fri Mar 18 23:14:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 8624411 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9B7D7C0555 for ; Fri, 18 Mar 2016 23:15:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC9A5203A5 for ; Fri, 18 Mar 2016 23:15:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0651620397 for ; Fri, 18 Mar 2016 23:15:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753520AbcCRXPo (ORCPT ); Fri, 18 Mar 2016 19:15:44 -0400 Received: from mail-qg0-f53.google.com ([209.85.192.53]:35420 "EHLO mail-qg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751928AbcCRXPU (ORCPT ); Fri, 18 Mar 2016 19:15:20 -0400 Received: by mail-qg0-f53.google.com with SMTP id y89so113912340qge.2 for ; Fri, 18 Mar 2016 16:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QgC5N90ztkic1jUdB1l8IkLL1k0vQCMX4x2M8E6n69g=; b=n7fDOaEFvUruYGfqiMfqNOLJwvGfROtsVDZg3BDiZMKwJkISLXP53/ByEJWu2Dfatw 4O8Ni2/9ITObkRRE7z2GHsgYZUAbotseo+kInXdw91wZ0jXSIOe0Wj+IU7AkmOnf9twB lClYukzZ9o7g6MrbBq2KRQhX4RSuk6MoDhH2DHjn0IlGLr1AqgCTGNnJ+iEkAhb2cTRd c7aHUFSmRQJJ1qHq3B3nCRc+CgeRmwLHP1lhMXNKGHhcdZWaBlpY//tkWRYHBNMBLCCE yuZVWKN+NEEAEEbaxqQxAYR9Zy57YEzvgNmHMuNjDZvNzq1i+aHPQunF1ObZQU7NdkYg KEQQ== 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=QgC5N90ztkic1jUdB1l8IkLL1k0vQCMX4x2M8E6n69g=; b=iefUtnnPD5unewnndR+TZANcaYSSO+YhS3de/durNx8g/OYS0DmwtpdueT4PxijJGC dck1YQn41x+W64HTpJAeHhYAwmf870/jgFE/iPrKPcaxwnsA9uWB04AxxJJlEyXVlD3P bqNIAw79yMYyQENCnRpRPHcpJQA2uGZ2WfhVWl7PvK0vMMbBDUSPGcQ4G4bFdiJLRmRb JWu5Z7D/v9x9zpjqF7KZ8YuCkm45536rEn89IiKOPsT50oQI5vTZdrjulNjcRNI9FBU1 uNU7aAqw307QPoS6DjJMwqWIMkL+l+xEkrILoLKzgtEbGIVM9kDOcULtQtB2shN0d+4V iZ3A== X-Gm-Message-State: AD7BkJLUa7VmJtc1tqMSwPH3KNqSNEBgjx0/uJQlOm4AyDeBmDfKuiupVmJhJOOPrZ8R6Q== X-Received: by 10.140.30.8 with SMTP id c8mr9589450qgc.67.1458342919202; Fri, 18 Mar 2016 16:15:19 -0700 (PDT) Received: from localhost ([2601:184:4000:90da:6af7:28ff:fe77:e429]) by smtp.gmail.com with ESMTPSA id c7sm7015771qkb.38.2016.03.18.16.15.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Mar 2016 16:15:18 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter , maarten.lankhorst@canonical.com, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark Subject: [PATCH 06/11] drm/msm: split out timeout_to_jiffies helper Date: Fri, 18 Mar 2016 19:14:59 -0400 Message-Id: <1458342904-23326-7-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458342904-23326-1-git-send-email-robdclark@gmail.com> References: <1458342904-23326-1-git-send-email-robdclark@gmail.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_drv.h | 15 +++++++++++++++ drivers/gpu/drm/msm/msm_fence.c | 11 +---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index fed3869..6107a39 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -335,5 +335,20 @@ static inline int align_pitch(int width, int bpp) /* for conditionally setting boolean flag(s): */ #define COND(bool, val) ((bool) ? (val) : 0) +static inline unsigned long timeout_to_jiffies(const ktime_t *timeout) +{ + ktime_t now = ktime_get(); + unsigned long remaining_jiffies; + + if (ktime_compare(*timeout, now) < 0) { + remaining_jiffies = 0; + } else { + ktime_t rem = ktime_sub(*timeout, now); + struct timespec ts = ktime_to_timespec(rem); + remaining_jiffies = timespec_to_jiffies(&ts); + } + + return remaining_jiffies; +} #endif /* __MSM_DRV_H__ */ diff --git a/drivers/gpu/drm/msm/msm_fence.c b/drivers/gpu/drm/msm/msm_fence.c index 55a5f92..002eecb 100644 --- a/drivers/gpu/drm/msm/msm_fence.c +++ b/drivers/gpu/drm/msm/msm_fence.c @@ -44,16 +44,7 @@ int msm_wait_fence(struct drm_device *dev, uint32_t fence, /* no-wait: */ ret = fence_completed(dev, fence) ? 0 : -EBUSY; } else { - ktime_t now = ktime_get(); - unsigned long remaining_jiffies; - - if (ktime_compare(*timeout, now) < 0) { - remaining_jiffies = 0; - } else { - ktime_t rem = ktime_sub(*timeout, now); - struct timespec ts = ktime_to_timespec(rem); - remaining_jiffies = timespec_to_jiffies(&ts); - } + unsigned long remaining_jiffies = timeout_to_jiffies(timeout); if (interruptible) ret = wait_event_interruptible_timeout(priv->fence_event,