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

Commit 53552d5d authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Take mode_config.mutex in setcrtc ioctl 



Legacy drivers insist that we really take all the locks in this path,
and the harm in doing so is minimal.

v2: Like git add, it exists :(

Fixes: 2ceb585a ("drm: Add explicit acquire ctx handling around ->set_config")
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
Cc: Alex Deucher <alexdeucher@gmail.com>
Reported-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Acked-and-tested-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170406190654.6733-1-daniel.vetter@ffwll.ch
parent 6c5ed5ae

drivers/gpu/drm/drm_crtc.c

+2 −0
Original line number Diff line number Diff line
@@ -576,6 +576,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);

retry:

	ret = drm_modeset_lock_all_ctx(crtc->dev, &ctx);
@@ -721,6 +722,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
	}

	drm_modeset_drop_locks(&ctx);

	drm_modeset_acquire_fini(&ctx);

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



	return ret;

}