From: Sean Paul Date: Thu, 17 Jul 2014 15:25:18 +0000 (-0400) Subject: drm: Check for connection_mutex in drm_select_eld X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=008f40451d0e59f220a4fa13aaf75d04303a01a1;p=openwrt%2Fstaging%2Fblogic.git drm: Check for connection_mutex in drm_select_eld drm_select_eld should check for mode_config.connection_mutex as well as mode_config.mutex: We need that since this function checks conector->encoder links. Signed-off-by: Sean Paul [danvet: Pimp commit message slightly.] Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index dfa9769b26b5..087d6080bc1d 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3305,6 +3305,7 @@ struct drm_connector *drm_select_eld(struct drm_encoder *encoder, struct drm_device *dev = encoder->dev; WARN_ON(!mutex_is_locked(&dev->mode_config.mutex)); + WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); list_for_each_entry(connector, &dev->mode_config.connector_list, head) if (connector->encoder == encoder && connector->eld[0])