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: 13418110 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6606ECDB465 for ; Thu, 12 Oct 2023 01:22:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C558610E3B8; Thu, 12 Oct 2023 01:22:18 +0000 (UTC) X-Greylist: delayed 172102 seconds by postgrey-1.36 at gabe; Thu, 12 Oct 2023 01:22:15 UTC Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 55A4010E20F; Thu, 12 Oct 2023 01:22:15 +0000 (UTC) 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 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-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: Greg Kroah-Hartman , Intel Graphics , Linux Kernel Mailing List , DRI , Bjorn Andersson , RD Babiera , Linux Next Mailing List , Dmitry Baryshkov , Bjorn Andersson Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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"); }