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 7B699C433EF for ; Fri, 1 Apr 2022 14:42:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 35BCA10EABC; Fri, 1 Apr 2022 14:42:20 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 13DBF10EABC; Fri, 1 Apr 2022 14:42:19 +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 dfw.source.kernel.org (Postfix) with ESMTPS id 890C760A3C; Fri, 1 Apr 2022 14:42:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C469C2BBE4; Fri, 1 Apr 2022 14:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648824138; bh=YlT8pUaLtdbBrX1BWTnq5Kvsw1TYm69WsdMS5uTFZco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CTtviXsh8ORXzjuGOYL8eWePA8AiHQQ/dlUQ7WjuW7ZMaQhAkJ/20rIcJPW3LrVNT RGg7sGjA7XjWLkHpB95CuevguXoEEI/0FNRbhxkTpPI0RhZNSPfo+ARBbzFt9zQQEb /oNcYghC76dymVVUflwf+y+i8JFYlMXqxBDYDmU1j7iRki3fmyPkZrH+WTzu8ws8w3 dNd+MilrJbfQMEJxApXQFCWBW6p/RfMDAqI6W/yynM1oCduOWUionIGsk5PgHZB6mw 8IpK29GBhJfGVf8+X1nzDpl81xYQ0zlGnW0lJ52rTUoz1M+XwjC2w3fTV+27iVSM56 BvX/JpwDi8CYw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 03/65] drm/amd/display: Add signal type check when verify stream backends same Date: Fri, 1 Apr 2022 10:41:04 -0400 Message-Id: <20220401144206.1953700-3-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401144206.1953700-1-sashal@kernel.org> References: <20220401144206.1953700-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: aric.cyr@amd.com, airlied@linux.ie, Rodrigo.Siqueira@amd.com, Dale Zhao , dri-devel@lists.freedesktop.org, meenakshikumar.somasundaram@amd.com, Jun.Lei@amd.com, Jimmy.Kizito@amd.com, Sasha Levin , mario.kleiner.de@gmail.com, wenjing.liu@amd.com, amd-gfx@lists.freedesktop.org, Jerry.Zuo@amd.com, eric.bernstein@amd.com, harry.wentland@amd.com, sunpeng.li@amd.com, Daniel Wheeler , Martin.Leung@amd.com, Xinhui.Pan@amd.com, christian.koenig@amd.com, Dmytro.Laktyushkin@amd.com, daniel@ffwll.ch, Wayne Lin , Alex Deucher , nicholas.kazlauskas@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Dale Zhao [ Upstream commit 047db281c026de5971cedb5bb486aa29bd16a39d ] [Why] For allow eDP hot-plug feature, the stream signal may change to VIRTUAL when plug-out and back to eDP when plug-in. OS will still setPathMode with same timing for each plugging, but eDP gets no stream update as we don't check signal type changing back as keeping it VIRTUAL. It's also unsafe for future cases that stream signal is switched with same timing. [How] Check stream signal type change include previous HDMI signal case. Reviewed-by: Aric Cyr Acked-by: Wayne Lin Signed-off-by: Dale Zhao Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 5f4cdb05c4db..5c5ccbad9658 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1674,6 +1674,9 @@ static bool are_stream_backends_same( if (is_timing_changed(stream_a, stream_b)) return false; + if (stream_a->signal != stream_b->signal) + return false; + if (stream_a->dpms_off != stream_b->dpms_off) return false; -- 2.34.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 63C9DC433F5 for ; Fri, 1 Apr 2022 14:42:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AA7DC10F488; Fri, 1 Apr 2022 14:42:20 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 13DBF10EABC; Fri, 1 Apr 2022 14:42:19 +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 dfw.source.kernel.org (Postfix) with ESMTPS id 890C760A3C; Fri, 1 Apr 2022 14:42:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C469C2BBE4; Fri, 1 Apr 2022 14:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648824138; bh=YlT8pUaLtdbBrX1BWTnq5Kvsw1TYm69WsdMS5uTFZco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CTtviXsh8ORXzjuGOYL8eWePA8AiHQQ/dlUQ7WjuW7ZMaQhAkJ/20rIcJPW3LrVNT RGg7sGjA7XjWLkHpB95CuevguXoEEI/0FNRbhxkTpPI0RhZNSPfo+ARBbzFt9zQQEb /oNcYghC76dymVVUflwf+y+i8JFYlMXqxBDYDmU1j7iRki3fmyPkZrH+WTzu8ws8w3 dNd+MilrJbfQMEJxApXQFCWBW6p/RfMDAqI6W/yynM1oCduOWUionIGsk5PgHZB6mw 8IpK29GBhJfGVf8+X1nzDpl81xYQ0zlGnW0lJ52rTUoz1M+XwjC2w3fTV+27iVSM56 BvX/JpwDi8CYw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 03/65] drm/amd/display: Add signal type check when verify stream backends same Date: Fri, 1 Apr 2022 10:41:04 -0400 Message-Id: <20220401144206.1953700-3-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401144206.1953700-1-sashal@kernel.org> References: <20220401144206.1953700-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: airlied@linux.ie, Rodrigo.Siqueira@amd.com, Dale Zhao , dri-devel@lists.freedesktop.org, meenakshikumar.somasundaram@amd.com, Jun.Lei@amd.com, Jimmy.Kizito@amd.com, Sasha Levin , wenjing.liu@amd.com, amd-gfx@lists.freedesktop.org, Jerry.Zuo@amd.com, eric.bernstein@amd.com, sunpeng.li@amd.com, Daniel Wheeler , Martin.Leung@amd.com, Xinhui.Pan@amd.com, christian.koenig@amd.com, Dmytro.Laktyushkin@amd.com, Wayne Lin , Alex Deucher , nicholas.kazlauskas@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Dale Zhao [ Upstream commit 047db281c026de5971cedb5bb486aa29bd16a39d ] [Why] For allow eDP hot-plug feature, the stream signal may change to VIRTUAL when plug-out and back to eDP when plug-in. OS will still setPathMode with same timing for each plugging, but eDP gets no stream update as we don't check signal type changing back as keeping it VIRTUAL. It's also unsafe for future cases that stream signal is switched with same timing. [How] Check stream signal type change include previous HDMI signal case. Reviewed-by: Aric Cyr Acked-by: Wayne Lin Signed-off-by: Dale Zhao Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 5f4cdb05c4db..5c5ccbad9658 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1674,6 +1674,9 @@ static bool are_stream_backends_same( if (is_timing_changed(stream_a, stream_b)) return false; + if (stream_a->signal != stream_b->signal) + return false; + if (stream_a->dpms_off != stream_b->dpms_off) return false; -- 2.34.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 9CBEAC433EF for ; Fri, 1 Apr 2022 15:20:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353264AbiDAPUX (ORCPT ); Fri, 1 Apr 2022 11:20:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349264AbiDAOvc (ORCPT ); Fri, 1 Apr 2022 10:51:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE9622B44BA; Fri, 1 Apr 2022 07:42:18 -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 8987960AD8; Fri, 1 Apr 2022 14:42:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C469C2BBE4; Fri, 1 Apr 2022 14:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648824138; bh=YlT8pUaLtdbBrX1BWTnq5Kvsw1TYm69WsdMS5uTFZco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CTtviXsh8ORXzjuGOYL8eWePA8AiHQQ/dlUQ7WjuW7ZMaQhAkJ/20rIcJPW3LrVNT RGg7sGjA7XjWLkHpB95CuevguXoEEI/0FNRbhxkTpPI0RhZNSPfo+ARBbzFt9zQQEb /oNcYghC76dymVVUflwf+y+i8JFYlMXqxBDYDmU1j7iRki3fmyPkZrH+WTzu8ws8w3 dNd+MilrJbfQMEJxApXQFCWBW6p/RfMDAqI6W/yynM1oCduOWUionIGsk5PgHZB6mw 8IpK29GBhJfGVf8+X1nzDpl81xYQ0zlGnW0lJ52rTUoz1M+XwjC2w3fTV+27iVSM56 BvX/JpwDi8CYw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dale Zhao , Aric Cyr , Wayne Lin , 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, Jun.Lei@amd.com, aric.cyr@amd.com, Jimmy.Kizito@amd.com, wenjing.liu@amd.com, nicholas.kazlauskas@amd.com, mario.kleiner.de@gmail.com, Dmytro.Laktyushkin@amd.com, Jerry.Zuo@amd.com, meenakshikumar.somasundaram@amd.com, eric.bernstein@amd.com, Martin.Leung@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.10 03/65] drm/amd/display: Add signal type check when verify stream backends same Date: Fri, 1 Apr 2022 10:41:04 -0400 Message-Id: <20220401144206.1953700-3-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401144206.1953700-1-sashal@kernel.org> References: <20220401144206.1953700-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: Dale Zhao [ Upstream commit 047db281c026de5971cedb5bb486aa29bd16a39d ] [Why] For allow eDP hot-plug feature, the stream signal may change to VIRTUAL when plug-out and back to eDP when plug-in. OS will still setPathMode with same timing for each plugging, but eDP gets no stream update as we don't check signal type changing back as keeping it VIRTUAL. It's also unsafe for future cases that stream signal is switched with same timing. [How] Check stream signal type change include previous HDMI signal case. Reviewed-by: Aric Cyr Acked-by: Wayne Lin Signed-off-by: Dale Zhao Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 5f4cdb05c4db..5c5ccbad9658 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1674,6 +1674,9 @@ static bool are_stream_backends_same( if (is_timing_changed(stream_a, stream_b)) return false; + if (stream_a->signal != stream_b->signal) + return false; + if (stream_a->dpms_off != stream_b->dpms_off) return false; -- 2.34.1