Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fa6a073 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

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: default avatarMaarten 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: default avatarEmil Velikov <emil.l.velikov@gmail.com>
parent c2e4ff34

drivers/gpu/drm/drm_crtc.c

+4 −3
Original line number Diff line number Diff line
@@ -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);



	mutex_lock(&crtc->dev->mode_config.mutex);

	drm_modeset_acquire_init(&ctx, 0);

	drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);

retry:

	ret = drm_modeset_lock_all_ctx(crtc->dev, &ctx);

	if (ret)
@@ -717,7 +717,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
	kfree(connector_set);

	drm_mode_destroy(dev, mode);

	if (ret == -EDEADLK) {

		drm_modeset_backoff(&ctx);

		ret = drm_modeset_backoff(&ctx);

		if (!ret)

			goto retry;

	}

	drm_modeset_drop_locks(&ctx);