Commit 6c886e4a authored by Maarten Lankhorst's avatar Maarten Lankhorst

drm/legacy: Convert cursor 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-4-maarten.lankhorst@linux.intel.comReviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
parent dad56ce4
...@@ -833,7 +833,7 @@ static int drm_mode_cursor_common(struct drm_device *dev, ...@@ -833,7 +833,7 @@ static int drm_mode_cursor_common(struct drm_device *dev,
return -ENOENT; return -ENOENT;
} }
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)
...@@ -875,7 +875,8 @@ static int drm_mode_cursor_common(struct drm_device *dev, ...@@ -875,7 +875,8 @@ static int drm_mode_cursor_common(struct drm_device *dev,
} }
out: out:
if (ret == -EDEADLK) { if (ret == -EDEADLK) {
drm_modeset_backoff(&ctx); ret = drm_modeset_backoff(&ctx);
if (!ret)
goto retry; goto retry;
} }
......
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