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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F30A1C43381 for ; Sat, 30 Mar 2019 01:41:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BAED8217F5 for ; Sat, 30 Mar 2019 01:41:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553910092; bh=BJUL/fC5NXpEvSqYmaHLYBsDsUSf9XCm3DWQQw8Kd9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FhB36Ctv5LbhgaTLpsiHn4+Thgf/0vw7HdlR70FJjDSfdTW2xTDn2AoHx0GoFPlMk twPMobfrUt+Dw9ISy52B/6mPYx0JR9trXFMZKiPJx7COBqHRsNvGFtNWxn166Q+CQY 50ITuL4kqOU9m0xBrN6LYjJnaLeXBh7zhPPyh+oE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730573AbfC3B2t (ORCPT ); Fri, 29 Mar 2019 21:28:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:35408 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730539AbfC3B2t (ORCPT ); Fri, 29 Mar 2019 21:28:49 -0400 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 F2B42217F5; Sat, 30 Mar 2019 01:28:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553909328; bh=BJUL/fC5NXpEvSqYmaHLYBsDsUSf9XCm3DWQQw8Kd9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z9ExKVPTZE7GlkhKogFNH1r5YsjxtY+OJ3A5/5xRpbLL4Lt5NfyM3n7R3BqbAEO/s qsCf8Ga1BJpRjfLtPlYZ3jNr0RlteUZM9O4QX61sA82itXzh+rLqZigiJR0P7d9rKi KB5Yp04ZxKZABBeIQTcz15arKF8BYC5vMQ9DwzuE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: wentalou , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.0 04/25] drm/amdgpu: psp_ring_destroy cause psp->km_ring.ring_mem NULL Date: Fri, 29 Mar 2019 21:28:21 -0400 Message-Id: <20190330012842.32091-4-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330012842.32091-1-sashal@kernel.org> References: <20190330012842.32091-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: wentalou [ Upstream commit 14d20ec7f31ef96a2e7dcf7880b13dde1d473b56 ] psp_ring_destroy inside psp_load_fw cause psp->km_ring.ring_mem NULL. Call Trace occurred when psp_cmd_submit. should be psp_ring_stop instead. Reviewed-by: Xiangliang Yu Signed-off-by: Wentao Lou Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 3a9b48b227ac..a7208ca0bfe3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -546,7 +546,7 @@ static int psp_load_fw(struct amdgpu_device *adev) struct psp_context *psp = &adev->psp; if (amdgpu_sriov_vf(adev) && adev->in_gpu_reset) { - psp_ring_destroy(psp, PSP_RING_TYPE__KM); + psp_ring_stop(psp, PSP_RING_TYPE__KM); /* should not destroy ring, only stop */ goto skip_memalloc; } -- 2.19.1