openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170912133749.6532-4-maarten.lankhorst@linux.intel.com
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Maarten Lankhorst 2017-09-12 15:37:46 +02:00
parent dad56ce417
commit 6c886e4aff
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/drm_plane.c
View File

@ -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,8 +875,9 @@ 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);
goto retry; if (!ret)
goto retry;
} }
drm_modeset_drop_locks(&ctx); drm_modeset_drop_locks(&ctx);