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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 31E4EC3F6B0 for ; Thu, 25 Aug 2022 01:42:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B5D9CD0FFE; Thu, 25 Aug 2022 01:39:54 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id B7762D0E4E; Thu, 25 Aug 2022 01:39:42 +0000 (UTC) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 3F90F61AF0; Thu, 25 Aug 2022 01:39:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 194D2C433C1; Thu, 25 Aug 2022 01:39:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661391581; bh=ah5x5jgephnNd5chcwZN7FZrAqXh64ZcpPIpiGDYmXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G8EJcn2tR3nMUi/x1gqmSa/jeml5cH5j5yec6I0a+7j1dPp8GhAMEcWW1pNMNCfpD Pt/124aSsCgF/KPQBjO693qO2L13O96KM2Ni6CmL5qQfNcooEi6U7ycUPsJFgYP/de GJ2XNbSOqr7zaFpLourqeYXtbxu90hcApTdvQ4bgubkINEYTB49C2Ec+ag1UMOVhYR qkOu2ev2LYXO/jFtRX1MsinpiTHStPxD5p9VHLJfS7ASsGEj8EDHtD16Pycyri9mj1 ZB+icQ1Mbrez+ium7nYFtNIZ/t6QFe6HxRVEWLVDYCjfamNxBWD3gEF+ZWHMdek3hH 19OxqbTRsdyLg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 2/8] drm/amd/display: clear optc underflow before turn off odm clock Date: Wed, 24 Aug 2022 21:39:21 -0400 Message-Id: <20220825013932.23467-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220825013932.23467-1-sashal@kernel.org> References: <20220825013932.23467-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fudong Wang , Sasha Levin , Anson.Jacob@amd.com, Tom Chung , Charlene.Liu@amd.com, sunpeng.li@amd.com, dri-devel@lists.freedesktop.org, Xinhui.Pan@amd.com, Rodrigo.Siqueira@amd.com, amd-gfx@lists.freedesktop.org, airlied@linux.ie, Daniel Wheeler , Alvin Lee , daniel@ffwll.ch, Alex Deucher , isabbasso@riseup.net, harry.wentland@amd.com, christian.koenig@amd.com, oliver.logush@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Fudong Wang [ Upstream commit b2a93490201300a749ad261b5c5d05cb50179c44 ] [Why] After ODM clock off, optc underflow bit will be kept there always and clear not work. We need to clear that before clock off. [How] Clear that if have when clock off. Reviewed-by: Alvin Lee Acked-by: Tom Chung Signed-off-by: Fudong Wang Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c index e74a07d03fde..4b0200e96eb7 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c @@ -425,6 +425,11 @@ void optc1_enable_optc_clock(struct timing_generator *optc, bool enable) OTG_CLOCK_ON, 1, 1, 1000); } else { + + //last chance to clear underflow, otherwise, it will always there due to clock is off. + if (optc->funcs->is_optc_underflow_occurred(optc) == true) + optc->funcs->clear_optc_underflow(optc); + REG_UPDATE_2(OTG_CLOCK_CONTROL, OTG_CLOCK_GATE_DIS, 0, OTG_CLOCK_EN, 0); -- 2.35.1