From mboxrd@z Thu Jan 1 00:00:00 1970 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A07A9C021AA for ; Wed, 19 Feb 2025 09:51:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To: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:List-Owner; bh=bnXcNHwkW6X9U4jS6BaBVAavk+9DXCgFqxwyfpT0+Y0=; b=a/YFFSdi41E7XPRmmi3Y5YeUtz WDoZqtI7miYXvJA3ndqp2JVHWPoC3NGuzNqoMhygIIQQ1mWefzCu+1LlY9eGFBvziA+RnkNslU3RJ VUBojl/VbAzYYUYOKWtY/HoxgMO7A5pC1HGeLrcdBe8sb2C1vFlSHcwW2JqBx9BSwyhk4+jua9Ts3 cYOGLJQ+FtYFGfh/z1NlCt9H1dJAsZq+6hZUqEoqglFgy+cX/F+dkKK2YhqahBgUkj+98KUw4jIxg tUt60USb/PQdrlAXmb4w4XJgcUo4eSsauZfWTj2dX+FnMV3l4ZGFQpnA/Cc4FC5ZlGrKEDgRG38ZI WyDSpPgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkgjC-0000000ByxK-3V4O; Wed, 19 Feb 2025 09:50:50 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkgHI-0000000BosB-0aTn; Wed, 19 Feb 2025 09:22:01 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 9ACBFA41FF3; Wed, 19 Feb 2025 09:20:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5516C4CED1; Wed, 19 Feb 2025 09:21:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739956919; bh=XLFseLySva84RkMFdyMGkSuLizl3GQr59DgJw1I0Qck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RhBToIy3n18eifjQ8iTc7aAq6XW/YJYnEMbp3QI0AdWfLk6QjVxTbkj07QxS4sGty sBPzAkQyK9fPFkRpSfRT8BQm4gmcMgNiR4fwYNm01v6IFpjYV9iuC9JT4znWM3YLSj vgPNH/6yEPfJo2PdnZ/Ti6kfsVbm8q3+HyPaTDYY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Zimmermann , Chris Zhong , Guenter Roeck , Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Andy Yan , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH 6.1 344/578] drm/rockchip: cdn-dp: Use drm_connector_helper_hpd_irq_event() Date: Wed, 19 Feb 2025 09:25:48 +0100 Message-ID: <20250219082706.550790662@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082652.891560343@linuxfoundation.org> References: <20250219082652.891560343@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250219_012200_311274_F464DD77 X-CRM114-Status: GOOD ( 15.00 ) 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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Zimmermann commit 666e1960464140cc4bc9203c203097e70b54c95a upstream. The code for detecting and updating the connector status in cdn_dp_pd_event_work() has a number of problems. - It does not aquire the locks to call the detect helper and update the connector status. These are struct drm_mode_config.connection_mutex and struct drm_mode_config.mutex. - It does not use drm_helper_probe_detect(), which helps with the details of locking and detection. - It uses the connector's status field to determine a change to the connector status. The epoch_counter field is the correct one. The field signals a change even if the connector status' value did not change. Replace the code with a call to drm_connector_helper_hpd_irq_event(), which fixes all these problems. Signed-off-by: Thomas Zimmermann Fixes: 81632df69772 ("drm/rockchip: cdn-dp: do not use drm_helper_hpd_irq_event") Cc: Chris Zhong Cc: Guenter Roeck Cc: Sandy Huang Cc: "Heiko Stübner" Cc: Andy Yan Cc: dri-devel@lists.freedesktop.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Cc: # v4.11+ Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20241105133848.480407-1-tzimmermann@suse.de Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -948,9 +948,6 @@ static void cdn_dp_pd_event_work(struct { struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device, event_work); - struct drm_connector *connector = &dp->connector; - enum drm_connector_status old_status; - int ret; mutex_lock(&dp->lock); @@ -1012,11 +1009,7 @@ static void cdn_dp_pd_event_work(struct out: mutex_unlock(&dp->lock); - - old_status = connector->status; - connector->status = connector->funcs->detect(connector, false); - if (old_status != connector->status) - drm_kms_helper_hotplug_event(dp->drm_dev); + drm_connector_helper_hpd_irq_event(&dp->connector); } static int cdn_dp_pd_event(struct notifier_block *nb, From mboxrd@z Thu Jan 1 00:00:00 1970 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AF398C021AA for ; Wed, 19 Feb 2025 09:50:55 +0000 (UTC) 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:References:In-Reply-To: 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: List-Owner; bh=o1MwHnVRLFezJyi0pxkNC68FtTNV82PqNGnchEMM+2A=; b=Uxh5/1FWiE2v1A HxDhjBIQFD3+R+Ckhfib5zUM9xJRDSInYsjUga6XJK5l/Q2u41OX5R8QgxQY+p4z6sq7spWcZmOia AyGjfgZ9r3/IUfFW+XwjOET75r+N2nSUHKcBI6nAVODTVoyupxjxtRqCJoQK2DThsYl0xDWJPc84L AVWXMl6n66NPN3NNlZ8y+9BACN411IHH2XasdvAAxwudnAWlDtKcgqBCpkdLP4wAtFTHuFkLDZ7d5 mtXFd6Ixi5fYIvItQ+pHksUnHZ+2MtVkkX4RMlfj0miEuJpiXMZPdQD8snQaH0LEW19jozctBvECs gRvnT1Ssm8sAKtOuwkoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkgjD-0000000Byxf-1bgC; Wed, 19 Feb 2025 09:50:51 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkgHI-0000000BosB-0aTn; Wed, 19 Feb 2025 09:22:01 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 9ACBFA41FF3; Wed, 19 Feb 2025 09:20:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5516C4CED1; Wed, 19 Feb 2025 09:21:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739956919; bh=XLFseLySva84RkMFdyMGkSuLizl3GQr59DgJw1I0Qck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RhBToIy3n18eifjQ8iTc7aAq6XW/YJYnEMbp3QI0AdWfLk6QjVxTbkj07QxS4sGty sBPzAkQyK9fPFkRpSfRT8BQm4gmcMgNiR4fwYNm01v6IFpjYV9iuC9JT4znWM3YLSj vgPNH/6yEPfJo2PdnZ/Ti6kfsVbm8q3+HyPaTDYY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Zimmermann , Chris Zhong , Guenter Roeck , Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Andy Yan , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH 6.1 344/578] drm/rockchip: cdn-dp: Use drm_connector_helper_hpd_irq_event() Date: Wed, 19 Feb 2025 09:25:48 +0100 Message-ID: <20250219082706.550790662@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082652.891560343@linuxfoundation.org> References: <20250219082652.891560343@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250219_012200_311274_F464DD77 X-CRM114-Status: GOOD ( 15.00 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Ni4xLXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IFRob21hcyBaaW1t ZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPgoKY29tbWl0IDY2NmUxOTYwNDY0MTQwY2M0YmM5 MjAzYzIwMzA5N2U3MGI1NGM5NWEgdXBzdHJlYW0uCgpUaGUgY29kZSBmb3IgZGV0ZWN0aW5nIGFu ZCB1cGRhdGluZyB0aGUgY29ubmVjdG9yIHN0YXR1cyBpbgpjZG5fZHBfcGRfZXZlbnRfd29yaygp IGhhcyBhIG51bWJlciBvZiBwcm9ibGVtcy4KCi0gSXQgZG9lcyBub3QgYXF1aXJlIHRoZSBsb2Nr cyB0byBjYWxsIHRoZSBkZXRlY3QgaGVscGVyIGFuZCB1cGRhdGUKdGhlIGNvbm5lY3RvciBzdGF0 dXMuIFRoZXNlIGFyZSBzdHJ1Y3QgZHJtX21vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgKYW5k IHN0cnVjdCBkcm1fbW9kZV9jb25maWcubXV0ZXguCgotIEl0IGRvZXMgbm90IHVzZSBkcm1faGVs cGVyX3Byb2JlX2RldGVjdCgpLCB3aGljaCBoZWxwcyB3aXRoIHRoZQpkZXRhaWxzIG9mIGxvY2tp bmcgYW5kIGRldGVjdGlvbi4KCi0gSXQgdXNlcyB0aGUgY29ubmVjdG9yJ3Mgc3RhdHVzIGZpZWxk IHRvIGRldGVybWluZSBhIGNoYW5nZSB0bwp0aGUgY29ubmVjdG9yIHN0YXR1cy4gVGhlIGVwb2No X2NvdW50ZXIgZmllbGQgaXMgdGhlIGNvcnJlY3Qgb25lLiBUaGUKZmllbGQgc2lnbmFscyBhIGNo YW5nZSBldmVuIGlmIHRoZSBjb25uZWN0b3Igc3RhdHVzJyB2YWx1ZSBkaWQgbm90CmNoYW5nZS4K ClJlcGxhY2UgdGhlIGNvZGUgd2l0aCBhIGNhbGwgdG8gZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfaHBk X2lycV9ldmVudCgpLAp3aGljaCBmaXhlcyBhbGwgdGhlc2UgcHJvYmxlbXMuCgpTaWduZWQtb2Zm LWJ5OiBUaG9tYXMgWmltbWVybWFubiA8dHppbW1lcm1hbm5Ac3VzZS5kZT4KRml4ZXM6IDgxNjMy ZGY2OTc3MiAoImRybS9yb2NrY2hpcDogY2RuLWRwOiBkbyBub3QgdXNlIGRybV9oZWxwZXJfaHBk X2lycV9ldmVudCIpCkNjOiBDaHJpcyBaaG9uZyA8enl3QHJvY2stY2hpcHMuY29tPgpDYzogR3Vl bnRlciBSb2VjayA8Z3JvZWNrQGNocm9taXVtLm9yZz4KQ2M6IFNhbmR5IEh1YW5nIDxoamNAcm9j ay1jaGlwcy5jb20+CkNjOiAiSGVpa28gU3TDvGJuZXIiIDxoZWlrb0BzbnRlY2guZGU+CkNjOiBB bmR5IFlhbiA8YW5keS55YW5Acm9jay1jaGlwcy5jb20+CkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCkNjOiBsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKQ2M6 IGxpbnV4LXJvY2tjaGlwQGxpc3RzLmluZnJhZGVhZC5vcmcKQ2M6IDxzdGFibGVAdmdlci5rZXJu ZWwub3JnPiAjIHY0LjExKwpTaWduZWQtb2ZmLWJ5OiBIZWlrbyBTdHVlYm5lciA8aGVpa29Ac250 ZWNoLmRlPgpMaW5rOiBodHRwczovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNn aWQvMjAyNDExMDUxMzM4NDguNDgwNDA3LTEtdHppbW1lcm1hbm5Ac3VzZS5kZQpTaWduZWQtb2Zm LWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9jZG4tZHAtY29yZS5jIHwgICAgOSArLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgOCBkZWxldGlvbnMoLSkKCi0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9jZG4tZHAtY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9yb2NrY2hpcC9jZG4tZHAtY29yZS5jCkBAIC05NDgsOSArOTQ4LDYgQEAgc3RhdGljIHZvaWQg Y2RuX2RwX3BkX2V2ZW50X3dvcmsoc3RydWN0CiB7CiAJc3RydWN0IGNkbl9kcF9kZXZpY2UgKmRw ID0gY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBjZG5fZHBfZGV2aWNlLAogCQkJCQkJZXZlbnRf d29yayk7Ci0Jc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciA9ICZkcC0+Y29ubmVjdG9y OwotCWVudW0gZHJtX2Nvbm5lY3Rvcl9zdGF0dXMgb2xkX3N0YXR1czsKLQogCWludCByZXQ7CiAK IAltdXRleF9sb2NrKCZkcC0+bG9jayk7CkBAIC0xMDEyLDExICsxMDA5LDcgQEAgc3RhdGljIHZv aWQgY2RuX2RwX3BkX2V2ZW50X3dvcmsoc3RydWN0CiAKIG91dDoKIAltdXRleF91bmxvY2soJmRw LT5sb2NrKTsKLQotCW9sZF9zdGF0dXMgPSBjb25uZWN0b3ItPnN0YXR1czsKLQljb25uZWN0b3It PnN0YXR1cyA9IGNvbm5lY3Rvci0+ZnVuY3MtPmRldGVjdChjb25uZWN0b3IsIGZhbHNlKTsKLQlp ZiAob2xkX3N0YXR1cyAhPSBjb25uZWN0b3ItPnN0YXR1cykKLQkJZHJtX2ttc19oZWxwZXJfaG90 cGx1Z19ldmVudChkcC0+ZHJtX2Rldik7CisJZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfaHBkX2lycV9l dmVudCgmZHAtPmNvbm5lY3Rvcik7CiB9CiAKIHN0YXRpYyBpbnQgY2RuX2RwX3BkX2V2ZW50KHN0 cnVjdCBub3RpZmllcl9ibG9jayAqbmIsCgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkxpbnV4LXJvY2tjaGlwIG1haWxpbmcgbGlzdApMaW51eC1yb2Nr Y2hpcEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxt YW4vbGlzdGluZm8vbGludXgtcm9ja2NoaXAK