From: Sasha Levin Date: Sat, 3 Feb 2024 13:58:35 +0000 (-0500) Subject: Drop drm-amd-display-initialize-all-the-dpm-level-s-stutt.patch X-Git-Tag: v6.1.77~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecc53ba2b1e0adadcde4a6d7c5df75979d851004;p=thirdparty%2Fkernel%2Fstable-queue.git Drop drm-amd-display-initialize-all-the-dpm-level-s-stutt.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.7/drm-amd-display-initialize-all-the-dpm-level-s-stutt.patch b/queue-6.7/drm-amd-display-initialize-all-the-dpm-level-s-stutt.patch deleted file mode 100644 index dd31f4e55b2..00000000000 --- a/queue-6.7/drm-amd-display-initialize-all-the-dpm-level-s-stutt.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 4c34201fcd7023afc05dff0c5c3883271b13ec96 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Dec 2023 06:24:58 -0700 -Subject: drm/amd/display: initialize all the dpm level's stutter latency - -From: Charlene Liu - -[ Upstream commit 885c71ad791c1709f668a37f701d33e6872a902f ] - -Fix issue when override level bigger than default. Levels 5, 6, and 7 -had zero stutter latency, this is because override level being -initialized after stutter latency inits. - -Tested-by: Daniel Wheeler -Reviewed-by: Syed Hassan -Reviewed-by: Allen Pan -Acked-by: Rodrigo Siqueira -Signed-off-by: Charlene Liu -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c -index bcc03b184e5e..9f84d17f4658 100644 ---- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c -+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c -@@ -341,6 +341,9 @@ void dml2_init_soc_states(struct dml2_context *dml2, const struct dc *in_dc, - break; - } - -+ if (dml2->config.bbox_overrides.clks_table.num_states) -+ p->in_states->num_states = dml2->config.bbox_overrides.clks_table.num_states; -+ - /* Override from passed values, if available */ - for (i = 0; i < p->in_states->num_states; i++) { - if (dml2->config.bbox_overrides.sr_exit_latency_us) { -@@ -397,7 +400,6 @@ void dml2_init_soc_states(struct dml2_context *dml2, const struct dc *in_dc, - } - /* Copy clocks tables entries, if available */ - if (dml2->config.bbox_overrides.clks_table.num_states) { -- p->in_states->num_states = dml2->config.bbox_overrides.clks_table.num_states; - - for (i = 0; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dcfclk_levels; i++) { - p->in_states->state_array[i].dcfclk_mhz = dml2->config.bbox_overrides.clks_table.clk_entries[i].dcfclk_mhz; --- -2.43.0 - diff --git a/queue-6.7/series b/queue-6.7/series index 6efb3088676..71a1868115f 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -170,7 +170,6 @@ drm-bridge-anx7625-fix-set-hpd-irq-detect-window-to-.patch drm-amd-display-fix-tiled-display-misalignment.patch f2fs-fix-write-pointers-on-zoned-device-after-roll-f.patch asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch -drm-amd-display-initialize-all-the-dpm-level-s-stutt.patch drm-amd-display-fix-mst-pbn-x.y-value-calculations.patch drm-amd-display-fix-disable_otg_wa-logic.patch drm-amd-display-fix-replay-desync-error-irq-handler.patch