p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/crtc: Convert setcrtc 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>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170912133749.6532-7-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:49 +02:00
parent c2e4ff34f4
commit 3fa6a07354
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/drm_crtc.c
View File

@ -577,7 +577,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name); DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);
mutex_lock(&crtc->dev->mode_config.mutex); mutex_lock(&crtc->dev->mode_config.mutex);
drm_modeset_acquire_init(&ctx, 0); drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);
retry: retry:
ret = drm_modeset_lock_all_ctx(crtc->dev, &ctx); ret = drm_modeset_lock_all_ctx(crtc->dev, &ctx);
if (ret) if (ret)
@ -717,7 +717,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
kfree(connector_set); kfree(connector_set);
drm_mode_destroy(dev, mode); drm_mode_destroy(dev, mode);
if (ret == -EDEADLK) { if (ret == -EDEADLK) {
drm_modeset_backoff(&ctx); ret = drm_modeset_backoff(&ctx);
if (!ret)
goto retry; goto retry;
} }
drm_modeset_drop_locks(&ctx); drm_modeset_drop_locks(&ctx);