From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F216224CEE5; Thu, 3 Apr 2025 15:27:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743694034; cv=none; b=lzHlWYpxqWYEDNqoQe7v/r+H12eQ0FsY3njaS16fws+GP1DJKnMUOzUphe2x8ElzICvjaXKPe0MuqgZYBLiEbjLaOPtNOxqUlGpuNQkS68OvuIMDFhmtd85Wf665zQoAkzC3M37CvYtHFU6AJQ/cpGB2tqmrVU6eZkywjOAeQTI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743694034; c=relaxed/simple; bh=aPr8c50VZeUZdkJnVrQIPWbHy0y1zrd9XJekLgJSc6Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uIy9iPMFEnorT7r9knlDu+rYoLNpnfL6xHZaVeKOGVtJwMS2/agFwbPW10p+PhLdCwxDqrwo28blQUdmObsEezYPBUpvp7H1nd0NUFL3QKgKToqw6W5z01IGnYn00Dg8XCyR4MoHXmiaqxnRMl95iMj+g7m0T5aEssznte/DvCo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zTIhGQHV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zTIhGQHV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89F0DC4CEE3; Thu, 3 Apr 2025 15:27:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1743694033; bh=aPr8c50VZeUZdkJnVrQIPWbHy0y1zrd9XJekLgJSc6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zTIhGQHVx5k/ktfvaFDprdzlYlQDQ7DjjIKqn4M3xOYTdhzXqNZlvyRlLX66iWHUe BDJmmvmnurpehNnssVR2fwnksLFxzvbJhGJPWahn9MElORtidwcEx4kG01s2SXlkWV S2FUD8xXagTEPxQ7SxPgF5S5n1jmkejy3U4iXRaA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lyude Paul , dri-devel@lists.freedesktop.org, Imre Deak , Thadeu Lima de Souza Cascardo Subject: [PATCH 6.6 09/26] drm/dp_mst: Add a helper to queue a topology probe Date: Thu, 3 Apr 2025 16:20:30 +0100 Message-ID: <20250403151622.684402831@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250403151622.415201055@linuxfoundation.org> References: <20250403151622.415201055@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Imre Deak commit dbaeef363ea54f4c18112874b77503c72ba60fec upstream. A follow up i915 patch will need to reprobe the MST topology after the initial probing, add a helper for this. Cc: Lyude Paul Cc: dri-devel@lists.freedesktop.org Reviewed-by: Lyude Paul Signed-off-by: Imre Deak Link: https://patchwork.freedesktop.org/patch/msgid/20240722165503.2084999-3-imre.deak@intel.com Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/display/drm_dp_mst_topology.c | 27 ++++++++++++++++++++++++++ include/drm/display/drm_dp_mst_helper.h | 2 + 2 files changed, 29 insertions(+) --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -3686,6 +3686,33 @@ drm_dp_mst_topology_mgr_invalidate_mstb( } /** + * drm_dp_mst_topology_queue_probe - Queue a topology probe + * @mgr: manager to probe + * + * Queue a work to probe the MST topology. Driver's should call this only to + * sync the topology's HW->SW state after the MST link's parameters have + * changed in a way the state could've become out-of-sync. This is the case + * for instance when the link rate between the source and first downstream + * branch device has switched between UHBR and non-UHBR rates. Except of those + * cases - for instance when a sink gets plugged/unplugged to a port - the SW + * state will get updated automatically via MST UP message notifications. + */ +void drm_dp_mst_topology_queue_probe(struct drm_dp_mst_topology_mgr *mgr) +{ + mutex_lock(&mgr->lock); + + if (drm_WARN_ON(mgr->dev, !mgr->mst_state || !mgr->mst_primary)) + goto out_unlock; + + drm_dp_mst_topology_mgr_invalidate_mstb(mgr->mst_primary); + drm_dp_mst_queue_probe_work(mgr); + +out_unlock: + mutex_unlock(&mgr->lock); +} +EXPORT_SYMBOL(drm_dp_mst_topology_queue_probe); + +/** * drm_dp_mst_topology_mgr_suspend() - suspend the MST manager * @mgr: manager to suspend * --- a/include/drm/display/drm_dp_mst_helper.h +++ b/include/drm/display/drm_dp_mst_helper.h @@ -859,6 +859,8 @@ int drm_dp_check_act_status(struct drm_d void drm_dp_mst_dump_topology(struct seq_file *m, struct drm_dp_mst_topology_mgr *mgr); +void drm_dp_mst_topology_queue_probe(struct drm_dp_mst_topology_mgr *mgr); + void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr); int __must_check drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr,