From: Greg Kroah-Hartman Date: Sat, 3 Feb 2024 01:31:08 +0000 (-0800) Subject: 6.7-stable patches X-Git-Tag: v6.1.77~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f0088559b38f299b405d327b0e9444edd276a38;p=thirdparty%2Fkernel%2Fstable-queue.git 6.7-stable patches added patches: drm-msm-dsi-enable-runtime-pm.patch revert-drm-amd-display-disable-psr-su-on-parade-0803-tcon-again.patch --- diff --git a/queue-6.7/drm-msm-dsi-enable-runtime-pm.patch b/queue-6.7/drm-msm-dsi-enable-runtime-pm.patch new file mode 100644 index 00000000000..bcfbbc8c1bf --- /dev/null +++ b/queue-6.7/drm-msm-dsi-enable-runtime-pm.patch @@ -0,0 +1,36 @@ +From 6ab502bc1cf3147ea1d8540d04b83a7a4cb6d1f1 Mon Sep 17 00:00:00 2001 +From: Konrad Dybcio +Date: Tue, 20 Jun 2023 13:43:21 +0200 +Subject: drm/msm/dsi: Enable runtime PM + +From: Konrad Dybcio + +commit 6ab502bc1cf3147ea1d8540d04b83a7a4cb6d1f1 upstream. + +Some devices power the DSI PHY/PLL through a power rail that we model +as a GENPD. Enable runtime PM to make it suspendable. + +Signed-off-by: Konrad Dybcio +Reviewed-by: Dmitry Baryshkov +Patchwork: https://patchwork.freedesktop.org/patch/543352/ +Link: https://lore.kernel.org/r/20230620-topic-dsiphy_rpm-v2-2-a11a751f34f0@linaro.org +Signed-off-by: Dmitry Baryshkov +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c ++++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +@@ -691,6 +691,10 @@ static int dsi_phy_driver_probe(struct p + return dev_err_probe(dev, PTR_ERR(phy->ahb_clk), + "Unable to get ahb clk\n"); + ++ ret = devm_pm_runtime_enable(&pdev->dev); ++ if (ret) ++ return ret; ++ + /* PLL init will call into clk_register which requires + * register access, so we need to enable power and ahb clock. + */ diff --git a/queue-6.7/revert-drm-amd-display-disable-psr-su-on-parade-0803-tcon-again.patch b/queue-6.7/revert-drm-amd-display-disable-psr-su-on-parade-0803-tcon-again.patch new file mode 100644 index 00000000000..0fc1504f1b0 --- /dev/null +++ b/queue-6.7/revert-drm-amd-display-disable-psr-su-on-parade-0803-tcon-again.patch @@ -0,0 +1,33 @@ +From stable+bounces-17643-greg=kroah.com@vger.kernel.org Thu Feb 1 18:05:14 2024 +From: Jonathan Gray +Date: Fri, 2 Feb 2024 13:05:05 +1100 +Subject: Revert "drm/amd/display: Disable PSR-SU on Parade 0803 TCON again" +To: gregkh@linuxfoundation.org +Cc: mario.limonciello@amd.com, stable@vger.kernel.org +Message-ID: <20240202020505.22536-1-jsg@jsg.id.au> + +From: Jonathan Gray + +This reverts commit f015d8b6405d950f30826b4d8d9e1084dd9ea2a4. + +duplicated a change made in 6.7 +e7ab758741672acb21c5d841a9f0309d30e48a06 + +Cc: stable@vger.kernel.org # 6.7 +Signed-off-by: Jonathan Gray +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/modules/power/power_helpers.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/gpu/drm/amd/display/modules/power/power_helpers.c ++++ b/drivers/gpu/drm/amd/display/modules/power/power_helpers.c +@@ -841,8 +841,6 @@ bool is_psr_su_specific_panel(struct dc_ + isPSRSUSupported = false; + else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x03) + isPSRSUSupported = false; +- else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x03) +- isPSRSUSupported = false; + else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1) + isPSRSUSupported = true; + } diff --git a/queue-6.7/series b/queue-6.7/series index a8fe2abee1f..852515dcb1a 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -348,3 +348,5 @@ selftests-net-enable-some-more-knobs.patch idpf-avoid-compiler-padding-in-virtchnl2_ptype-struc.patch arm64-irq-set-the-correct-node-for-shadow-call-stack.patch mm-kmsan-fix-infinite-recursion-due-to-rcu-critical-section.patch +revert-drm-amd-display-disable-psr-su-on-parade-0803-tcon-again.patch +drm-msm-dsi-enable-runtime-pm.patch