Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAB8D606A31A for ; Sat, 31 Oct 2026 15:38:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=Tm+6LuaX Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A66810E25B; Sat, 31 Oct 2026 15:38:13 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 93C4010E07E; Sat, 31 Oct 2026 15:38:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1793461087; x=1824997087; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/yw+d/1d9czNY+Xu9+xe4/pfryf778O+QF2TTt4JC+Y=; b=Tm+6LuaXMuPtWrqZeANiGMwZqTQHswyoBEG4CW6/C9qLIgHH+DuM3RjV yjn/nFB8NYtjt0Nb4Sgwz1KqVjO75UahXjSZCCcWERfcuPmXI+z7uDXVX xaUEUVId4fWfRjmbAmLLbBc8eojw6YJjl66bM2PyNbGl2c1WQudOxQB/k CKuWYVTTzlQCObKQ1TJnNbQjQvfbR2I7mC4naleWOYWRkGqN3dNbA4Jj/ xqPARMzdwTgu6nYBGEGG8dfMXHPmjD6NyHmCviDY/FhH9VwWZOeAelJvT ftPH8u+OVofOFigP3y5ceASwIv+adMBzK3vwPCrFTdMScSF8s1r4hIjaj w==; X-CSE-ConnectionGUID: dfE64I22SQSVHWA5reGbTg== X-CSE-MsgGUID: odJBnPLPQpmZ4duhksS1sg== X-IronPort-AV: E=McAfee;i="6800,10657,11952"; a="2094955" X-IronPort-AV: E=Sophos;i="6.27,188,1787036400"; d="scan'208";a="2094955" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2026 08:38:07 -0700 X-CSE-ConnectionGUID: 95fY8IWkTaeIBMJdmEaH/g== X-CSE-MsgGUID: H1aOCWOSQcGS4KDc1jmD+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,188,1787036400"; d="scan'208";a="5647604" Received: from xiaolu.sh.intel.com ([10.239.146.103]) by orviesa004.jf.intel.com with ESMTP; 31 Oct 2026 08:38:05 -0700 From: Xiao Lu To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, jani.nikula@linux.intel.com, rodrigo.vivi@intel.com, imre.deak@intel.com, ville.syrjala@linux.intel.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, Xiao Lu Subject: [PATCH 1/2] drm/dp_mst: Return whether drm_dp_remove_payload_part1() removed the payload Date: Sat, 31 Oct 2026 23:35:49 +0800 Message-ID: <20261031153550.444676-2-xiaolu.xie@intel.com> X-Mailer: git-send-email 2.43.0 X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Intel-xe" X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 drm_dp_remove_payload_part1() doesn't send the removal of a payload to the branch devices if the port of the payload is not in the topology anymore. The caller can't tell, so it generates the ACT and waits for it afterwards, polling DPCD 0x2c0 for up to 3 seconds, although the payload table of the branch devices wasn't changed and the ACT will never be handled. Return whether the removal was sent, so that drivers can skip the ACT in the other case. The existing callers ignore the return value and are not affected. Signed-off-by: Xiao Lu --- drivers/gpu/drm/display/drm_dp_mst_topology.c | 10 +++++++++- include/drm/display/drm_dp_mst_helper.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index 7ce9e2127..363cd5237 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -3369,8 +3369,14 @@ EXPORT_SYMBOL(drm_dp_add_payload_part1); * Removes a payload along the virtual channel if it was successfully allocated. * After calling this, the driver should set HW to generate ACT and then switch to new * payload allocation state. + * + * Returns: + * %true if the port of the payload is in the topology, so the removal was + * sent to the branch devices and the driver should generate the ACT and wait + * for it. %false if the port is not in the topology anymore, so nothing was + * sent to the branch devices and there is no ACT to generate or wait for. */ -void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr, +bool drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_topology_state *mst_state, struct drm_dp_mst_atomic_payload *payload) { @@ -3388,6 +3394,8 @@ void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr, payload->vcpi); payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL; + + return send_remove; } EXPORT_SYMBOL(drm_dp_remove_payload_part1); diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h index 27658bfb5..d5a3bbb28 100644 --- a/include/drm/display/drm_dp_mst_helper.h +++ b/include/drm/display/drm_dp_mst_helper.h @@ -885,7 +885,7 @@ int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_atomic_payload *payload); int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_atomic_payload *payload); -void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr, +bool drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_topology_state *mst_state, struct drm_dp_mst_atomic_payload *payload); void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr, -- 2.43.0