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 4876335B943; Mon, 5 May 2025 22:44:54 +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=1746485094; cv=none; b=gSb3dfdlE6glHssZi9j9//CtJu2s2DSO47WI90GprMm3YR4igDskJzvVIdYFBTviYjObr77uvMWPf2t4tfQmE/VZSawAOts4oqdDQSdCkPRSNq4mBA1rFsbrf1N1g6VX7ro0SvWhBBttFD23Vs5s8l2FCi3LDsyMFoAFF9vcUwE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485094; c=relaxed/simple; bh=zZiauDy3ZQ0maEJ4+SVMQYd52KbHuDbXb/JLMalbTOg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SsBPsAM8AuYShK70jqZFFOX6BaSS0kuUq0Hufh/kR856AAZ80K+jTXMzgDtZfZQ4RZpcQb8tlQCnLB+MxYJHZu3FjFscTGPFnRr99FkOyTJERvK4wOtrsiY9nvsUxgBIw55JNSkdgShjxRLQ97hO+41DlyJqfbYUm4Xc1d1wVJM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hoW0+Gzx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hoW0+Gzx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF3F7C4CEED; Mon, 5 May 2025 22:44:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485094; bh=zZiauDy3ZQ0maEJ4+SVMQYd52KbHuDbXb/JLMalbTOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hoW0+GzxJJv5gfHM/ExckbAbEGpcEsN1fWsUUyMw5rDGdLEy2xS/m1GX/TSQUxWiG 2bjKOtgeD644iXge03BjcO7gCh6Cpd1VEX3YQoxWkU9rsznEJj9dbzRTx+HiviqF+j lXjhYZIo68MuvFkgIv1LKNQtxGDYu7zbAJZ106Mvfv0ceFqvvA0tQ08pRHE39b+32k TPDpqM8rcRzVgx93vXEOH92Qs+qT9yDYJQRolWUqv7HCT373IRKLtcPAsNA0Y7YmAL K1CMaFxZH3UElvT9SRcgFoe3VTZ3wk5TikW9cX1JFaq9NkvDKRF/x0dW9fcPG91xQd APcvX1xbmYzNw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Leon Huang , Robin Chen , Tom Chung , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, wenjing.liu@amd.com, zaeem.mohamed@amd.com, anthony.koo@amd.com, jerry.zuo@amd.com, Kaitlyn.Tse@amd.com, joshua.aberback@amd.com, alex.hung@amd.com, Sungjoon.Kim@amd.com, michael.strauss@amd.com, muyuan.yang@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.12 159/486] drm/amd/display: Fix incorrect DPCD configs while Replay/PSR switch Date: Mon, 5 May 2025 18:33:55 -0400 Message-Id: <20250505223922.2682012-159-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505223922.2682012-1-sashal@kernel.org> References: <20250505223922.2682012-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.26 Content-Transfer-Encoding: 8bit From: Leon Huang [ Upstream commit 0d9cabc8f591ea1cd97c071b853b75b155c13259 ] [Why] When switching between PSR/Replay, the DPCD config of previous mode is not cleared, resulting in unexpected behavior in TCON. [How] Initialize the DPCD in setup function Reviewed-by: Robin Chen Signed-off-by: Leon Huang Signed-off-by: Tom Chung Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- .../link/protocols/link_edp_panel_control.c | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c index 3aa05a2be6c09..fa642f4b88c2d 100644 --- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c @@ -674,6 +674,18 @@ bool edp_setup_psr(struct dc_link *link, if (!link) return false; + //Clear PSR cfg + memset(&psr_configuration, 0, sizeof(psr_configuration)); + dm_helpers_dp_write_dpcd( + link->ctx, + link, + DP_PSR_EN_CFG, + &psr_configuration.raw, + sizeof(psr_configuration.raw)); + + if (link->psr_settings.psr_version == DC_PSR_VERSION_UNSUPPORTED) + return false; + dc = link->ctx->dc; dmcu = dc->res_pool->dmcu; psr = dc->res_pool->psr; @@ -684,9 +696,6 @@ bool edp_setup_psr(struct dc_link *link, if (!dc_get_edp_link_panel_inst(dc, link, &panel_inst)) return false; - - memset(&psr_configuration, 0, sizeof(psr_configuration)); - psr_configuration.bits.ENABLE = 1; psr_configuration.bits.CRC_VERIFICATION = 1; psr_configuration.bits.FRAME_CAPTURE_INDICATION = @@ -950,6 +959,16 @@ bool edp_setup_replay(struct dc_link *link, const struct dc_stream_state *stream if (!link) return false; + //Clear Replay config + dm_helpers_dp_write_dpcd(link->ctx, link, + DP_SINK_PR_ENABLE_AND_CONFIGURATION, + (uint8_t *)&(replay_config.raw), sizeof(uint8_t)); + + if (!(link->replay_settings.config.replay_supported)) + return false; + + link->replay_settings.config.replay_error_status.raw = 0; + dc = link->ctx->dc; replay = dc->res_pool->replay; -- 2.39.5