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 76493C3F6B0 for ; Thu, 25 Aug 2022 01:41:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234584AbiHYBls (ORCPT ); Wed, 24 Aug 2022 21:41:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234910AbiHYBkn (ORCPT ); Wed, 24 Aug 2022 21:40:43 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46D0F97D74; Wed, 24 Aug 2022 18:38:23 -0700 (PDT) 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 5E869B826E2; Thu, 25 Aug 2022 01:38:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 517DAC433C1; Thu, 25 Aug 2022 01:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661391496; bh=v//aYBIXdkaUXOOcZU1q5cqml+QXhb56k97mh7RFJQk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l4baqSFL0+c/HT/egU5bmfkSYAvhp/RPPG34Dv7TYxz6J5lOAXZZRVvRDlM5Zoh2E syPYMH84yh+p7RhpCxg7aGzauGWtPW970AV5HjeyVLpu3FEteIv6Z7gFaseqo0Y4RY h4WkHpXMTsHNYG52fOebxyxAYvlNZr2wnItj9dzE3Pidd+Zpux/XGobjWmWlnZGsS4 Wu5Z5d85fIJNPYnZDyeaMHNHl7/YT9goy19sPXC09PB613mI/b/6u3/wo6l18QBGUh YeY/SyAgkxdftIa53jrcW/QQFxAO1Hev20AaHV+GW79rvAltpLMu3FIG90YeeKtNdG mcKf1awKnStHA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Charlene Liu , Martin Leung , Brian Chang , 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@linux.ie, daniel@ffwll.ch, isabbasso@riseup.net, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.15 14/20] drm/amd/display: avoid doing vm_init multiple time Date: Wed, 24 Aug 2022 21:37:06 -0400 Message-Id: <20220825013713.22656-14-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220825013713.22656-1-sashal@kernel.org> References: <20220825013713.22656-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: Charlene Liu [ Upstream commit 5544a7b5a07480192eb5fd3536462faed2c21528 ] [why] this is to ensure that driver will not reprogram hvm_prefetch_req again if it is done. Reviewed-by: Martin Leung Acked-by: Brian Chang Signed-off-by: Charlene Liu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c index 36044cb8ec83..1c0f56d8ba8b 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c @@ -67,9 +67,15 @@ static uint32_t convert_and_clamp( void dcn21_dchvm_init(struct hubbub *hubbub) { struct dcn20_hubbub *hubbub1 = TO_DCN20_HUBBUB(hubbub); - uint32_t riommu_active; + uint32_t riommu_active, prefetch_done; int i; + REG_GET(DCHVM_RIOMMU_STAT0, HOSTVM_PREFETCH_DONE, &prefetch_done); + + if (prefetch_done) { + hubbub->riommu_active = true; + return; + } //Init DCHVM block REG_UPDATE(DCHVM_CTRL0, HOSTVM_INIT_REQ, 1); -- 2.35.1