drm/msm: split out timeout_to_jiffies helper

Signed-off-by: Rob Clark <robdclark@gmail.com>

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 86b7b3796d8f..af007ac8c733 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -302,5 +302,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 55a5f9280088..002eecb3934e 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,