drm: Fix compilation failure
Subsystems (2)
PATCH 1/1 drm: Fix compilation failure
From: Sean Paul <[email protected]>
We had competing reverts/disable commits go in that caused issues with each other.
Christian committed 783195ec1cad ("drm/syncobj: disable the timeline UAPI for now v2"), which moved the CREATE_TYPE_TIMELINE #define internally and added a check in drm_syncobj.c. When Eric reverted the entire timeline patch, he cleaned up the #define in the new location, but failed to remove the check, causing the boom.
The error:
../drivers/gpu/drm/drm_syncobj.c: In function ‘drm_syncobj_create’:../drivers/gpu/drm/drm_syncobj.c:281:14: error: ‘DRM_SYNCOBJ_CREATE_TYPE_TIMELINE’ undeclared (first use in this function); did you mean ‘DRM_SYNCOBJ_CREATE_SIGNALED’?
if (flags & DRM_SYNCOBJ_CREATE_TYPE_TIMELINE)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
DRM_SYNCOBJ_CREATE_SIGNALED../drivers/gpu/drm/drm_syncobj.c:281:14: note: each undeclared identifier is reported only once for each function it appears in
--- drivers/gpu/drm/drm_syncobj.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/drm_syncobj.c +0 -4
@@ -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 ;
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 3 lines · Sean Paul
From: Sean Paul <[email protected]>
Just saw Chris posted a fix to the list, please disregard this.
Sean
Quoted 50 lines
We had competing reverts/disable commits go in that caused issues with each other.
Christian committed
783195ec1cad("drm/syncobj: disable the timeline UAPI for now v2"), which moved theCREATE_TYPE_TIMELINE#define internally and added a check indrm_syncobj.c. When Eric reverted the entire timeline patch, he cleaned up the #define in the new location, but failed to remove the check, causing the boom.The error:
../drivers/gpu/drm/drm_syncobj.c: In function ‘drm_syncobj_create’:../drivers/gpu/drm/drm_syncobj.c:281:14: error: ‘DRM_SYNCOBJ_CREATE_TYPE_TIMELINE’ undeclared (first use in this function); did you mean ‘DRM_SYNCOBJ_CREATE_SIGNALED’?
if (flags &DRM_SYNCOBJ_CREATE_TYPE_TIMELINE)^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DRM_SYNCOBJ_CREATE_SIGNALED
../drivers/gpu/drm/drm_syncobj.c:281:14: note: each undeclared identifier is reported only once for each function it appears inFixes 131280a162e7 ("drm: Revert syncobj timeline changes.")Cc Chunming Zhou <[email protected]>Cc Christian König <[email protected]>Cc Daniel Vetter <[email protected]>Cc Eric Anholt <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Sean Paul <[email protected]>Cc David Airlie <[email protected]>Signed-off-by Sean Paul <[email protected]>--- drivers/gpu/drm/drm_syncobj.c | 4 ---- 1 file changed, 4 deletions(-)drivers/gpu/drm/drm_syncobj.c +0
-5@@ -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 ; --
Quoted 2 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel