[Intel-gfx] [PATCH] drm/syncobj: Fix compilation following partial revert

[Christian König]

Am 12.11.18 um 16:21 schrieb Chris Wilson:
> We need to include the revert of commit 783195ec1cad ("drm/syncobj:
> disable the timeline UAPI for now v2") along with undoing the change to
> drm/i915.
>
> Fixes: 131280a162e7 ("drm: Revert syncobj timeline changes.")
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Christian König <christian.koenig at amd.com>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/drm_syncobj.c              | 4 ----
>   drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +-
>   2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
> index 90e0a6dce086..e2c5b3ca4824 100644
> --- a/drivers/gpu/drm/drm_syncobj.c
> +++ b/drivers/gpu/drm/drm_syncobj.c
> @@ -277,10 +277,6 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,
>   	int ret;
>   	struct drm_syncobj *syncobj;
>   
> -	/* Disabled for now */
> -	if (flags & DRM_SYNCOBJ_CREATE_TYPE_TIMELINE)
> -		return -EINVAL;
> -
>   	syncobj = kzalloc(sizeof(struct drm_syncobj), GFP_KERNEL);
>   	if (!syncobj)
>   		return -ENOMEM;
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index 1a1c04db6c80..1aaccbe7e1de 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -2157,7 +2157,7 @@ await_fence_array(struct i915_execbuffer *eb,
>   		if (!(flags & I915_EXEC_FENCE_WAIT))
>   			continue;
>   
> -		drm_syncobj_search_fence(syncobj, 0, 0, &fence);
> +		fence = drm_syncobj_fence_get(syncobj);
>   		if (!fence)
>   			return -EINVAL;
>