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

Commit dad56ce4 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/atomic: Convert atomic 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-3-maarten.lankhorst@linux.intel.com


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

drivers/gpu/drm/drm_atomic.c

+4 −3
Original line number Diff line number Diff line
@@ -2231,7 +2231,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 
			(arg->flags & DRM_MODE_PAGE_FLIP_EVENT))

		return -EINVAL;



	drm_modeset_acquire_init(&ctx, 0);

	drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);



	state = drm_atomic_state_alloc(dev);

	if (!state)
@@ -2342,7 +2342,8 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 


	if (ret == -EDEADLK) {

		drm_atomic_state_clear(state);

		drm_modeset_backoff(&ctx);

		ret = drm_modeset_backoff(&ctx);

		if (!ret)

			goto retry;

	}