From patchwork Mon Mar 28 04:05:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenneng Li X-Patchwork-Id: 12793178 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C4E11C433F5 for ; Mon, 28 Mar 2022 05:17:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E45310EC29; Mon, 28 Mar 2022 05:17:28 +0000 (UTC) X-Greylist: delayed 303 seconds by postgrey-1.36 at gabe; Mon, 28 Mar 2022 05:17:26 UTC Received: from nksmu.kylinos.cn (mailgw.kylinos.cn [123.150.8.42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0BD7D10EC29; Mon, 28 Mar 2022 05:17:25 +0000 (UTC) X-UUID: fb30e82a4d7c424e9a44f7ee3c6f49f3-20220328 X-GW-Reason: 11101 X-Policy-Incident: 5pS25Lu25Lq66LaF6L+HNeS6uumcgOimgeWuoeaguA== X-Content-Feature: ica/max.line-size 167 audit/email.address 1 meta/cnt.alert 1 X-UUID: fb30e82a4d7c424e9a44f7ee3c6f49f3-20220328 Received: from cs2c.com.cn [(172.17.111.24)] by nksmu.kylinos.cn (envelope-from ) (Generic MTA) with ESMTP id 2131348658; Mon, 28 Mar 2022 12:05:18 +0800 X-ns-mid: postfix-62413430-3057013324 Received: from localhost.localdomain (unknown [172.20.108.41]) by cs2c.com.cn (NSMail) with ESMTPA id D30D23848676; Mon, 28 Mar 2022 04:06:07 +0000 (UTC) From: Zhenneng Li To: Alex Deucher Subject: [PATCH] drm/amdgpu: resolve s3 hang for r7340 Date: Mon, 28 Mar 2022 12:05:36 +0800 Message-Id: <20220328040536.4121797-1-lizhenneng@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jack Zhang , Lijo Lazar , Guchun Chen , David Airlie , Pan Xinhui , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, Sumit Semwal , linaro-mm-sig@lists.linaro.org, Zhenneng Li , dri-devel@lists.freedesktop.org, Kevin Wang , Evan Quan , =?utf-8?q?Christian_K=C3=B6nig?= , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is a workaround for s3 hang for r7340(amdgpu). When we test s3 with r7340 on arm64 platform, graphics card will hang up, the error message are as follows: Mar 4 01:14:11 greatwall-GW-XXXXXX-XXX kernel: [ 1.599374][ 7] [ T291] amdgpu 0000:02:00.0: fb0: amdgpudrmfb frame buffer device Mar 4 01:14:11 greatwall-GW-XXXXXX-XXX kernel: [ 1.612869][ 7] [ T291] [drm:amdgpu_device_ip_late_init [amdgpu]] *ERROR* late_init of IP block failed -22 Mar 4 01:14:11 greatwall-GW-XXXXXX-XXX kernel: [ 1.623392][ 7] [ T291] amdgpu 0000:02:00.0: amdgpu_device_ip_late_init failed Mar 4 01:14:11 greatwall-GW-XXXXXX-XXX kernel: [ 1.630696][ 7] [ T291] amdgpu 0000:02:00.0: Fatal error during GPU init Mar 4 01:14:11 greatwall-GW-XXXXXX-XXX kernel: [ 1.637477][ 7] [ T291] [drm] amdgpu: finishing device. Change-Id: I5048b3894c0ca9faf2f4847ddab61f9eb17b4823 Signed-off-by: Zhenneng Li --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 3987ecb24ef4..1eced991b5b2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2903,6 +2903,8 @@ static void amdgpu_device_delayed_init_work_handler(struct work_struct *work) container_of(work, struct amdgpu_device, delayed_init_work.work); int r; + mdelay(1); + r = amdgpu_ib_ring_tests(adev); if (r) DRM_ERROR("ib ring test failed (%d).\n", r);