|
@@ -1838,7 +1838,6 @@ 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) {
|
|
@@ -1872,10 +1871,12 @@ 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);
|
|
|
if (connector->encoder)
|
|
|
out_resp->encoder_id = connector->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
|
|
@@ -1937,7 +1938,6 @@ 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;
|