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 B35ADC4167E for ; Tue, 12 Apr 2022 00:51:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245484AbiDLAyJ (ORCPT ); Mon, 11 Apr 2022 20:54:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244693AbiDLAvj (ORCPT ); Mon, 11 Apr 2022 20:51:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D699E31351; Mon, 11 Apr 2022 17:47:43 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 50A5E617FB; Tue, 12 Apr 2022 00:47:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15DC4C385A4; Tue, 12 Apr 2022 00:47:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724462; bh=wFGnyvPUfPpRd8B6IV0DhpyhkeIwbe+1CvpJcSfRKig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rn4uIyGP0wysxXYWYdEK0EgX8hwORVZghGptBzHvD2VR2+lOwOFA8UwUGdwOMVKFt cvmY9jH6T6PAkhQHAS7yeuhWEw4VZEQuSB56jSZPFDSeemwOiY+gLblz14DblZZDU9 onfBsFUS8xqJrqs0nbxkPl0kK7xtgCxaZmWP8R0PnvOsCABUwu91PCM0LslmLupitv qt+O1dg4rGAilO333NkcRXWtt0QpDEacO0iQlnvmn4fYTcC8gIxgWw/hdSoIsZ2mv2 pEO659r41CEQhxLjwqF9kMwZ26+fwn9wF6uUWpeV2DkLK6JVrCa2jjBV7N5MKXpd9q vI1Q+m1QvFyOQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tianci Yin , James Zhu , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, leo.liu@amd.com, andrey.grodzovsky@amd.com, ruijing.dong@amd.com, veerabadhran.gopalakrishnan@amd.com, PengJu.Zhou@amd.com, Bokun.Zhang@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.15 10/41] drm/amdgpu/vcn: improve vcn dpg stop procedure Date: Mon, 11 Apr 2022 20:46:22 -0400 Message-Id: <20220412004656.350101-10-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412004656.350101-1-sashal@kernel.org> References: <20220412004656.350101-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: Tianci Yin [ Upstream commit 6ea239adc2a712eb318f04f5c29b018ba65ea38a ] Prior to disabling dpg, VCN need unpausing dpg mode, or VCN will hang in S3 resuming. Reviewed-by: James Zhu Signed-off-by: Tianci Yin Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c index 3d18aab88b4e..a026b2eaec21 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c @@ -1508,8 +1508,11 @@ static int vcn_v3_0_start_sriov(struct amdgpu_device *adev) static int vcn_v3_0_stop_dpg_mode(struct amdgpu_device *adev, int inst_idx) { + struct dpg_pause_state state = {.fw_based = VCN_DPG_STATE__UNPAUSE}; uint32_t tmp; + vcn_v3_0_pause_dpg_mode(adev, 0, &state); + /* Wait for power status to be 1 */ SOC15_WAIT_ON_RREG(VCN, inst_idx, mmUVD_POWER_STATUS, 1, UVD_POWER_STATUS__UVD_POWER_STATUS_MASK); -- 2.35.1