Commit 2093dea3 authored by Chunming Zhou's avatar Chunming Zhou Committed by Christian König
Browse files

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: default avatarChunming Zhou <david1.zhou@amd.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Christian König <Christian.Koenig@amd.com>
Reviewed-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/series/64044/
parent be428f24

drivers/gpu/drm/drm_syncobj.c

+22 −15
Original line number Diff line number Diff line
@@ -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,8 +1372,13 @@ 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;

			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);
@@ -1387,10 +1392,12 @@ int drm_syncobj_query_ioctl(struct drm_device *dev, void *data, 
				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)

include/uapi/drm/drm.h

+2 −1
Original line number Diff line number Diff line
@@ -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;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE