FAILED: patch "[PATCH] drm/amd/display: fix wrong index used in" failed to apply to 6.2-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.2-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 <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.2.y
git checkout FETCH_HEAD
git cherry-pick -x 2fedafc7ef071979b07fe9e9ccb7af210b65da0e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023051357-entrap-factsheet-94c6@gregkh' --subject-prefix 'PATCH 6.2.y' HEAD^..
Possible dependencies:
2fedafc7ef07 ("drm/amd/display: fix wrong index used in dccg32_set_dpstreamclk")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 2fedafc7ef071979b07fe9e9ccb7af210b65da0e Mon Sep 17 00:00:00 2001
From: Hersen Wu <[email protected]>
Date: Thu, 9 Mar 2023 16:14:08 -0500
Subject: [PATCH] drm/amd/display: fix wrong index used in
dccg32_set_dpstreamclk
[Why & How]
When merging commit 9af611f29034 ("drm/amd/display: Fix DCN32 DPSTREAMCLK_CNTL programming"), index change was not picked up.
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c +1 -2
@@ -293,8 +293,7 @@ static void dccg32_set_dpstreamclk(dccg32_set_dtbclk_p_src (dccg, src, otg_inst);/* enabled to select one of the DTBCLKs for pipe */ -switch (otg_inst) - { +switch (dp_hpo_inst) {case 0 : REG_UPDATE_2(DPSTREAMCLK_CNTL, DPSTREAMCLK0_EN,