Skip to content

Commit

Permalink
drm/atomic: Convert atomic ioctl locking to interruptible.
Browse files Browse the repository at this point in the history
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-3-maarten.lankhorst@linux.intel.com
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
  • Loading branch information
Maarten Lankhorst committed Sep 13, 2017
1 parent 6f8bcc7 commit dad56ce
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/gpu/drm/drm_atomic.c
Original file line number Diff line number Diff line change
Expand Up @@ -2231,7 +2231,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
(arg->flags & DRM_MODE_PAGE_FLIP_EVENT))
return -EINVAL;

drm_modeset_acquire_init(&ctx, 0);
drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);

state = drm_atomic_state_alloc(dev);
if (!state)
Expand Down Expand Up @@ -2342,8 +2342,9 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,

if (ret == -EDEADLK) {
drm_atomic_state_clear(state);
drm_modeset_backoff(&ctx);
goto retry;
ret = drm_modeset_backoff(&ctx);
if (!ret)
goto retry;
}

drm_atomic_state_put(state);
Expand Down

0 comments on commit dad56ce

Please sign in to comment.