Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1973564ybh; Tue, 14 Jul 2020 12:02:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxabExA2/foVKUAulMSPi2s3YNXs7AgvM2/5yYCjLw15IDFfBoMIJXJ8LVfUAKKDUqHWHSW X-Received: by 2002:a50:f385:: with SMTP id g5mr5754714edm.347.1594753340484; Tue, 14 Jul 2020 12:02:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753340; cv=none; d=google.com; s=arc-20160816; b=B65RyS3gvOhYZSTsiUb9w3h++TPqqGsY7FF3aW2Rq2Mm/S8YMFVxbokOVnsxy0XJLL mHUn5kETG6KMjGZUEOZBF8FBFU5Wt1/EcA3JCvsmY/M+1TsKJAYWBStKtZL/lfIZG1ie 16dk5ni1lRD+QoUACqmGvWHpTVk1RG9WrNW8Qg8Nidz49DiDVAx9Owvc+IRBHmQdOa3Z ijZzX4WWSL2KwRyZdV4RMPUv2UlV7vmoFlAHi87xdh2Ko8EoKFRsJbo+DYo335hhFK+S WlaBx4nuLbYdj2Wwg0tM+YDc6ERcvKInhk4TDUPWskSFwf9M4FYKU3RBhQk6PTFs8J/6 KBng== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3AG7sEL8/Wl79lJK/ow2Wxqmdeo/XM6IvcdFGJ0Qdt0=; b=uSAnZrSTIwu/mMxnMtPQvEaD8tFVo4SobFX2W2A+DN+luC/P1QWqQE6nv1+LZ1bl5U HoOrZ1OQ9xiPbDJe9LYQ8ZB+1BMEuFYt9RPvs4PMi+PMjiq/a+15YvQq1fR2YQycntPr gsDG1Hxgz11IsdMtjpV+tXS3ldPdCMOkGOYL43uXTBOxuXCyl7Exp1sHTaoByxWvyaak nvXIYxLQvEoQW46S/SF3o5xyGL97YJh2qv6W0jn7/PRw5qSahUHb10pnYaHBqYkTrq8a zVgsvDzmjMD9GAeynrK+LFnsMn/urin8N92xNkzGYa6FxYtXEpb4Q3pfyWMMbKWFR+3W TBSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="AXnB/ocp"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i2si6716312ejp.201.2020.07.14.12.01.55; Tue, 14 Jul 2020 12:02:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="AXnB/ocp"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731008AbgGNTBq (ORCPT + 99 others); Tue, 14 Jul 2020 15:01:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:57994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731124AbgGNS7W (ORCPT ); Tue, 14 Jul 2020 14:59:22 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F0E8122507; Tue, 14 Jul 2020 18:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753162; bh=Cu3BvAfYn5LTqrRnIppM+ink8n0nkxKYVSqNHITujiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AXnB/ocpExMJAa/IsdVmp1ImuXAkFAMndTreZcDBIVzsJiMqHtHZmVkGwaifmKoG1 mIHwd8aswo5rmjWu80HgGAsx6JxgnZ8Yec4eNr5uAFO6RckNUCbsdHGDJYwmRda/B8 0Ly/KJ6NoKLKCN+iyXvXfIT4IIQUpxi27E4EmL4Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Huang Rui , Alex Deucher Subject: [PATCH 5.7 143/166] drm/amdgpu: asd function needs to be unloaded in suspend phase Date: Tue, 14 Jul 2020 20:45:08 +0200 Message-Id: <20200714184122.672952668@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huang Rui commit 20303ec5d2165ee6344190274bc59118921f71d9 upstream. Unload ASD function in suspend phase. Signed-off-by: Huang Rui Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -1685,6 +1685,12 @@ static int psp_suspend(void *handle) return ret; } + ret = psp_asd_unload(psp); + if (ret) { + DRM_ERROR("Failed to unload asd\n"); + return ret; + } + ret = psp_ring_stop(psp, PSP_RING_TYPE__KM); if (ret) { DRM_ERROR("PSP ring stop failed\n");