]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drm/rockchip: use drm_for_each_connector_iter()
authorGustavo Padovan <gustavo.padovan@collabora.com>
Mon, 15 May 2017 13:43:30 +0000 (10:43 -0300)
committerGustavo Padovan <gustavo.padovan@collabora.com>
Fri, 26 May 2017 05:04:54 +0000 (02:04 -0300)
Drop legacy drm_for_each_connector() in favor of the race-free
drm_for_each_connector_iter()

Cc: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170515134330.3275-1-gustavo@padovan.org
drivers/gpu/drm/rockchip/rockchip_drm_vop.c

index 40a5e6ef6f2c858fabe5908fb40a6f93dd0b9846..9b3525a369697e20199f39e8c869d4ba08bee7a0 100644 (file)
@@ -1118,16 +1118,17 @@ static void vop_crtc_destroy_state(struct drm_crtc *crtc,
 #ifdef CONFIG_DRM_ANALOGIX_DP
 static struct drm_connector *vop_get_edp_connector(struct vop *vop)
 {
-       struct drm_crtc *crtc = &vop->crtc;
        struct drm_connector *connector;
+       struct drm_connector_list_iter conn_iter;
 
-       mutex_lock(&crtc->dev->mode_config.mutex);
-       drm_for_each_connector(connector, crtc->dev)
+       drm_connector_list_iter_begin(vop->drm_dev, &conn_iter);
+       drm_for_each_connector_iter(connector, &conn_iter) {
                if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
-                       mutex_unlock(&crtc->dev->mode_config.mutex);
+                       drm_connector_list_iter_end(&conn_iter);
                        return connector;
                }
-       mutex_unlock(&crtc->dev->mode_config.mutex);
+       }
+       drm_connector_list_iter_end(&conn_iter);
 
        return NULL;
 }