From patchwork Thu Oct 12 01:22:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 151635 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp919188vqb; Wed, 11 Oct 2023 18:22:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGRLoPQTQkIXXSuqFPPa7tgedL2W3SlyMxFqZ5JImvfokIZvjCuJ7sUWT7GIf8D1jrGLQT1 X-Received: by 2002:a17:902:dac8:b0:1bf:1a9e:85f7 with SMTP id q8-20020a170902dac800b001bf1a9e85f7mr25988379plx.1.1697073774735; Wed, 11 Oct 2023 18:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697073774; cv=none; d=google.com; s=arc-20160816; b=NX+DjVP/iGmDX63Qm5SaVAICUbSQrqS7OsoBcX0c5NSItq0BralhWmZ6d5cHa37daw pFKF6k3PBywPF8X1RLRNws7aWERYgibYaeizkWWLdNBCqfTrmwN6zh6v+hi6AAextj6U jodNAUgvyRjPK4da6zwW1qIsAMGdCr3dDaYHo2HibZRvRUjLbLgC1rqo7oy5P7h7UpTZ RR6eFr3N2wdQBPIabU+71cJPugcB0nC4URQ7fy0HRUC7Kj7yHFiKctIa7t3DmQyDEpps ulKHZDcOypFgaInirORQLGU0JAGxqHKF4rPl0zmsAxnHpkr2LDt/v6cvQEhKhLR0lvRt KHYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=/Xdp/mcMFK/p27v1jBmv4d5E1BUbkj0LWPAOYQzOMTw=; fh=+K+MbkGp43R4xlp30qy9w932e/vztNLDg7P3Rw7w/eo=; b=la8SU6MKoi0HNhx1Msag1cBdqYi+9mQOZbKA4x8bkpgIxHpNKerA5hVtXmb02w1jEt wuZZTHTWkQQwHJoaNkNDhvfEs4QmVgBVqaO1LRVWuDOMvLN0fzH20ASPQ8Dpgtf6cIPz 6tTNS6f/Y7fcbBODMaTfkFe+ux2aO6mC5cnxMoLDiBjIX9x2rsFH/MS5pEoGmlqKI4oS rTsRFJc0HHZ7gOmUaxFxYtlgru6gF/rLrLOk5LshJFymhW9lzgYR8/hvdUwxVrlBbANa cEkkFqeD38/YsA8Q/dkxuK7/87eDfC1tKxvPmYadNxGVLPLCLRQu03BR5T7HKiAsrRLp h0fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=pOqEfya9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id c23-20020a170902b69700b001b674055d72si895619pls.621.2023.10.11.18.22.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 18:22:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=pOqEfya9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id EB57E81143F5; Wed, 11 Oct 2023 18:22:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376728AbjJLBWS (ORCPT + 18 others); Wed, 11 Oct 2023 21:22:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235257AbjJLBWP (ORCPT ); Wed, 11 Oct 2023 21:22:15 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9920D8; Wed, 11 Oct 2023 18:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697073730; bh=/Xdp/mcMFK/p27v1jBmv4d5E1BUbkj0LWPAOYQzOMTw=; h=Date:From:To:Cc:Subject:From; b=pOqEfya98+RMdL6w1l5NRxhVvr/7mw2x6T6yMjSpnjy19aY6D4SN2emE/eusUyFIf rgAZAj2rI1CAtwR/SDa3Tod1PDxmIoZgsDanTeWutDvGBCqxzierK0ibvAQmmLH7dG JSwzJiebvJsQsV7qCj/WfH3nto3p1vTkh2QVccXWD1OYwgYch9aBvl06C2j+PPYExp oQnVyuFATwSyHQKQZ5vmtWe7NKo5zfi5ee4rGKISlGldcHLVCz64UJZixmp0eVTkCo nKUfhAKzcuR1RMlopyODd1P0PF4JWZIEWx/JLhJziZuXHTQbSrdvmKQyl0PmkLlixZ +G9rs5XPE5cEA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S5X1G2szKz4xWK; Thu, 12 Oct 2023 12:22:10 +1100 (AEDT) Date: Thu, 12 Oct 2023 12:22:09 +1100 From: Stephen Rothwell To: Daniel Vetter Cc: Greg Kroah-Hartman , RD Babiera , Intel Graphics , DRI , Bjorn Andersson , Bjorn Andersson , Dmitry Baryshkov , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the drm-misc tree Message-ID: <20231012122209.6f2768df@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 11 Oct 2023 18:22:32 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779510830337600016 X-GMAIL-MSGID: 1779510830337600016 Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm': drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments to function 'drm_connector_oob_hotplug_event' 309 | drm_connector_oob_hotplug_event(dp->connector_fwnode); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/usb/typec/altmodes/displayport.c:17: include/drm/drm_connector.h:1984:6: note: declared here 1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Caused by commit fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()") interacting with commit 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode") from the usb.current tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Thu, 12 Oct 2023 12:17:31 +1100 Subject: [PATCH] fix up for "drm: Add HPD state to drm_connector_oob_hotplug_event()" interacting with commit 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode") Signed-off-by: Stephen Rothwell --- drivers/usb/typec/altmodes/displayport.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c index ddfb5b6ace4f..eb0bf08fc97a 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt, dp->data.status = 0; dp->data.conf = 0; if (dp->hpd) { - drm_connector_oob_hotplug_event(dp->connector_fwnode); + drm_connector_oob_hotplug_event(dp->connector_fwnode + connector_status_disconnected); dp->hpd = false; sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd"); }