The patch below does not apply to the 6.7-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.7.y git checkout FETCH_HEAD git cherry-pick -x efae5a9eb47b76d5f84c0a0ca2ec95c9ce8a393c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024012704-squad-turf-1dae@gregkh' --subject-prefix 'PATCH 6.7.y' HEAD^.. Possible dependencies: efae5a9eb47b ("drm/amd/display: pbn_div need be updated for hotplug event") 191dc43935d1 ("drm/dp_mst: Store the MST PBN divider value in fixed point format") 4e0837a8d00a ("drm/i915/dp_mst: Account for FEC and DSC overhead during BW allocation") 7ff2090c7c98 ("drm/i915/dp: Pass actual BW overhead to m_n calculation") d91680efcaab ("drm/i915/dp_mst: Enable FEC early once it's known DSC is needed") 7707dd602259 ("drm/dp_mst: Fix fractional DSC bpp handling") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From efae5a9eb47b76d5f84c0a0ca2ec95c9ce8a393c Mon Sep 17 00:00:00 2001 From: Wayne Lin <wayne.lin@xxxxxxx> Date: Mon, 4 Dec 2023 10:09:33 +0800 Subject: [PATCH] drm/amd/display: pbn_div need be updated for hotplug event link_rate sometime will be changed when DP MST connector hotplug, so pbn_div also need be updated; otherwise, it will mismatch with link_rate, causes no output in external monitor. Cc: stable@xxxxxxxxxxxxxxx Tested-by: Daniel Wheeler <daniel.wheeler@xxxxxxx> Reviewed-by: Jerry Zuo <jerry.zuo@xxxxxxx> Acked-by: Rodrigo Siqueira <rodrigo.siqueira@xxxxxxx> Signed-off-by: Wade Wang <wade.wang@xxxxxx> Signed-off-by: Wayne Lin <wayne.lin@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index ddde330860fc..a144024df97c 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7005,8 +7005,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, if (IS_ERR(mst_state)) return PTR_ERR(mst_state); - if (!mst_state->pbn_div.full) - mst_state->pbn_div.full = dfixed_const(dm_mst_get_pbn_divider(aconnector->mst_root->dc_link)); + mst_state->pbn_div.full = dfixed_const(dm_mst_get_pbn_divider(aconnector->mst_root->dc_link)); if (!state->duplicated) { int max_bpc = conn_state->max_requested_bpc;
