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 06617C001B0 for ; Sun, 13 Aug 2023 15:52:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8DA5A10E09F; Sun, 13 Aug 2023 15:52:32 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7DF5D10E09F; Sun, 13 Aug 2023 15:52:30 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C3283632EC; Sun, 13 Aug 2023 15:52:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D6AEC433C7; Sun, 13 Aug 2023 15:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691941949; bh=OzwJS32dqO5ec+C5kPHE2OkJ6RU9ruhQVtp7umfEOPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cd72vG3kGYLSvTe93X9bIelWVriYj8gZykQ2+3TqeyibhrLtic1X/RRlf7ww9j4JA 3jABpv1r1qyA6KpNTdWA/qWhT22kp4oTuvn7+uSbWNnlovnMDbkzEs+Zf1HkgnSSLA tzhPkTCE/Mz/sZkkN5mo7s/JdIOuMHdBBFkurVKSQZkA03+VFvCqUb83cckU1WS9Zv y2ZJYvSuQP/62ybLASIlFHz0vu6FCcAB5puu6bNSfVlpqZfLw+AmTMXF86MvzUqCt3 wP2xs7XYVcLz3/u9c3J9OKqJ83mG1AccR/cX4slchElb/aYkiLYicq3zmhz8gV6x2c C0wQsVnm3LMJw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.4 44/54] drm/amd/display: Exit idle optimizations before attempt to access PHY Date: Sun, 13 Aug 2023 11:49:23 -0400 Message-Id: <20230813154934.1067569-44-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813154934.1067569-1-sashal@kernel.org> References: <20230813154934.1067569-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.10 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, Iswara.Nagulendran@amd.com, wenjing.liu@amd.com, dri-devel@lists.freedesktop.org, Jun.Lei@amd.com, airlied@gmail.com, Sasha Levin , Charlene.Liu@amd.com, Leo Chen , Rodrigo.Siqueira@amd.com, amd-gfx@lists.freedesktop.org, tony.tascioglu@amd.com, sunpeng.li@amd.com, harry.wentland@amd.com, Jingwen.Zhu@amd.com, Alex Hung , Daniel Wheeler , daniel@ffwll.ch, Xinhui.Pan@amd.com, Nicholas Kazlauskas , zhikai.zhai@amd.com, Alex Deucher , christian.koenig@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Leo Chen [ Upstream commit de612738e9771bd66aeb20044486c457c512f684 ] [Why & How] DMUB may hang when powering down pixel clocks due to no dprefclk. It is fixed by exiting idle optimization before the attempt to access PHY. Reviewed-by: Nicholas Kazlauskas Acked-by: Alex Hung Signed-off-by: Leo Chen Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index 8d2460d06bced..80d4996dbe960 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -1794,10 +1794,13 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control(edp_link_with_sink, false); } /*resume from S3, no vbios posting, no need to power down again*/ + clk_mgr_exit_optimized_pwr_state(dc, dc->clk_mgr); + power_down_all_hw_blocks(dc); disable_vga_and_power_gate_all_controllers(dc); if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control(edp_link_with_sink, false); + clk_mgr_optimize_pwr_state(dc, dc->clk_mgr); } bios_set_scratch_acc_mode_change(dc->ctx->dc_bios, 1); } -- 2.40.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 28755C001B0 for ; Sun, 13 Aug 2023 15:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231863AbjHMPxi (ORCPT ); Sun, 13 Aug 2023 11:53:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232012AbjHMPwv (ORCPT ); Sun, 13 Aug 2023 11:52:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E097830CF; Sun, 13 Aug 2023 08:52:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C0044632E6; Sun, 13 Aug 2023 15:52:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D6AEC433C7; Sun, 13 Aug 2023 15:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691941949; bh=OzwJS32dqO5ec+C5kPHE2OkJ6RU9ruhQVtp7umfEOPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cd72vG3kGYLSvTe93X9bIelWVriYj8gZykQ2+3TqeyibhrLtic1X/RRlf7ww9j4JA 3jABpv1r1qyA6KpNTdWA/qWhT22kp4oTuvn7+uSbWNnlovnMDbkzEs+Zf1HkgnSSLA tzhPkTCE/Mz/sZkkN5mo7s/JdIOuMHdBBFkurVKSQZkA03+VFvCqUb83cckU1WS9Zv y2ZJYvSuQP/62ybLASIlFHz0vu6FCcAB5puu6bNSfVlpqZfLw+AmTMXF86MvzUqCt3 wP2xs7XYVcLz3/u9c3J9OKqJ83mG1AccR/cX4slchElb/aYkiLYicq3zmhz8gV6x2c C0wQsVnm3LMJw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Leo Chen , Nicholas Kazlauskas , 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@gmail.com, daniel@ffwll.ch, wenjing.liu@amd.com, Jun.Lei@amd.com, Charlene.Liu@amd.com, Jingwen.Zhu@amd.com, aric.cyr@amd.com, tony.tascioglu@amd.com, zhikai.zhai@amd.com, Iswara.Nagulendran@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.4 44/54] drm/amd/display: Exit idle optimizations before attempt to access PHY Date: Sun, 13 Aug 2023 11:49:23 -0400 Message-Id: <20230813154934.1067569-44-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813154934.1067569-1-sashal@kernel.org> References: <20230813154934.1067569-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.10 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Leo Chen [ Upstream commit de612738e9771bd66aeb20044486c457c512f684 ] [Why & How] DMUB may hang when powering down pixel clocks due to no dprefclk. It is fixed by exiting idle optimization before the attempt to access PHY. Reviewed-by: Nicholas Kazlauskas Acked-by: Alex Hung Signed-off-by: Leo Chen Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index 8d2460d06bced..80d4996dbe960 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -1794,10 +1794,13 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control(edp_link_with_sink, false); } /*resume from S3, no vbios posting, no need to power down again*/ + clk_mgr_exit_optimized_pwr_state(dc, dc->clk_mgr); + power_down_all_hw_blocks(dc); disable_vga_and_power_gate_all_controllers(dc); if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control(edp_link_with_sink, false); + clk_mgr_optimize_pwr_state(dc, dc->clk_mgr); } bios_set_scratch_acc_mode_change(dc->ctx->dc_bios, 1); } -- 2.40.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 98CA0C04A6A for ; Sun, 13 Aug 2023 15:52:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C5D3810E0A1; Sun, 13 Aug 2023 15:52:32 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7DF5D10E09F; Sun, 13 Aug 2023 15:52:30 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C3283632EC; Sun, 13 Aug 2023 15:52:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D6AEC433C7; Sun, 13 Aug 2023 15:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691941949; bh=OzwJS32dqO5ec+C5kPHE2OkJ6RU9ruhQVtp7umfEOPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cd72vG3kGYLSvTe93X9bIelWVriYj8gZykQ2+3TqeyibhrLtic1X/RRlf7ww9j4JA 3jABpv1r1qyA6KpNTdWA/qWhT22kp4oTuvn7+uSbWNnlovnMDbkzEs+Zf1HkgnSSLA tzhPkTCE/Mz/sZkkN5mo7s/JdIOuMHdBBFkurVKSQZkA03+VFvCqUb83cckU1WS9Zv y2ZJYvSuQP/62ybLASIlFHz0vu6FCcAB5puu6bNSfVlpqZfLw+AmTMXF86MvzUqCt3 wP2xs7XYVcLz3/u9c3J9OKqJ83mG1AccR/cX4slchElb/aYkiLYicq3zmhz8gV6x2c C0wQsVnm3LMJw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.4 44/54] drm/amd/display: Exit idle optimizations before attempt to access PHY Date: Sun, 13 Aug 2023 11:49:23 -0400 Message-Id: <20230813154934.1067569-44-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813154934.1067569-1-sashal@kernel.org> References: <20230813154934.1067569-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.10 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: Iswara.Nagulendran@amd.com, wenjing.liu@amd.com, dri-devel@lists.freedesktop.org, Jun.Lei@amd.com, Sasha Levin , Charlene.Liu@amd.com, Leo Chen , Rodrigo.Siqueira@amd.com, amd-gfx@lists.freedesktop.org, tony.tascioglu@amd.com, sunpeng.li@amd.com, Jingwen.Zhu@amd.com, Alex Hung , Daniel Wheeler , Xinhui.Pan@amd.com, Nicholas Kazlauskas , zhikai.zhai@amd.com, Alex Deucher , christian.koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Leo Chen [ Upstream commit de612738e9771bd66aeb20044486c457c512f684 ] [Why & How] DMUB may hang when powering down pixel clocks due to no dprefclk. It is fixed by exiting idle optimization before the attempt to access PHY. Reviewed-by: Nicholas Kazlauskas Acked-by: Alex Hung Signed-off-by: Leo Chen Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index 8d2460d06bced..80d4996dbe960 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -1794,10 +1794,13 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control(edp_link_with_sink, false); } /*resume from S3, no vbios posting, no need to power down again*/ + clk_mgr_exit_optimized_pwr_state(dc, dc->clk_mgr); + power_down_all_hw_blocks(dc); disable_vga_and_power_gate_all_controllers(dc); if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control(edp_link_with_sink, false); + clk_mgr_optimize_pwr_state(dc, dc->clk_mgr); } bios_set_scratch_acc_mode_change(dc->ctx->dc_bios, 1); } -- 2.40.1