From patchwork Mon Oct 25 01:55:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: He Ying X-Patchwork-Id: 12580601 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26B87C433EF for ; Mon, 25 Oct 2021 01:59:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED89060E0B for ; Mon, 25 Oct 2021 01:59:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org ED89060E0B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=fTO35J0Gyouh/i7qP9AHuAq8lbiFzAOotnSYfjALIhM=; b=fzf0p7gzmDfL8w bgNZua5RpvuOpiTuF1EV0gTcZ3dyjgoRha0BrZyNDQL5YKRY1qSN1ue1gcDONVD9clR1KSyABAC6j 0OwSLwgq1xfxdFK7ZHy6Re710orq/hwHupD7fGZbH8yoTQARUM7PaZW3Vv6GYmTJFeWhBTdlaYcOj owEeN/DhLnEjhE1PRYz/oRu8ojrL1/E2yLqrX+LaTH9/WSwOCA3UTGeAjeZnqpyd3OJsumjWI3UMZ Yql/51uHVWRVVF02XxoQ38HVqraIWbABIvum9Jlmpn/KYa7QcoFMDKCVgf3t2BsO1QXq/slYFIOXH +hWORB+64IVoipNaW+qA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mepEx-00EwoE-UA; Mon, 25 Oct 2021 01:57:32 +0000 Received: from szxga03-in.huawei.com ([45.249.212.189]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mepBj-00Ev9X-Rm; Mon, 25 Oct 2021 01:54:13 +0000 Received: from dggeme755-chm.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4HcydP53Rfz8tt5; Mon, 25 Oct 2021 09:52:41 +0800 (CST) Received: from huawei.com (10.67.174.47) by dggeme755-chm.china.huawei.com (10.3.19.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.15; Mon, 25 Oct 2021 09:54:00 +0800 From: He Ying To: , , , , , CC: , , , Subject: [PATCH] drm: Fix wrong use of connector in vop_get_edp_connector Date: Sun, 24 Oct 2021 21:55:50 -0400 Message-ID: <20211025015550.66500-1-heying24@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.67.174.47] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggeme755-chm.china.huawei.com (10.3.19.101) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211024_185412_191077_82CD2C06 X-CRM114-Status: GOOD ( 10.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From the comments of drm_for_each_connector_iter(), we know that "connector is only valid within the list body, if you want to use connector after calling drm_connector_list_iter_end() then you need to grab your own reference first using drm_connector_get()". So fix the wrong use of connector according to the comments and then call drm_connector_put() after using connector finishes. Signed-off-by: He Ying Fixes: 2cbeb64f6c70 ("drm/rockchip: use drm_for_each_connector_iter()") --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index a25b98b7f5bd..469922ad29fa 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1581,19 +1581,19 @@ static void vop_crtc_reset(struct drm_crtc *crtc) #ifdef CONFIG_DRM_ANALOGIX_DP static struct drm_connector *vop_get_edp_connector(struct vop *vop) { - struct drm_connector *connector; + struct drm_connector *connector = NULL; struct drm_connector_list_iter conn_iter; 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) { - drm_connector_list_iter_end(&conn_iter); - return connector; + drm_connector_get(connector); + break; } } drm_connector_list_iter_end(&conn_iter); - return NULL; + return connector; } static int vop_crtc_set_crc_source(struct drm_crtc *crtc, @@ -1614,6 +1614,7 @@ static int vop_crtc_set_crc_source(struct drm_crtc *crtc, else ret = -EINVAL; + drm_connector_put(connector); return ret; }