Commit c2e4ff34 authored by Maarten Lankhorst's avatar Maarten Lankhorst

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.comReviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
parent 13736ba3
...@@ -986,7 +986,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, ...@@ -986,7 +986,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
return -EINVAL; return -EINVAL;
} }
drm_modeset_acquire_init(&ctx, 0); drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);
retry: retry:
ret = drm_modeset_lock(&crtc->mutex, &ctx); ret = drm_modeset_lock(&crtc->mutex, &ctx);
if (ret) if (ret)
...@@ -1075,8 +1075,9 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, ...@@ -1075,8 +1075,9 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
crtc->primary->old_fb = NULL; crtc->primary->old_fb = NULL;
if (ret == -EDEADLK) { if (ret == -EDEADLK) {
drm_modeset_backoff(&ctx); ret = drm_modeset_backoff(&ctx);
goto retry; if (!ret)
goto retry;
} }
drm_modeset_drop_locks(&ctx); drm_modeset_drop_locks(&ctx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment