drm/syncobj: Fix compilation following partial revert
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 12 Nov 2018 15:21:30 +0000 (15:21 +0000)
committerSean Paul <seanpaul@chromium.org>
Mon, 12 Nov 2018 15:58:55 +0000 (10:58 -0500)
commit913240696ec64a2af2de250b1591cc45b5cea2f6
treeaf8e629130e7c4fa120429a8c915720fcaa44d30
parent131280a162e7fc2a539bb939efd28dd0b964c62c
drm/syncobj: Fix compilation following partial revert

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.")
Cc: Christian König <christian.koenig@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Chunming Zhou <david1.zhou@amd.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20181112152130.12275-1-chris@chris-wilson.co.uk
drivers/gpu/drm/drm_syncobj.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c