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 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 8ECFAC433EF for ; Tue, 12 Apr 2022 00:46:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D038C10FAC0; Tue, 12 Apr 2022 00:46:27 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0D4BC10FAC0; Tue, 12 Apr 2022 00:46:27 +0000 (UTC) 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 ams.source.kernel.org (Postfix) with ESMTPS id A0532B819B5; Tue, 12 Apr 2022 00:46:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E10B6C385A9; Tue, 12 Apr 2022 00:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724384; bh=pbF9xvN/+PxKIjQv/JQfzOJ3KV5q4UE3ruX9hDQjYkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CbiMl4bIIedOfQ1unrsg+GjO9Z7C7tH1QLHV+lTzZVi5h5SejMFZW2nutUG8IE7iz B/qd6yPeeAvj1YxCMClZ3Lfw8bFPt/BVWV3wSJl8gW5c4Gdazddi4N5veJbSKAQ51X r4rfmGv+A3cbmfZ6KTMAYeDUO4kwXiYmjN86V6w+VqlGN8NK3/iLXkjp8JcEiOuik3 PRNGMTrPnKeBNMGyroHbLeHu8omjeHPpTaRY22uSof87z6rGWJZEE/yaplROcBgq2k ue3fYU8GyaNoDgtJL+I/3Rv2YeoetpAM48e9eNDTfCDDdobw9HrHvOZDc2qOg9KMFq lxBYPefnt5WSQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 38/49] drm/amd/display: Fix allocate_mst_payload assert on resume Date: Mon, 11 Apr 2022 20:43:56 -0400 Message-Id: <20220412004411.349427-38-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412004411.349427-1-sashal@kernel.org> References: <20220412004411.349427-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit 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: Sasha Levin , Alex Hung , airlied@linux.ie, Xinhui.Pan@amd.com, Rodrigo.Siqueira@amd.com, Roman Li , amd-gfx@lists.freedesktop.org, nicholas.kazlauskas@amd.com, sunpeng.li@amd.com, Daniel Wheeler , dri-devel@lists.freedesktop.org, Wayne Lin , Alex Deucher , qingqing.zhuo@amd.com, christian.koenig@amd.com, shenshih@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Roman Li [ Upstream commit f4346fb3edf7720db3f7f5e1cab1f667cd024280 ] [Why] On resume we do link detection for all non-MST connectors. MST is handled separately. However the condition for telling if connector is on mst branch is not enough for mst hub case. Link detection for mst branch link leads to mst topology reset. That causes assert in dc_link_allocate_mst_payload() [How] Use link type as indicator for mst link. Reviewed-by: Wayne Lin Acked-by: Alex Hung Signed-off-by: Roman Li Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index b28b5c490860..4ba173b47617 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2693,7 +2693,8 @@ static int dm_resume(void *handle) * this is the case when traversing through already created * MST connectors, should be skipped */ - if (aconnector->mst_port) + if (aconnector->dc_link && + aconnector->dc_link->type == dc_connection_mst_branch) continue; mutex_lock(&aconnector->hpd_lock); -- 2.35.1 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 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 8F012C433F5 for ; Tue, 12 Apr 2022 00:46:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B77210FAC4; Tue, 12 Apr 2022 00:46:28 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0D4BC10FAC0; Tue, 12 Apr 2022 00:46:27 +0000 (UTC) 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 ams.source.kernel.org (Postfix) with ESMTPS id A0532B819B5; Tue, 12 Apr 2022 00:46:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E10B6C385A9; Tue, 12 Apr 2022 00:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724384; bh=pbF9xvN/+PxKIjQv/JQfzOJ3KV5q4UE3ruX9hDQjYkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CbiMl4bIIedOfQ1unrsg+GjO9Z7C7tH1QLHV+lTzZVi5h5SejMFZW2nutUG8IE7iz B/qd6yPeeAvj1YxCMClZ3Lfw8bFPt/BVWV3wSJl8gW5c4Gdazddi4N5veJbSKAQ51X r4rfmGv+A3cbmfZ6KTMAYeDUO4kwXiYmjN86V6w+VqlGN8NK3/iLXkjp8JcEiOuik3 PRNGMTrPnKeBNMGyroHbLeHu8omjeHPpTaRY22uSof87z6rGWJZEE/yaplROcBgq2k ue3fYU8GyaNoDgtJL+I/3Rv2YeoetpAM48e9eNDTfCDDdobw9HrHvOZDc2qOg9KMFq lxBYPefnt5WSQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 38/49] drm/amd/display: Fix allocate_mst_payload assert on resume Date: Mon, 11 Apr 2022 20:43:56 -0400 Message-Id: <20220412004411.349427-38-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412004411.349427-1-sashal@kernel.org> References: <20220412004411.349427-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Alex Hung , contact@emersion.fr, airlied@linux.ie, Xinhui.Pan@amd.com, Rodrigo.Siqueira@amd.com, Roman Li , amd-gfx@lists.freedesktop.org, nicholas.kazlauskas@amd.com, sunpeng.li@amd.com, Daniel Wheeler , dri-devel@lists.freedesktop.org, daniel@ffwll.ch, Wayne Lin , Alex Deucher , qingqing.zhuo@amd.com, harry.wentland@amd.com, christian.koenig@amd.com, shenshih@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Roman Li [ Upstream commit f4346fb3edf7720db3f7f5e1cab1f667cd024280 ] [Why] On resume we do link detection for all non-MST connectors. MST is handled separately. However the condition for telling if connector is on mst branch is not enough for mst hub case. Link detection for mst branch link leads to mst topology reset. That causes assert in dc_link_allocate_mst_payload() [How] Use link type as indicator for mst link. Reviewed-by: Wayne Lin Acked-by: Alex Hung Signed-off-by: Roman Li Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index b28b5c490860..4ba173b47617 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2693,7 +2693,8 @@ static int dm_resume(void *handle) * this is the case when traversing through already created * MST connectors, should be skipped */ - if (aconnector->mst_port) + if (aconnector->dc_link && + aconnector->dc_link->type == dc_connection_mst_branch) continue; mutex_lock(&aconnector->hpd_lock); -- 2.35.1 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 EE4D8C433F5 for ; Tue, 12 Apr 2022 00:48:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243740AbiDLAvD (ORCPT ); Mon, 11 Apr 2022 20:51:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243648AbiDLAtW (ORCPT ); Mon, 11 Apr 2022 20:49:22 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 567FE31376; Mon, 11 Apr 2022 17:46:26 -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 ams.source.kernel.org (Postfix) with ESMTPS id 9A175B819B4; Tue, 12 Apr 2022 00:46:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E10B6C385A9; Tue, 12 Apr 2022 00:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724384; bh=pbF9xvN/+PxKIjQv/JQfzOJ3KV5q4UE3ruX9hDQjYkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CbiMl4bIIedOfQ1unrsg+GjO9Z7C7tH1QLHV+lTzZVi5h5SejMFZW2nutUG8IE7iz B/qd6yPeeAvj1YxCMClZ3Lfw8bFPt/BVWV3wSJl8gW5c4Gdazddi4N5veJbSKAQ51X r4rfmGv+A3cbmfZ6KTMAYeDUO4kwXiYmjN86V6w+VqlGN8NK3/iLXkjp8JcEiOuik3 PRNGMTrPnKeBNMGyroHbLeHu8omjeHPpTaRY22uSof87z6rGWJZEE/yaplROcBgq2k ue3fYU8GyaNoDgtJL+I/3Rv2YeoetpAM48e9eNDTfCDDdobw9HrHvOZDc2qOg9KMFq lxBYPefnt5WSQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Roman Li , Wayne Lin , Alex Hung , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, nicholas.kazlauskas@amd.com, qingqing.zhuo@amd.com, contact@emersion.fr, shenshih@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.17 38/49] drm/amd/display: Fix allocate_mst_payload assert on resume Date: Mon, 11 Apr 2022 20:43:56 -0400 Message-Id: <20220412004411.349427-38-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412004411.349427-1-sashal@kernel.org> References: <20220412004411.349427-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roman Li [ Upstream commit f4346fb3edf7720db3f7f5e1cab1f667cd024280 ] [Why] On resume we do link detection for all non-MST connectors. MST is handled separately. However the condition for telling if connector is on mst branch is not enough for mst hub case. Link detection for mst branch link leads to mst topology reset. That causes assert in dc_link_allocate_mst_payload() [How] Use link type as indicator for mst link. Reviewed-by: Wayne Lin Acked-by: Alex Hung Signed-off-by: Roman Li Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index b28b5c490860..4ba173b47617 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2693,7 +2693,8 @@ static int dm_resume(void *handle) * this is the case when traversing through already created * MST connectors, should be skipped */ - if (aconnector->mst_port) + if (aconnector->dc_link && + aconnector->dc_link->type == dc_connection_mst_branch) continue; mutex_lock(&aconnector->hpd_lock); -- 2.35.1