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

Commit 6c886e4a authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/legacy: Convert cursor ioctl locking to interruptible. 



Pass DRM_MODESET_ACQUIRE_INTERRUPTIBLE to acquire_init, and handle
drm_modeset_backoff which can now fail by returning the error.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170912133749.6532-4-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
parent dad56ce4

drivers/gpu/drm/drm_plane.c

+4 −3
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ static int drm_mode_cursor_common(struct drm_device *dev, 
		return -ENOENT;

	}



	drm_modeset_acquire_init(&ctx, 0);

	drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);

retry:

	ret = drm_modeset_lock(&crtc->mutex, &ctx);

	if (ret)
@@ -875,7 +875,8 @@ static int drm_mode_cursor_common(struct drm_device *dev, 
	}

out:

	if (ret == -EDEADLK) {

		drm_modeset_backoff(&ctx);

		ret = drm_modeset_backoff(&ctx);

		if (!ret)

			goto retry;

	}