On 2023-07-28 18:11, Mario Limonciello wrote: > 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> Harry > --- > 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 943959012d04..57230661132b 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 > @@ -1327,7 +1327,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; >