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 62C332505DD; Thu, 3 Apr 2025 15:26:15 +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=1743693975; cv=none; b=RRKjDYj1Q9CWArhXxBdDcHCDTosDoEq8vxJqswPur1G6TESnsgPjX3FsT35j5pGTUfpmgIbphHOPnNFZxrG8zAOduxymwVO4cKwRVNV9wqFfe/4tOrE90oCgl/R7xuMEg626nevHGu8jt2Sa75LA1c7KbPnBiPHX+eysfaCI9DI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743693975; c=relaxed/simple; bh=wmrAb8U3qMBZp9qpOB2IuJCW8oQfC0NkrHnV1Vd9osA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eNiHl+Sx5++WJ3SrKHkgM85pVSnUDa13sUnaGerO4MRziX0moaChkoEHA3k3iDgAEVJrAo7ICPtlgzpYThiBTjrqjKQp6lf15Mc1c9/RfVj7Gs+LSqNgv9uMVNAZEE6iH+/gcM/x3RdsaXBJ1YhmHf5AJ/KCpKd+c5pOtKHMV1E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XtZiOMec; 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="XtZiOMec" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEC10C4CEE3; Thu, 3 Apr 2025 15:26:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1743693975; bh=wmrAb8U3qMBZp9qpOB2IuJCW8oQfC0NkrHnV1Vd9osA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XtZiOMec3JytWzEwDDSZu86MjPVEQU95kY/csf7j5sUuK8Ezlv+BRL346OomBvAvs T76ljBSFa1f7tfActPfWgat2E0Mn69ozBdGvMNXLz6dwMxuzZVI1oTjR8JjuZYDsOa yxHHS/PCxfU78zhC2B+7nouJJ3eFjnWiAupL7Ouo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jerry Zuo , Wayne Lin , Zaeem Mohamed , Daniel Wheeler , Alex Deucher , Thadeu Lima de Souza Cascardo Subject: [PATCH 6.6 10/26] drm/amd/display: Dont write DP_MSTM_CTRL after LT Date: Thu, 3 Apr 2025 16:20:31 +0100 Message-ID: <20250403151622.711483020@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: Wayne Lin commit bc068194f548ef1f230d96c4398046bf59165992 upstream. [Why] Observe after suspend/resme, we can't light up mst monitors under specific mst hub. The reason is that driver still writes DPCD DP_MSTM_CTRL after LT. It's forbidden even we write the same value for that dpcd register. [How] We already resume the mst branch device dpcd settings during resume_mst_branch_status(). Leverage drm_dp_mst_topology_queue_probe() to only probe the topology, not calling drm_dp_mst_topology_mgr_resume() which will set DP_MSTM_CTRL as well. Reviewed-by: Jerry Zuo Signed-off-by: Wayne Lin Signed-off-by: Zaeem Mohamed Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher [cascardo: adjust context in local declarations] Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2825,8 +2825,7 @@ static int dm_resume(void *handle) struct dm_atomic_state *dm_state = to_dm_atomic_state(dm->atomic_obj.state); enum dc_connection_type new_connection_type = dc_connection_none; struct dc_state *dc_state; - int i, r, j, ret; - bool need_hotplug = false; + int i, r, j; if (amdgpu_in_reset(adev)) { dc_state = dm->cached_dc_state; @@ -3003,23 +3002,16 @@ static int dm_resume(void *handle) aconnector->mst_root) continue; - ret = drm_dp_mst_topology_mgr_resume(&aconnector->mst_mgr, true); - - if (ret < 0) { - dm_helpers_dp_mst_stop_top_mgr(aconnector->dc_link->ctx, - aconnector->dc_link); - need_hotplug = true; - } + drm_dp_mst_topology_queue_probe(&aconnector->mst_mgr); } drm_connector_list_iter_end(&iter); - if (need_hotplug) - drm_kms_helper_hotplug_event(ddev); - amdgpu_dm_irq_resume_late(adev); amdgpu_dm_smu_write_watermarks_table(adev); + drm_kms_helper_hotplug_event(ddev); + return 0; }