Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2150603iof; Tue, 7 Jun 2022 21:26:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeh2lUMibFGW7AevT+6+RUrTPAhHM9RGXe9Bje7t8Qb4PfxNiiuZeDvmsELWA1SC3Anhzh X-Received: by 2002:a65:580f:0:b0:3fc:ffa7:9a66 with SMTP id g15-20020a65580f000000b003fcffa79a66mr24496439pgr.332.1654662391482; Tue, 07 Jun 2022 21:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654662391; cv=none; d=google.com; s=arc-20160816; b=0sO4nEkLSfVM3MQrpcuO0/cBxnfngPaU3vS547O4zlWnAbLYNfLETFtCWrBVZCh59i aeur7J5FMtQinHb0txInpWwrUzoE3vxCHqSt0LmfJvw2sAEAFOF/h5fsm454PHxAaPfK 09f+uCxt+KjlY9J7lxfQRTi64E079tNm2Xpfk5ABPcZBagOAunOa1eaOzqkfRxdv1o7Q wdJBDQiLvqebWX7j+Lf+bKffBOLvQfGcP77IAgB7uPWvE2+RG1ZeTZqWq6/+RXgFjirM GpFWtbKx8FKfxv1kVvqCtIRl2cp6QOMqfQlg0MXlhzNqojv5xInak207ijCXt9IQK/6g /lUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=p18pGTj1TysOUqbw6fgjiWtKESsOm1TH8KPBBtjtHs4=; b=swM6v42LuOJlJhkQy0JZi+Wm0HpeQh5iH3h8YzCktVfU6/K4LkQAfNwKBADLatgRCr lrf/Cv1/GpxKMnVIJzkkbPr1bt1qkkBtgvwLl9Yeso7a26jkcwqsRFUkAexXTfd+IZ5K H/pQHv1j7iebdMCXMRX4ZFojlL5lyyR5XkqQVJelq8MPKghYbMOLbykVTvNW2n6HUMcc 5KocFXib/7rlHL8KG3EtCrR1KpOeNuCaNoyha5ggogcIzsZRbrAbU47CQmxbrOpeNgWk 8UGEGYwk5SaQiMpcMAaNYHvFXefQYBYyILxjl3GLG8rwAa8Rnf3IgzWeBCkwJ2pr+Lrv ZaCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LpI4ivdO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id d3-20020a633603000000b003fe25580685si2244979pga.349.2022.06.07.21.26.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 21:26:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LpI4ivdO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 134D43F29DE; Tue, 7 Jun 2022 21:00:03 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381844AbiFGVsG (ORCPT + 99 others); Tue, 7 Jun 2022 17:48:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377221AbiFGUxo (ORCPT ); Tue, 7 Jun 2022 16:53:44 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6441211CA3F; Tue, 7 Jun 2022 11:43:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3EC18B82018; Tue, 7 Jun 2022 18:43:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94D26C3411C; Tue, 7 Jun 2022 18:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654627425; bh=HplrpNmY7M+tguF3+6EkcKSnhuhXimBvQS/rGeEEEww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LpI4ivdO/YszIZKdSMG+PeweCpYnrjDdhtvJLKOFclYEYlyZWyZAFPglnErHhoz5c F+UErf9PXLj1ck6bVNPszxsXVw21IIlp0eU6qicEbDTj8XAUMXYGcPg6Wr6up/0fea QdeRbEIPrz67w0ksK72Ta6VIBoVUYxlnCi1JShlk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tomeu Vizoso , Brian Norris , Douglas Anderson Subject: [PATCH 5.17 694/772] drm/bridge: analogix_dp: Grab runtime PM reference for DP-AUX Date: Tue, 7 Jun 2022 19:04:46 +0200 Message-Id: <20220607165009.502303900@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607164948.980838585@linuxfoundation.org> References: <20220607164948.980838585@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Brian Norris commit 8fb6c44fe8468f92ac7b8bbfcca4404a4e88645f upstream. If the display is not enable()d, then we aren't holding a runtime PM reference here. Thus, it's easy to accidentally cause a hang, if user space is poking around at /dev/drm_dp_aux0 at the "wrong" time. Let's get a runtime PM reference, and check that we "see" the panel. Don't force any panel power-up, etc., because that can be intrusive, and that's not what other drivers do (see drivers/gpu/drm/bridge/ti-sn65dsi86.c and drivers/gpu/drm/bridge/parade-ps8640.c.) Fixes: 0d97ad03f422 ("drm/bridge: analogix_dp: Remove duplicated code") Cc: Cc: Tomeu Vizoso Signed-off-by: Brian Norris Reviewed-by: Douglas Anderson Signed-off-by: Douglas Anderson Link: https://patchwork.freedesktop.org/patch/msgid/20220301181107.v4.1.I773a08785666ebb236917b0c8e6c05e3de471e75@changeid Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1632,8 +1632,19 @@ static ssize_t analogix_dpaux_transfer(s struct drm_dp_aux_msg *msg) { struct analogix_dp_device *dp = to_dp(aux); + int ret; - return analogix_dp_transfer(dp, msg); + pm_runtime_get_sync(dp->dev); + + ret = analogix_dp_detect_hpd(dp); + if (ret) + goto out; + + ret = analogix_dp_transfer(dp, msg); +out: + pm_runtime_put(dp->dev); + + return ret; } struct analogix_dp_device *