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

Commit 13736ba3 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/legacy: Convert setplane 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-5-maarten.lankhorst@linux.intel.com


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

drivers/gpu/drm/drm_plane.c

+4 −3
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ static int setplane_internal(struct drm_plane *plane, 
	struct drm_modeset_acquire_ctx ctx;

	int ret;



	drm_modeset_acquire_init(&ctx, 0);

	drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);

retry:

	ret = drm_modeset_lock_all_ctx(plane->dev, &ctx);

	if (ret)
@@ -678,7 +678,8 @@ static int setplane_internal(struct drm_plane *plane, 


fail:

	if (ret == -EDEADLK) {

		drm_modeset_backoff(&ctx);

		ret = drm_modeset_backoff(&ctx);

		if (!ret)

			goto retry;

	}

	drm_modeset_drop_locks(&ctx);