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 B885414EC63; Wed, 27 Mar 2024 12:14:16 +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=1711541656; cv=none; b=CFJDj5CPyWMRa4WbRRCdoB0kSpuasNDbjYbBe7QPJxdrvkKPdYQBZB30hrZwU2RY4V0j+k4osHbT3xj19R7PMg5FMfH631H+LYcNX67otUBLtYgebU92wZWeaRs1m3+yA2/QXFDgT+GngKx18+p/1XDIn1kf/zrhFjIdTHRndW4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541656; c=relaxed/simple; bh=co6eA60/asv34hTCnN1EBfrpQKj8gLKrwPLdy/808QQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=POv9C8MT02zKTYAVaPlfvDpa8ve5gk8Rv/2jhfd08OnNcaB9o3rgKgZx9fVmPn93pnf2LcuZ+sZrojFa5cnxlThp9AgqqOJnBdgc3DkOLy9eP7wiUOziHXRGFJx6PTGTpucvpPNXZITkK4vW2ycGL+kuNSU8p9omp9l99SPeMJU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H1J7Ai88; 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="H1J7Ai88" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6175AC433C7; Wed, 27 Mar 2024 12:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541656; bh=co6eA60/asv34hTCnN1EBfrpQKj8gLKrwPLdy/808QQ=; h=From:To:Cc:Subject:Date:From; b=H1J7Ai88mKw/S/mYDkUBZ4XHpZYkLHq7wThfV1N+gr1df6XRq+f2PEpeKdDFG80NJ daHxs3A62pbfPVcUzOaAj/tGWGjECcmWxqGBTuHelGros3/e1pFY3raeF5voeW0iNH 3DuFXbvFI22Er/36FtIAF2W2Yj4PJxqlbVaWkbe2IJxvwrP35jbMVBAxyQ++7YBg92 6k8Hc7NX54GFHuyiZjYjZqKZ8hgZQTLh6qfdrcZMOX/+rAwo+nRw2DDLwF3TqvvPUD HgpYVO1MQmwrwX3yiXkpMsReQmaarfTDgukeEuepHF8M3pE7d5fVTZElMnni50EExe bWP61d3T49qGg== From: Sasha Levin To: stable@vger.kernel.org, gabe.teeger@amd.com Cc: Mario Limonciello , Alex Deucher , Ovidiu Bunea , Aurabindo Pillai , Daniel Wheeler , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "Revert "drm/amd/display: Send DTBCLK disable message on first commit"" failed to apply to 6.1-stable tree Date: Wed, 27 Mar 2024 08:14:14 -0400 Message-ID: <20240327121414.2830958-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 3a6a32b31a111f6e66526fb2d3cb13a876465076 Mon Sep 17 00:00:00 2001 From: Gabe Teeger Date: Mon, 29 Jan 2024 13:31:44 -0500 Subject: [PATCH] Revert "drm/amd/display: Send DTBCLK disable message on first commit" This reverts commit f341055b10bd8be55c3c995dff5f770b236b8ca9. System hang observed, this commit is thought to be the regression point. Cc: Mario Limonciello Cc: Alex Deucher Cc: stable@vger.kernel.org Reviewed-by: Ovidiu Bunea Acked-by: Aurabindo Pillai Signed-off-by: Gabe Teeger Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c index 06edca50a8fa1..36e5bb611fb10 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c @@ -414,7 +414,6 @@ static void init_clk_states(struct clk_mgr *clk_mgr) uint32_t ref_dtbclk = clk_mgr->clks.ref_dtbclk_khz; memset(&(clk_mgr->clks), 0, sizeof(struct dc_clocks)); - clk_mgr->clks.dtbclk_en = true; clk_mgr->clks.ref_dtbclk_khz = ref_dtbclk; // restore ref_dtbclk clk_mgr->clks.p_state_change_support = true; clk_mgr->clks.prev_p_state_change_support = true; -- 2.43.0