From a2492db9faef4275bf22b908f1e857ce1658f4ba Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 1 Feb 2024 14:06:41 -0500 Subject: [PATCH] Drop drm-amd-display-fixing-stream-allocation-regression.patch Signed-off-by: Sasha Levin --- ...-fixing-stream-allocation-regression.patch | 42 ------------------- queue-6.1/series | 1 - ...-fixing-stream-allocation-regression.patch | 42 ------------------- queue-6.6/series | 1 - ...-fixing-stream-allocation-regression.patch | 42 ------------------- queue-6.7/series | 1 - 6 files changed, 129 deletions(-) delete mode 100644 queue-6.1/drm-amd-display-fixing-stream-allocation-regression.patch delete mode 100644 queue-6.6/drm-amd-display-fixing-stream-allocation-regression.patch delete mode 100644 queue-6.7/drm-amd-display-fixing-stream-allocation-regression.patch diff --git a/queue-6.1/drm-amd-display-fixing-stream-allocation-regression.patch b/queue-6.1/drm-amd-display-fixing-stream-allocation-regression.patch deleted file mode 100644 index 26826d6613c..00000000000 --- a/queue-6.1/drm-amd-display-fixing-stream-allocation-regression.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0ef95ac2f8768cc7c5e056c86f3aaf3b94b262e5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Dec 2023 18:15:16 -0500 -Subject: drm/amd/display: Fixing stream allocation regression - -From: Relja Vojvodic - -[ Upstream commit 292c2116b2ae84c7e799ae340981e60551b18f5e ] - -For certain dual display configs that had one display using a 1080p -mode, the DPM level used to drive the configs regressed from DPM 0 to -DPM 3. This was caused by a missing check that should have only limited -the pipe segments on non-phantom pipes. This caused issues with detile -buffer allocation, which dissallow subvp from being used - -Tested-by: Daniel Wheeler -Reviewed-by: Dillon Varone -Reviewed-by: Martin Leung -Acked-by: Rodrigo Siqueira -Signed-off-by: Relja Vojvodic -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c -index fa3778849db1..5e0fcb80bf36 100644 ---- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c -+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c -@@ -216,7 +216,7 @@ bool dcn32_subvp_in_use(struct dc *dc, - for (i = 0; i < dc->res_pool->pipe_count; i++) { - struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i]; - -- if (pipe->stream && pipe->stream->mall_stream_config.type != SUBVP_NONE) -+ if (pipe->stream && pipe->stream->mall_stream_config.type != SUBVP_PHANTOM != SUBVP_NONE) - return true; - } - return false; --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 19319c4e7e6..7d8b4e86fe1 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -144,7 +144,6 @@ drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch clk-imx-clk-imx8qxp-fix-lvds-bypass-pixel-and-phy-cl.patch drm-amdgpu-fix-ecc-irq-enable-disable-unpaired.patch drm-amdgpu-let-kfd-sync-with-vm-fences.patch -drm-amd-display-fixing-stream-allocation-regression.patch drm-amdgpu-fix-fw-from-request_firmware-not-released.patch drm-amdgpu-drop-fence-check-in-to_amdgpu_amdkfd_fenc.patch drm-amdkfd-fix-iterator-used-outside-loop-in-kfd_add.patch diff --git a/queue-6.6/drm-amd-display-fixing-stream-allocation-regression.patch b/queue-6.6/drm-amd-display-fixing-stream-allocation-regression.patch deleted file mode 100644 index f3d9b88efab..00000000000 --- a/queue-6.6/drm-amd-display-fixing-stream-allocation-regression.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 491727afae5d6db2703829582ca96cc88dfe5d98 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Dec 2023 18:15:16 -0500 -Subject: drm/amd/display: Fixing stream allocation regression - -From: Relja Vojvodic - -[ Upstream commit 292c2116b2ae84c7e799ae340981e60551b18f5e ] - -For certain dual display configs that had one display using a 1080p -mode, the DPM level used to drive the configs regressed from DPM 0 to -DPM 3. This was caused by a missing check that should have only limited -the pipe segments on non-phantom pipes. This caused issues with detile -buffer allocation, which dissallow subvp from being used - -Tested-by: Daniel Wheeler -Reviewed-by: Dillon Varone -Reviewed-by: Martin Leung -Acked-by: Rodrigo Siqueira -Signed-off-by: Relja Vojvodic -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c -index 3ad2b48954e0..03bd05596d21 100644 ---- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c -+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c -@@ -190,7 +190,7 @@ bool dcn32_subvp_in_use(struct dc *dc, - for (i = 0; i < dc->res_pool->pipe_count; i++) { - struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i]; - -- if (pipe->stream && pipe->stream->mall_stream_config.type != SUBVP_NONE) -+ if (pipe->stream && pipe->stream->mall_stream_config.type != SUBVP_PHANTOM != SUBVP_NONE) - return true; - } - return false; --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 9482192243e..8c0d7ad2cfb 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -211,7 +211,6 @@ clk-imx-clk-imx8qxp-fix-lvds-bypass-pixel-and-phy-cl.patch drm-amdgpu-fix-ecc-irq-enable-disable-unpaired.patch drm-amd-display-fix-minor-issues-in-bw-allocation-ph.patch drm-amdgpu-let-kfd-sync-with-vm-fences.patch -drm-amd-display-fixing-stream-allocation-regression.patch re-revert-drm-amd-display-enable-replay-for-static-s.patch drm-amdgpu-fix-fw-from-request_firmware-not-released.patch drm-amdgpu-drop-fence-check-in-to_amdgpu_amdkfd_fenc.patch diff --git a/queue-6.7/drm-amd-display-fixing-stream-allocation-regression.patch b/queue-6.7/drm-amd-display-fixing-stream-allocation-regression.patch deleted file mode 100644 index 340aa0b1af6..00000000000 --- a/queue-6.7/drm-amd-display-fixing-stream-allocation-regression.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b38e0d92857109b81cfeaf2b03a7a34eff172c75 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Dec 2023 18:15:16 -0500 -Subject: drm/amd/display: Fixing stream allocation regression - -From: Relja Vojvodic - -[ Upstream commit 292c2116b2ae84c7e799ae340981e60551b18f5e ] - -For certain dual display configs that had one display using a 1080p -mode, the DPM level used to drive the configs regressed from DPM 0 to -DPM 3. This was caused by a missing check that should have only limited -the pipe segments on non-phantom pipes. This caused issues with detile -buffer allocation, which dissallow subvp from being used - -Tested-by: Daniel Wheeler -Reviewed-by: Dillon Varone -Reviewed-by: Martin Leung -Acked-by: Rodrigo Siqueira -Signed-off-by: Relja Vojvodic -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c -index bc5f0db23d0c..a9c45174abed 100644 ---- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c -+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c -@@ -290,7 +290,7 @@ static void override_det_for_subvp(struct dc *dc, struct dc_state *context, uint - for (i = 0; i < dc->res_pool->pipe_count; i++) { - struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i]; - -- if (pipe_ctx->stream && pipe_ctx->plane_state && pipe_ctx->stream->mall_stream_config.type != SUBVP_PHANTOM) { -+ if (pipe_ctx->stream && pipe_ctx->plane_state && pipe_ctx->stream->mall_stream_config.type != SUBVP_PHANTOM != SUBVP_PHANTOM) { - if (pipe_ctx->stream->timing.v_addressable == 1080 && pipe_ctx->stream->timing.h_addressable == 1920) { - if (pipe_segments[i] > 4) - pipe_segments[i] = 4; --- -2.43.0 - diff --git a/queue-6.7/series b/queue-6.7/series index cba82bbaf04..ccdef8fefd5 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -233,7 +233,6 @@ clk-imx-clk-imx8qxp-fix-lvds-bypass-pixel-and-phy-cl.patch drm-amdgpu-fix-ecc-irq-enable-disable-unpaired.patch drm-amd-display-fix-minor-issues-in-bw-allocation-ph.patch drm-amdgpu-let-kfd-sync-with-vm-fences.patch -drm-amd-display-fixing-stream-allocation-regression.patch re-revert-drm-amd-display-enable-replay-for-static-s.patch drm-amdgpu-fix-possible-null-dereference-in-amdgpu_r.patch drm-amdgpu-fix-variable-mca_funcs-dereferenced-befor.patch -- 2.47.3