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

Commit ccfc0865 authored by Rob Clark's avatar Rob Clark Committed by Daniel Vetter
Browse files

drm: tweak getconnector locking 



We need to hold connection_mutex as we read the properties.  Easiest
thing is just widen the scope where connection_mutex is held.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ac9c9256

drivers/gpu/drm/drm_crtc.c

+2 −3
Original line number Diff line number Diff line
@@ -2031,6 +2031,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, 
	DRM_DEBUG_KMS("[CONNECTOR:%d:?]\n", out_resp->connector_id);



	mutex_lock(&dev->mode_config.mutex);

	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);



	connector = drm_connector_find(dev, out_resp->connector_id);

	if (!connector) {
@@ -2062,14 +2063,11 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, 
	out_resp->mm_height = connector->display_info.height_mm;

	out_resp->subpixel = connector->display_info.subpixel_order;

	out_resp->connection = connector->status;

	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);



	encoder = drm_connector_get_encoder(connector);

	if (encoder)

		out_resp->encoder_id = encoder->base.id;

	else

		out_resp->encoder_id = 0;

	drm_modeset_unlock(&dev->mode_config.connection_mutex);



	/*

	 * This ioctl is called twice, once to determine how much space is
@@ -2135,6 +2133,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, 
	out_resp->count_encoders = encoders_count;



out:

	drm_modeset_unlock(&dev->mode_config.connection_mutex);

	mutex_unlock(&dev->mode_config.mutex);



	return ret;