drm/syncobj: extend syncobj query ability v3

user space needs a flexiable query ability.
So that umd can get last signaled or submitted point.
v2:
add sanitizer checking.
v3:
rebase

Change-Id: I6512b430524ebabe715e602a2bf5abb0a7e780ea
Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Christian König <Christian.Koenig@amd.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/series/64044/

diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index 9ec334663c2db56d4abc926b53611211304030c1..669c93fe250078ab44835074b0c2574ec2528800 100644 (file)
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -1280,7 +1280,7 @@ drm_syncobj_timeline_signal_ioctl(struct drm_device *dev, void *data,
        if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ_TIMELINE))
                return -EOPNOTSUPP;
 
-       if (args->pad != 0)
+       if (args->flags != 0)
                return -EINVAL;
 
        if (args->count_handles == 0)
@@ -1351,7 +1351,7 @@ int drm_syncobj_query_ioctl(struct drm_device *dev, void *data,
        if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ_TIMELINE))
                return -EOPNOTSUPP;
 
-       if (args->pad != 0)
+       if (args->flags & ~DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED)
                return -EINVAL;
 
        if (args->count_handles == 0)
@@ -1372,25 +1372,32 @@ int drm_syncobj_query_ioctl(struct drm_device *dev, void *data,
                fence = drm_syncobj_fence_get(syncobjs[i]);
                chain = to_dma_fence_chain(fence);
                if (chain) {
-                       struct dma_fence *iter, *last_signaled = NULL;
-
-                       dma_fence_chain_for_each(iter, fence) {
-                               if (iter->context != fence->context) {
-                                       dma_fence_put(iter);
-                                       /* It is most likely that timeline has
-                                        * unorder points. */
-                                       break;
+                       struct dma_fence *iter, *last_signaled =
+                               dma_fence_get(fence);
+
+                       if (args->flags &
+                           DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED) {
+                               point = fence->seqno;
+                       } else {
+                               dma_fence_chain_for_each(iter, fence) {
+                                       if (iter->context != fence->context) {
+                                               dma_fence_put(iter);
+                                               /* It is most likely that timeline has
+                                               * unorder points. */
+                                               break;
+                                       }
+                                       dma_fence_put(last_signaled);
+                                       last_signaled = dma_fence_get(iter);
                                }
-                               dma_fence_put(last_signaled);
-                               last_signaled = dma_fence_get(iter);
+                               point = dma_fence_is_signaled(last_signaled) ?
+                                       last_signaled->seqno :
+                                       to_dma_fence_chain(last_signaled)->prev_seqno;
                        }
-                       point = dma_fence_is_signaled(last_signaled) ?
-                               last_signaled->seqno :
-                               to_dma_fence_chain(last_signaled)->prev_seqno;
                        dma_fence_put(last_signaled);
                } else {
                        point = 0;
                }
+               dma_fence_put(fence);
                ret = copy_to_user(&points[i], &point, sizeof(uint64_t));
                ret = ret ? -EFAULT : 0;
                if (ret)

diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
index 8a5b2f8f8eb98b0f1f170960239327d420971354..868bf7996c0f8920e589b58b192528c5a602a9fe 100644 (file)
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
@@ -778,11 +778,12 @@ struct drm_syncobj_array {
        __u32 pad;
 };
 
+#define DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED (1 << 0) /* last available point on timeline syncobj */
 struct drm_syncobj_timeline_array {
        __u64 handles;
        __u64 points;
        __u32 count_handles;
-       __u32 pad;
+       __u32 flags;
 };