This is a note to let you know that I've just added the patch titled drm/amd/display: Enable 2 to 1 ODM policy if supported to the 6.0-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-enable-2-to-1-odm-policy-if-supported.patch and it can be found in the queue-6.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 54fae65ff469a79fc0ca46f480c4e7fce50f3963 Mon Sep 17 00:00:00 2001 From: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx> Date: Tue, 20 Sep 2022 16:06:36 -0400 Subject: drm/amd/display: Enable 2 to 1 ODM policy if supported From: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx> commit 54fae65ff469a79fc0ca46f480c4e7fce50f3963 upstream. If the current configuration supports 2 to 1 ODM policy, let's also enable the windowed MPO feature. Reviewed-by: Aurabindo Pillai <aurabindo.pillai@xxxxxxx> Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Cc: stable@xxxxxxxxxxxxxxx # 6.0.x Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c @@ -1001,6 +1001,10 @@ void dcn32_init_hw(struct dc *dc) dc_dmub_srv_query_caps_cmd(dc->ctx->dmub_srv->dmub); dc->caps.dmub_caps.psr = dc->ctx->dmub_srv->dmub->feature_caps.psr; } + + /* Enable support for ODM and windowed MPO if policy flag is set */ + if (dc->debug.enable_single_display_2to1_odm_policy) + dc->config.enable_windowed_mpo_odm = true; } static int calc_mpc_flow_ctrl_cnt(const struct dc_stream_state *stream, Patches currently in stable-queue which might be from Rodrigo.Siqueira@xxxxxxx are queue-6.0/drm-amd-display-fix-watermark-calculation.patch queue-6.0/drm-amd-display-add-hubp-surface-flip-interrupt-handler.patch queue-6.0/drm-amd-display-fix-vblank-refcount-in-vrr-transition.patch queue-6.0/drm-amd-display-enable-2-to-1-odm-policy-if-supported.patch queue-6.0/drm-amd-display-zeromem-mypipe-heap-struct-before-using-it.patch