Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89669e7a authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm/vmwgfx: Fix fence event code 



The commit "vmwgfx: Rework fence event action" introduced a number of bugs
that are fixed with this commit:

a) A forgotten return stateemnt.
b) An if statement with identical branches.

Cc: <stable@vger.kernel.org>
Reported-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
parent 1f563a6a

drivers/gpu/drm/vmwgfx/vmwgfx_fence.c

+6 −11
Original line number Diff line number Diff line
@@ -1087,6 +1087,8 @@ static int vmw_event_fence_action_create(struct drm_file *file_priv, 
	if (ret != 0)

		goto out_no_queue;



	return 0;



out_no_queue:

	event->base.destroy(&event->base);

out_no_event:
@@ -1162,17 +1164,10 @@ int vmw_fence_event_ioctl(struct drm_device *dev, void *data, 


	BUG_ON(fence == NULL);



	if (arg->flags & DRM_VMW_FE_FLAG_REQ_TIME)

		ret = vmw_event_fence_action_create(file_priv, fence,

						    arg->flags,

						    arg->user_data,

						    true);

	else

	ret = vmw_event_fence_action_create(file_priv, fence,

					    arg->flags,

					    arg->user_data,

					    true);



	if (unlikely(ret != 0)) {

		if (ret != -ERESTARTSYS)

			DRM_ERROR("Failed to attach event to fence.\n");