From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5F60EB64DC for ; Fri, 21 Jul 2023 07:25:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229551AbjGUHZa (ORCPT ); Fri, 21 Jul 2023 03:25:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbjGUHZ1 (ORCPT ); Fri, 21 Jul 2023 03:25:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D855E189 for ; Fri, 21 Jul 2023 00:25:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6FB816112C for ; Fri, 21 Jul 2023 07:25:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55F55C433C8; Fri, 21 Jul 2023 07:25:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689924324; bh=5req2SJrQrncNqFRov/1CPsWsHm5N8MWQC6gIfyk0Tw=; h=Subject:To:Cc:From:Date:From; b=iV+qAsSOk7oGrFClraMhlIMva7nc5/wkA8dnBUeh+PDt7OVRHzgXmvUV/wS3+XUam 9pnKzrzjSeE8SKYE0ZOXnCH65QsN4eiGPQA2vjXg7gFO5otGNTlZYGwIBrCjbge9LH YBkQ2TxxEgRgje5T/fPthBrpB9Dd0vaErzJkv+xg= Subject: FAILED: patch "[PATCH] drm/amd/display: Do not disable phantom pipes in driver" failed to apply to 6.1-stable tree To: syedsaaem.rizvi@amd.com, Alvin.Lee2@amd.com, alexander.deucher@amd.com, daniel.wheeler@amd.com, mario.limonciello@amd.com, stylon.wang@amd.com Cc: From: Date: Fri, 21 Jul 2023 09:25:22 +0200 Message-ID: <2023072121-vista-puma-0584@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 . 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 # git commit -s git send-email --to '' --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 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 Cc: Alex Deucher Cc: stable@vger.kernel.org Acked-by: Stylon Wang Signed-off-by: Saaem Rizvi Reviewed-by: Alvin Lee Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher 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;