Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp435129imu; Wed, 12 Dec 2018 20:49:54 -0800 (PST) X-Google-Smtp-Source: AFSGD/VZYAe/4adrZsQlj9J65mMjinkl+s/oT4PBJsr5uVQi+rykvNuucgEHD/IenvauE62CxN+g X-Received: by 2002:a63:ff16:: with SMTP id k22mr20976832pgi.244.1544676594221; Wed, 12 Dec 2018 20:49:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544676594; cv=none; d=google.com; s=arc-20160816; b=SRAB3TOXMpCljjH+IE8JBYtsaSiaiPoBSYhx+6WI/cCJEEz29BXvg2UrXYD4GO7hYK DCbz6lM3+9smtoaPsDEP2TJ/5pBBaw/qzwsUSmD3h79Ymrg9VJCeEaTW1VBtR4Sr2Vw2 Crsixc2TlglH29AmoEM5kbMzhA92JHoYYL6qf3DBd4/a80i2JtbB9hy13eHcIjMHB8gN kc9hbXuTzzHJqYIaTiF092KJL02TGlRAdK25u14E2rqYZ+Qk4ErcOZFs7QQ3UPw1gjfu ejjr3LWaVBl2aCE6hStT3pWwgVo2q6Sf3ce3Uhvgdr7ylN8stMnrUOSFmd5D91aeuKUo dDsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OxpDPXKiLE/NCzCHTqi5PNXi2p3WcHVzQvev/6OuzoU=; b=uij0V+/QtdWFWj9IrOOZON3sMrSWKiQHpmNQDrAgyHkui0VAJ4WcVtd1xmjb+iA4Eh miLR5ybSl/9wZkybIdBK5B+7erFkq2vXqvRzcAZ38rMjANNJ2RA8mmJ2YVxVaxPfd26c VB7Fkp3ivZGMLgX5d+0RHHaEVY1fF3Tqe1KAR0+7AP/aK632Nqq3APvpMSkBKLpE3Yzw 5Iy+C7nVGGopr2+dynN1pTts6J/hEMugwX/6qEHq6yub0h9y7P6vkKNV56zo5FpVl2AQ zOPP2Xybh8x+g9plkkvrAlUf5ncqdrspBN0vfjSahqZqVRZtIbP6L6tbxAeTqgVg5/mD Ex7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pVe1+GwI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v10si672208plp.183.2018.12.12.20.49.17; Wed, 12 Dec 2018 20:49:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pVe1+GwI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728327AbeLMEaf (ORCPT + 99 others); Wed, 12 Dec 2018 23:30:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:43404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727115AbeLMEac (ORCPT ); Wed, 12 Dec 2018 23:30:32 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9D1D520672; Thu, 13 Dec 2018 04:30:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675432; bh=etABM3TpQz/jU13PH2ujZsfyUbj2elhKNS8p0o3uQ0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pVe1+GwIu3igcs5l66CmOYaRKJBCLJU1F9dncEORsJyFO72YmfivYhv0GnogxJ3eT MULdCNcQEsQzs0NKq2A0AdMqmJuSnBuju3BXDPZv+aR+NgGmU7ReU8tb182uodMVtv /nnChR7OkhmaSlkwib2AvDP8a9B314MWgwXuV2Ms= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: James Zhu , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 59/73] drm/amdgpu/vcn: Update vcn.cur_state during suspend Date: Wed, 12 Dec 2018 23:28:24 -0500 Message-Id: <20181213042838.75160-59-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: James Zhu [ Upstream commit 0a9b89b2e2e7b6d90f81ddc47e489be1043e01b1 ] Replace vcn_v1_0_stop with vcn_v1_0_set_powergating_state during suspend, to keep adev->vcn.cur_state update. It will fix VCN S3 hung issue. Signed-off-by: James Zhu Reviewed-by: Leo Liu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c index 072371ef5975..4f8f3bb21832 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c @@ -43,6 +43,7 @@ static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev); static void vcn_v1_0_set_jpeg_ring_funcs(struct amdgpu_device *adev); static void vcn_v1_0_set_irq_funcs(struct amdgpu_device *adev); static void vcn_v1_0_jpeg_ring_set_patch_ring(struct amdgpu_ring *ring, uint32_t ptr); +static int vcn_v1_0_set_powergating_state(void *handle, enum amd_powergating_state state); /** * vcn_v1_0_early_init - set function pointers @@ -216,7 +217,7 @@ static int vcn_v1_0_hw_fini(void *handle) struct amdgpu_ring *ring = &adev->vcn.ring_dec; if (RREG32_SOC15(VCN, 0, mmUVD_STATUS)) - vcn_v1_0_stop(adev); + vcn_v1_0_set_powergating_state(adev, AMD_PG_STATE_GATE); ring->ready = false; -- 2.19.1