Revert "drm/exynos: get event time from ktime" 06/48206/1
authorJoonyoung Shim <jy0922.shim@samsung.com>
Wed, 16 Sep 2015 05:43:19 +0000 (14:43 +0900)
committerJoonyoung Shim <jy0922.shim@samsung.com>
Wed, 16 Sep 2015 05:47:41 +0000 (14:47 +0900)
Commit f71a7f0e31f5 ("drm/exynos: get event time from ktime") causes
build errors.

This reverts commit f71a7f0e31f5dc6f6ed39a80e6c36ee03ea9a6c2.

Change-Id: I18dfe8db270f193e64311c9fec3c0af80cf3fca5
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
drivers/gpu/drm/exynos/exynos_drm_g2d.c
drivers/gpu/drm/exynos/exynos_drm_ipp.c

index 67da4bfaea39f6ef633ae7dc92c9b138a370eafe..81a25083080845d626c6b50b2f46a9c4897e79f3 100644 (file)
@@ -890,7 +890,6 @@ static void g2d_finish_event(struct g2d_data *g2d, u32 cmdlist_no)
        struct g2d_runqueue_node *runqueue_node = g2d->runqueue_node;
        struct drm_exynos_pending_g2d_event *e;
        struct timeval now;
-       ktime_t now_ktime;
        unsigned long flags;
 
        if (list_empty(&runqueue_node->event_list))
@@ -899,8 +898,7 @@ static void g2d_finish_event(struct g2d_data *g2d, u32 cmdlist_no)
        e = list_first_entry(&runqueue_node->event_list,
                             struct drm_exynos_pending_g2d_event, base.link);
 
-       now_ktime = drm_timestamp_monotonic ? ktime_get() : ktime_get_real();
-       now = ktime_to_timeval(now_ktime);
+       do_gettimeofday(&now);
        e->event.tv_sec = now.tv_sec;
        e->event.tv_usec = now.tv_usec;
        e->event.cmdlist_no = cmdlist_no;
index 47b8db394c16f1f404e86db839ec9bca548ffe0c..2626cd07de3cdf03cc2afa26624298e8eeeea76a 100644 (file)
@@ -1426,7 +1426,6 @@ static int ipp_send_event(struct exynos_drm_ippdrv *ippdrv,
        struct drm_exynos_ipp_send_event *e;
        struct list_head *head;
        struct timeval now;
-       ktime_t now_ktime;
        unsigned long flags;
        u32 tbuf_id[EXYNOS_DRM_OPS_MAX] = {0, };
        int ret, i;
@@ -1530,8 +1529,7 @@ static int ipp_send_event(struct exynos_drm_ippdrv *ippdrv,
        e = list_first_entry(&c_node->event_list,
                struct drm_exynos_ipp_send_event, base.link);
 
-       now_ktime = drm_timestamp_monotonic ? ktime_get() : ktime_get_real();
-       now = ktime_to_timeval(now_ktime);
+       do_gettimeofday(&now);
        DRM_DEBUG_KMS("tv_sec[%ld]tv_usec[%ld]\n", now.tv_sec, now.tv_usec);
        e->event.tv_sec = now.tv_sec;
        e->event.tv_usec = now.tv_usec;