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

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

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


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

drivers/gpu/drm/drm_plane.c

+4 −3
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 
		return -EINVAL;

	}



	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)
@@ -1075,7 +1075,8 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 
	crtc->primary->old_fb = NULL;



	if (ret == -EDEADLK) {

		drm_modeset_backoff(&ctx);

		ret = drm_modeset_backoff(&ctx);

		if (!ret)

			goto retry;

	}