From patchwork Mon May 15 13:43:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9726997 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A65B86028A for ; Mon, 15 May 2017 13:43:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9654E285E2 for ; Mon, 15 May 2017 13:43:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A4BD285E7; Mon, 15 May 2017 13:43:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0D9FD285E2 for ; Mon, 15 May 2017 13:43:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EC26E89E03; Mon, 15 May 2017 13:43:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C3DB89E03 for ; Mon, 15 May 2017 13:43:37 +0000 (UTC) Received: by mail-qt0-f193.google.com with SMTP id j13so15534801qta.3 for ; Mon, 15 May 2017 06:43:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ymMdh/2Mr0PAd51YB5maDKmM4UA/yMbePcNarXE6sHo=; b=DGobldi62mBgQF+KuYw2w/uEKtkl/GWVp+tYwFzmGNtnfuPAFYOzUg3wyXs/oNhOjT QjE4XslaPpX4S0vsa6oja5Gd2yDtD6Y2L4QqzViiOJFg9UmzNzB8kQTbB3tti4AXTlpD G2PMOBqnCyryhn2ATzJLjXQhSwYc6M0gG3sXGQn01RlBvki/ZuVWxEBlbzE9MzZBKB4v iGC7RTJtMKcCstJQcyovFW5exX0CWHW49oLYzu6zsENcsRkf/NNBoZDHNDtpKxoVlC/q cifI0CqdDnLxlriYqE75ZnLfVqASYsbsVNq2bWy5mMICDV2yqKq2zJfcu6T0Hdg17rlI T/kQ== X-Gm-Message-State: AODbwcA9NhEfymXPkh3Bi4vZnqboSytzY8fYAyq+pommyLS6c5wojEaz cYWwGOURtsA0aw== X-Received: by 10.200.40.46 with SMTP id 43mr5778890qtq.132.1494855816682; Mon, 15 May 2017 06:43:36 -0700 (PDT) Received: from localhost.localdomain (177.18.9.71.dynamic.adsl.gvt.net.br. [177.18.9.71]) by smtp.gmail.com with ESMTPSA id y17sm8343783qtc.29.2017.05.15.06.43.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 May 2017 06:43:36 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [PATCH v2] drm/rockchip: use drm_for_each_connector_iter() Date: Mon, 15 May 2017 10:43:30 -0300 Message-Id: <20170515134330.3275-1-gustavo@padovan.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170511191049.28944-3-gustavo@padovan.org> References: <20170511191049.28944-3-gustavo@padovan.org> Cc: Gustavo Padovan X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan Drop legacy drm_for_each_connector() in favor of the race-free drm_for_each_connector_iter() Cc: Mark Yao Signed-off-by: Gustavo Padovan --- only built-tested! --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 40a5e6e..9b3525a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -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; }