drm: Fix compilation failure

Submitted by Sean Paul on Nov. 12, 2018, 3:54 p.m.

Details

Message ID 20181112155406.28058-1-sean@poorly.run
State New
Headers show
Series "drm: Fix compilation failure" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Sean Paul Nov. 12, 2018, 3:54 p.m.
From: Sean Paul <seanpaul@chromium.org>

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

Fixes: 131280a162e7 ("drm: Revert syncobj timeline changes.")
Cc: Chunming Zhou <david1.zhou@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
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>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
 drivers/gpu/drm/drm_syncobj.c | 4 ----
 1 file changed, 4 deletions(-)

Patch hide | download patch | download mbox

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;

Comments

On Mon, Nov 12, 2018 at 10:54 AM Sean Paul <sean@poorly.run> wrote:
>
> From: Sean Paul <seanpaul@chromium.org>
>

Just saw Chris posted a fix to the list, please disregard this.

Sean

> 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
>
> Fixes: 131280a162e7 ("drm: Revert syncobj timeline changes.")
> Cc: Chunming Zhou <david1.zhou@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> 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>
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
>  drivers/gpu/drm/drm_syncobj.c | 4 ----
>  1 file changed, 4 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;
> --
> Sean Paul, Software Engineer, Google / Chromium OS
>