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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 226A2C77B71 for ; Wed, 12 Apr 2023 08:46:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230464AbjDLIqA (ORCPT ); Wed, 12 Apr 2023 04:46:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230144AbjDLIp7 (ORCPT ); Wed, 12 Apr 2023 04:45:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CABED10D1 for ; Wed, 12 Apr 2023 01:45:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AA19A62AE9 for ; Wed, 12 Apr 2023 08:45:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE19FC433EF; Wed, 12 Apr 2023 08:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681289138; bh=41NGmFq+tNbRraKltE7oNfRk/f9Q2R2YCmjrh0HQkdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=diaXTexJP/n89YrluR5olV5Q22cSVoXrQCUdPthw5p7ZfvDDPkBIcCP9ATwZ/goCo WgmfWEdV6piVALIe+7jreIlI4dT532CAhL/AUT1uHZKMjud/NvokHdVdX1AA/Fn5na ORo4Y0Ocfr0e6UGbRamgfPB/Q6NZBSEnadeIi+AQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wayne Lin , Jasdeep Dhillon , Roman Li , Alex Deucher , "Limonciello, Mario" Subject: [PATCH 6.1 143/164] drm/amd/display: Clear MST topology if it fails to resume Date: Wed, 12 Apr 2023 10:34:25 +0200 Message-Id: <20230412082842.685824975@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230412082836.695875037@linuxfoundation.org> References: <20230412082836.695875037@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Roman Li commit 3f6752b4de41896c7f1609b1585db2080e8150d8 upstream. [Why] In case of failure to resume MST topology after suspend, an emtpty mst tree prevents further mst hub detection on the same connector. That causes the issue with MST hub hotplug after it's been unplug in suspend. [How] Stop topology manager on the connector after detecting DM_MST failure. Reviewed-by: Wayne Lin Acked-by: Jasdeep Dhillon Signed-off-by: Roman Li Signed-off-by: Alex Deucher Cc: "Limonciello, Mario" Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2175,6 +2175,8 @@ static int detect_mst_link_for_all_conne DRM_ERROR("DM_MST: Failed to start MST\n"); aconnector->dc_link->type = dc_connection_single; + ret = dm_helpers_dp_mst_stop_top_mgr(aconnector->dc_link->ctx, + aconnector->dc_link); break; } }