|
@@ -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,8 +1075,9 @@ out:
|
|
|
crtc->primary->old_fb = NULL;
|
|
|
|
|
|
if (ret == -EDEADLK) {
|
|
|
- drm_modeset_backoff(&ctx);
|
|
|
- goto retry;
|
|
|
+ ret = drm_modeset_backoff(&ctx);
|
|
|
+ if (!ret)
|
|
|
+ goto retry;
|
|
|
}
|
|
|
|
|
|
drm_modeset_drop_locks(&ctx);
|