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 5A95DC433FE for ; Thu, 3 Feb 2022 20:32:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354737AbiBCUcw (ORCPT ); Thu, 3 Feb 2022 15:32:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354520AbiBCUbs (ORCPT ); Thu, 3 Feb 2022 15:31:48 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC0D9C0613F4; Thu, 3 Feb 2022 12:31:29 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 67972B835A5; Thu, 3 Feb 2022 20:31:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 309BCC340EB; Thu, 3 Feb 2022 20:31:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643920287; bh=lBHimcATICmd6RmV7TM8LZX1e4583VieU32x9Qnf21E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KTZk4nfl8ikUOseDCIB1sugGevulBMBfvegYM4jBniazmksQFVaaks3WpTeoqZAzo TQ9IXpNLIPglzSEi3T05vZOtTrZmwP9XRE4aAlFFJQCuu4tqbS7mRSI2jiKpz2kr8O PDMEhGn+z9PMVv1m0PBf2ZbH1Q9gj2711zI0Wx9njjsKkXnDI/54CvOQlDhTXP2pbM BQ8ICvlErb9oYDiGgm5AK17tYo0aFzgz51ZjWihT1yW/jRYNtEivv7DQL7brzafR7c wiTMkeQ2zv+tIWP2kgIFDMyzEL3xfBxMfr3pb1VhJB6Jar31LxJ+6fvPJxPFm4ZWA2 yu6MldNiTNrzg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhan Liu , Charlene Liu , 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@linux.ie, daniel@ffwll.ch, nikola.cornij@amd.com, Dmytro.Laktyushkin@amd.com, angus.wang@amd.com, Qingqing.Zhuo@amd.com, charles.sun@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.16 38/52] drm/amd/display: Correct MPC split policy for DCN301 Date: Thu, 3 Feb 2022 15:29:32 -0500 Message-Id: <20220203202947.2304-38-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203202947.2304-1-sashal@kernel.org> References: <20220203202947.2304-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhan Liu [ Upstream commit ac46d93235074a6c5d280d35771c23fd8620e7d9 ] [Why] DCN301 has seamless boot enabled. With MPC split enabled at the same time, system will hang. [How] Revert MPC split policy back to "MPC_SPLIT_AVOID". Since we have ODM combine enabled on DCN301, pipe split is not necessary here. Signed-off-by: Zhan Liu Reviewed-by: Charlene Liu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c index e472b729d8690..8af80bc05b364 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c @@ -686,7 +686,7 @@ static const struct dc_debug_options debug_defaults_drv = { .disable_clock_gate = true, .disable_pplib_clock_request = true, .disable_pplib_wm_range = true, - .pipe_split_policy = MPC_SPLIT_DYNAMIC, + .pipe_split_policy = MPC_SPLIT_AVOID, .force_single_disp_pipe_split = false, .disable_dcc = DCC_ENABLE, .vsr_support = true, -- 2.34.1