This is a note to let you know that I've just added the patch titled
drm/amd/display: Fix a regression on Polaris cards
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-fix-a-regression-on-polaris-cards.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 3bb575572bf498a9d39e9d1ca5c06cc3152928a1 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@xxxxxxx>
Date: Fri, 28 Jul 2023 17:04:01 -0500
Subject: drm/amd/display: Fix a regression on Polaris cards
From: Mario Limonciello <mario.limonciello@xxxxxxx>
commit 3bb575572bf498a9d39e9d1ca5c06cc3152928a1 upstream.
DCE products don't define a `remove_stream_from_ctx` like DCN ones
do. This means that when compute_mst_dsc_configs_for_state() is called
it always returns -EINVAL which causes MST to fail to setup.
Cc: stable@xxxxxxxxxxxxxxx # 6.4.y
Cc: Harry Wentland <Harry.Wentland@xxxxxxx>
Reported-by: Klaus.Kusche@xxxxxxxxxxxxxxx
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/2671
Fixes: efa4c4df864e ("drm/amd/display: call remove_stream_from_ctx from res_pool funcs")
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
Reviewed-by: Harry Wentland <harry.wentland@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 9bc86deac9e8..b885c39bd16b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -1320,7 +1320,7 @@ int compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,
if (computed_streams[i])
continue;
- if (!res_pool->funcs->remove_stream_from_ctx ||
+ if (res_pool->funcs->remove_stream_from_ctx &&
res_pool->funcs->remove_stream_from_ctx(stream->ctx->dc, dc_state, stream) != DC_OK)
return -EINVAL;
--
2.41.0
Patches currently in stable-queue which might be from mario.limonciello@xxxxxxx are
queue-6.4/drm-amd-disable-s-g-for-apus-when-64gb-or-more-host-memory.patch
queue-6.4/tpm-disable-rng-for-all-amd-ftpms.patch
queue-6.4/drm-amd-display-fix-a-regression-on-polaris-cards.patch
queue-6.4/tpm-add-a-helper-for-checking-hwrng-enabled.patch
