The patch below does not apply to the 6.1-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@vger.kernel.org.
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.1.y git checkout FETCH_HEAD git cherry-pick -x d62088ba314ecf098871874898ed760347d1fbd8 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023072121-vista-puma-0584@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
d62088ba314e ("drm/amd/display: Do not disable phantom pipes in driver") 2da3556c8650 ("drm/amd/display: Trigger DIO FIFO resync on commit streams for DCN32") 3e8d74cb128f ("drm/amd/display: Trigger DIO FIFO resync on commit streams") a2a0bdf1989c ("drm/amd/display: add dscclk instance offset check") bf224e00a9f5 ("drm/amd/display: Fix 4to1 MPC black screen with DPP RCO") 74fa4c81aadf ("drm/amd/display: Implement workaround for writing to OTG_PIXEL_RATE_DIV register") 3b214bb7185d ("drm/amd/display: fix k1 k2 divider programming for phantom streams") e383b12709e3 ("drm/amd/display: Move DCN314 DOMAIN power control to DMCUB") 368307cef69c ("drm/amd/display: Include virtual signal to set k1 and k2 values")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d62088ba314ecf098871874898ed760347d1fbd8 Mon Sep 17 00:00:00 2001 From: Saaem Rizvi syedsaaem.rizvi@amd.com Date: Tue, 30 May 2023 13:21:10 -0400 Subject: [PATCH] drm/amd/display: Do not disable phantom pipes in driver
[Why and How] We should not disable phantom pipes in this sequence, as this should be controlled by FW. Furthermore, the previous programming sequence would have enabled the phantom pipe in driver as well, causing corruption. This change should avoid this from occuring.
Cc: Mario Limonciello mario.limonciello@amd.com Cc: Alex Deucher alexander.deucher@amd.com Cc: stable@vger.kernel.org Acked-by: Stylon Wang stylon.wang@amd.com Signed-off-by: Saaem Rizvi syedsaaem.rizvi@amd.com Reviewed-by: Alvin Lee Alvin.Lee2@amd.com Tested-by: Daniel Wheeler daniel.wheeler@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com
diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c index 00f32ffe0079..e5bd76c6b1d3 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c @@ -1211,7 +1211,8 @@ void dcn32_resync_fifo_dccg_dio(struct dce_hwseq *hws, struct dc *dc, struct dc_ if (pipe->top_pipe || pipe->prev_odm_pipe) continue;
- if (pipe->stream && (pipe->stream->dpms_off || dc_is_virtual_signal(pipe->stream->signal))) { + if (pipe->stream && (pipe->stream->dpms_off || dc_is_virtual_signal(pipe->stream->signal)) + && pipe->stream->mall_stream_config.type != SUBVP_PHANTOM) { pipe->stream_res.tg->funcs->disable_crtc(pipe->stream_res.tg); reset_sync_context_for_pipe(dc, context, i); otg_disabled[i] = true;