diff options
| author | Sean Paul <seanpaul@chromium.org> | 2014-07-17 11:25:18 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-18 15:39:30 +0200 |
| commit | 008f40451d0e59f220a4fa13aaf75d04303a01a1 (patch) | |
| tree | e73ceb1d5da4d7ec1f340a3f90f54dba11b4eb90 /drivers/gpu/drm/drm_edid.c | |
| parent | bf3719c04ee3322b0f6d13c078e3ca4c3b7e3ead (diff) | |
| download | linux-008f40451d0e59f220a4fa13aaf75d04303a01a1.tar.gz linux-008f40451d0e59f220a4fa13aaf75d04303a01a1.tar.bz2 linux-008f40451d0e59f220a4fa13aaf75d04303a01a1.zip | |
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 <seanpaul@chromium.org>
[danvet: Pimp commit message slightly.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 1 |
1 files changed, 1 insertions, 0 deletions
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]) |