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 F3121C4332F for ; Tue, 7 Nov 2023 12:35:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235079AbjKGMf7 (ORCPT ); Tue, 7 Nov 2023 07:35:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234964AbjKGMfc (ORCPT ); Tue, 7 Nov 2023 07:35:32 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA7EA10F3; Tue, 7 Nov 2023 04:24:44 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9DEEC433C8; Tue, 7 Nov 2023 12:24:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699359884; bh=5n1YHjOipinAQSpJfGvIDHIhNO8xp3lHM3hN1IvtOqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aWXaAHp0Rm10/qyRVfABy4mY2waeFFHoDg6xGy1GWwr0S4+Ghu8WD/c8bSmoY6V0Q hXI8iOPKsEA1YG8BchWM3BpjU8L0t+qWmuoOiqqPmGg+DMyg3FVqimJbUM/a4KvCUo I1KDyDbPkQ1TTwRmwnYcCzUfAVTISy+l/m56htvzEvQmQrPBX6SQmcnQysTMA7FIBW Ty5zY+YQ3BuTFdzk30cs9gkWC6/pFBaqO5SnM3ufUuxgQHoM8DWMnrBWn03EfqphSi ugXgjzUn2UchiHFw+TnKKdG8Eesrn4BJ40jn1jtzfOJQSG4jozg1H7Pv3cPvH5WLM/ Y88/QSoJmLnZA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alvin Lee , Samson Tam , Stylon Wang , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, qingqing.zhuo@amd.com, wenjing.liu@amd.com, aurabindo.pillai@amd.com, syed.hassan@amd.com, nicholas.kazlauskas@amd.com, mwen@igalia.com, Wesley.Chalmers@amd.com, hamza.mahfooz@amd.com, moadhuri@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.5 05/37] drm/amd/display: Don't lock phantom pipe on disabling Date: Tue, 7 Nov 2023 07:21:16 -0500 Message-ID: <20231107122407.3760584-5-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107122407.3760584-1-sashal@kernel.org> References: <20231107122407.3760584-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.10 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alvin Lee [ Upstream commit cbb4c9bc55427774ca4d819933e1b5fa38a6fb44 ] [Description] - When disabling a phantom pipe, we first enable the phantom OTG so the double buffer update can successfully take place - However, want to avoid locking the phantom otherwise setting DPG_EN=1 for the phantom pipe is blocked (without this we could hit underflow due to phantom HUBP being blanked by default) Reviewed-by: Samson Tam Acked-by: Stylon Wang Signed-off-by: Alvin Lee Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c index 9834b75f1837b..79befa17bb037 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c @@ -111,7 +111,8 @@ void dcn10_lock_all_pipes(struct dc *dc, if (pipe_ctx->top_pipe || !pipe_ctx->stream || (!pipe_ctx->plane_state && !old_pipe_ctx->plane_state) || - !tg->funcs->is_tg_enabled(tg)) + !tg->funcs->is_tg_enabled(tg) || + pipe_ctx->stream->mall_stream_config.type == SUBVP_PHANTOM) continue; if (lock) -- 2.42.0