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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D71E2C433E6 for ; Fri, 5 Mar 2021 16:32:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A247765094 for ; Fri, 5 Mar 2021 16:32:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231124AbhCEQbl (ORCPT ); Fri, 5 Mar 2021 11:31:41 -0500 Received: from asav21.altibox.net ([109.247.116.8]:37740 "EHLO asav21.altibox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230050AbhCEQbX (ORCPT ); Fri, 5 Mar 2021 11:31:23 -0500 Received: from localhost.localdomain (unknown [81.166.168.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: noralf.tronnes@ebnett.no) by asav21.altibox.net (Postfix) with ESMTPSA id C57B480199; Fri, 5 Mar 2021 17:31:16 +0100 (CET) From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= To: dri-devel@lists.freedesktop.org Cc: linux-usb@vger.kernel.org, sam@ravnborg.org, peter@stuge.se, lkundrak@v3.sk, markus@raatikainen.cc, pontus.fuchs@gmail.com, hudson@trmm.net, th020394@gmail.com, =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Daniel Vetter Subject: [PATCH v7 2/3] drm/probe-helper: Check epoch counter in output_poll_execute() Date: Fri, 5 Mar 2021 17:31:03 +0100 Message-Id: <20210305163104.30756-3-noralf@tronnes.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210305163104.30756-1-noralf@tronnes.org> References: <20210305163104.30756-1-noralf@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=PJ4hB8iC c=1 sm=1 tr=0 a=OYZzhG0JTxDrWp/F2OJbnw==:117 a=OYZzhG0JTxDrWp/F2OJbnw==:17 a=IkcTkHD0fZMA:10 a=M51BFTxLslgA:10 a=SJz97ENfAAAA:8 a=rnb-knuk5dQJkhbuddwA:9 a=QEXdDO2ut3YA:10 a=vFet0B0WnEQeilDPIY6i:22 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org drm_helper_hpd_irq_event() checks the epoch counter to determine connector status change. This was introduced in commit 5186421cbfe2 ("drm: Introduce epoch counter to drm_connector"). Do the same for output_poll_execute() so it can detect other changes beside connection status value changes. v2: - Add Fixes tag (Daniel) Fixes: 5186421cbfe2 ("drm: Introduce epoch counter to drm_connector") Reviewed-by: Daniel Vetter Signed-off-by: Noralf Trønnes --- drivers/gpu/drm/drm_probe_helper.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index d6017726cc2a..e5432dcf6999 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -623,6 +623,7 @@ static void output_poll_execute(struct work_struct *work) struct drm_connector_list_iter conn_iter; enum drm_connector_status old_status; bool repoll = false, changed; + u64 old_epoch_counter; if (!dev->mode_config.poll_enabled) return; @@ -659,8 +660,9 @@ static void output_poll_execute(struct work_struct *work) repoll = true; + old_epoch_counter = connector->epoch_counter; connector->status = drm_helper_probe_detect(connector, NULL, false); - if (old_status != connector->status) { + if (old_epoch_counter != connector->epoch_counter) { const char *old, *new; /* @@ -689,6 +691,9 @@ static void output_poll_execute(struct work_struct *work) connector->base.id, connector->name, old, new); + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n", + connector->base.id, connector->name, + old_epoch_counter, connector->epoch_counter); changed = true; } -- 2.23.0 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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0977EC433DB for ; Fri, 5 Mar 2021 16:31:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 6CAA56508C for ; Fri, 5 Mar 2021 16:31:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6CAA56508C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=tronnes.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B2E586EBF6; Fri, 5 Mar 2021 16:31:19 +0000 (UTC) Received: from asav21.altibox.net (asav21.altibox.net [109.247.116.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id 91A586EBD0 for ; Fri, 5 Mar 2021 16:31:18 +0000 (UTC) Received: from localhost.localdomain (unknown [81.166.168.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: noralf.tronnes@ebnett.no) by asav21.altibox.net (Postfix) with ESMTPSA id C57B480199; Fri, 5 Mar 2021 17:31:16 +0100 (CET) From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= To: dri-devel@lists.freedesktop.org Subject: [PATCH v7 2/3] drm/probe-helper: Check epoch counter in output_poll_execute() Date: Fri, 5 Mar 2021 17:31:03 +0100 Message-Id: <20210305163104.30756-3-noralf@tronnes.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210305163104.30756-1-noralf@tronnes.org> References: <20210305163104.30756-1-noralf@tronnes.org> MIME-Version: 1.0 X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=PJ4hB8iC c=1 sm=1 tr=0 a=OYZzhG0JTxDrWp/F2OJbnw==:117 a=OYZzhG0JTxDrWp/F2OJbnw==:17 a=IkcTkHD0fZMA:10 a=M51BFTxLslgA:10 a=SJz97ENfAAAA:8 a=rnb-knuk5dQJkhbuddwA:9 a=QEXdDO2ut3YA:10 a=vFet0B0WnEQeilDPIY6i:22 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hudson@trmm.net, markus@raatikainen.cc, sam@ravnborg.org, linux-usb@vger.kernel.org, th020394@gmail.com, lkundrak@v3.sk, pontus.fuchs@gmail.com, Daniel Vetter , peter@stuge.se Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" ZHJtX2hlbHBlcl9ocGRfaXJxX2V2ZW50KCkgY2hlY2tzIHRoZSBlcG9jaCBjb3VudGVyIHRvIGRl dGVybWluZQpjb25uZWN0b3Igc3RhdHVzIGNoYW5nZS4gVGhpcyB3YXMgaW50cm9kdWNlZCBpbgpj b21taXQgNTE4NjQyMWNiZmUyICgiZHJtOiBJbnRyb2R1Y2UgZXBvY2ggY291bnRlciB0byBkcm1f Y29ubmVjdG9yIikuCkRvIHRoZSBzYW1lIGZvciBvdXRwdXRfcG9sbF9leGVjdXRlKCkgc28gaXQg Y2FuIGRldGVjdCBvdGhlciBjaGFuZ2VzCmJlc2lkZSBjb25uZWN0aW9uIHN0YXR1cyB2YWx1ZSBj aGFuZ2VzLgoKdjI6Ci0gQWRkIEZpeGVzIHRhZyAoRGFuaWVsKQoKRml4ZXM6IDUxODY0MjFjYmZl MiAoImRybTogSW50cm9kdWNlIGVwb2NoIGNvdW50ZXIgdG8gZHJtX2Nvbm5lY3RvciIpClJldmll d2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpTaWduZWQtb2Zm LWJ5OiBOb3JhbGYgVHLDuG5uZXMgPG5vcmFsZkB0cm9ubmVzLm9yZz4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vZHJtX3Byb2JlX2hlbHBlci5jIHwgNyArKysrKystCiAxIGZpbGUgY2hhbmdlZCwgNiBp bnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2RybV9wcm9iZV9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJvYmVfaGVscGVyLmMK aW5kZXggZDYwMTc3MjZjYzJhLi5lNTQzMmRjZjY5OTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fcHJvYmVfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wcm9iZV9o ZWxwZXIuYwpAQCAtNjIzLDYgKzYyMyw3IEBAIHN0YXRpYyB2b2lkIG91dHB1dF9wb2xsX2V4ZWN1 dGUoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCXN0cnVjdCBkcm1fY29ubmVjdG9yX2xpc3Rf aXRlciBjb25uX2l0ZXI7CiAJZW51bSBkcm1fY29ubmVjdG9yX3N0YXR1cyBvbGRfc3RhdHVzOwog CWJvb2wgcmVwb2xsID0gZmFsc2UsIGNoYW5nZWQ7CisJdTY0IG9sZF9lcG9jaF9jb3VudGVyOwog CiAJaWYgKCFkZXYtPm1vZGVfY29uZmlnLnBvbGxfZW5hYmxlZCkKIAkJcmV0dXJuOwpAQCAtNjU5 LDggKzY2MCw5IEBAIHN0YXRpYyB2b2lkIG91dHB1dF9wb2xsX2V4ZWN1dGUoc3RydWN0IHdvcmtf c3RydWN0ICp3b3JrKQogCiAJCXJlcG9sbCA9IHRydWU7CiAKKwkJb2xkX2Vwb2NoX2NvdW50ZXIg PSBjb25uZWN0b3ItPmVwb2NoX2NvdW50ZXI7CiAJCWNvbm5lY3Rvci0+c3RhdHVzID0gZHJtX2hl bHBlcl9wcm9iZV9kZXRlY3QoY29ubmVjdG9yLCBOVUxMLCBmYWxzZSk7Ci0JCWlmIChvbGRfc3Rh dHVzICE9IGNvbm5lY3Rvci0+c3RhdHVzKSB7CisJCWlmIChvbGRfZXBvY2hfY291bnRlciAhPSBj b25uZWN0b3ItPmVwb2NoX2NvdW50ZXIpIHsKIAkJCWNvbnN0IGNoYXIgKm9sZCwgKm5ldzsKIAog CQkJLyoKQEAgLTY4OSw2ICs2OTEsOSBAQCBzdGF0aWMgdm9pZCBvdXRwdXRfcG9sbF9leGVjdXRl KHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkJCQkgICAgICBjb25uZWN0b3ItPmJhc2UuaWQs CiAJCQkJICAgICAgY29ubmVjdG9yLT5uYW1lLAogCQkJCSAgICAgIG9sZCwgbmV3KTsKKwkJCURS TV9ERUJVR19LTVMoIltDT05ORUNUT1I6JWQ6JXNdIGVwb2NoIGNvdW50ZXIgJWxsdSAtPiAlbGx1 XG4iLAorCQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5pZCwgY29ubmVjdG9yLT5uYW1lLAorCQkJ CSAgICAgIG9sZF9lcG9jaF9jb3VudGVyLCBjb25uZWN0b3ItPmVwb2NoX2NvdW50ZXIpOwogCiAJ CQljaGFuZ2VkID0gdHJ1ZTsKIAkJfQotLSAKMi4yMy4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK