From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 116/167] drm/amdgpu: fix ring test failure issue during s3 in vce 3.0 (V2) Date: Tue, 3 Sep 2019 12:24:28 -0400 Message-ID: <20190903162519.7136-116-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190903162519.7136-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Louis Li RnJvbTogTG91aXMgTGkgPENoaW5nLXNoaWguTGlAYW1kLmNvbT4KClsgVXBzdHJlYW0gY29tbWl0 IGNlMGUyMmY1ZDg4NmQxYjU2YzdhYjQzNDdjNDViOWFjNWZjYzA1OGQgXQoKW1doYXRdCnZjZSBy aW5nIHRlc3QgZmFpbHMgY29uc2lzdGVudGx5IGR1cmluZyByZXN1bWUgaW4gczMgY3ljbGUsIGR1 ZSB0bwptaXNtYXRjaCByZWFkICYgd3JpdGUgcG9pbnRlcnMuCk9uIGRlYnVnL2FuYWx5c2lzIGl0 cyBmb3VuZCB0aGF0IHJwdHIgdG8gYmUgY29tcGFyZWQgaXMgbm90IGJlaW5nCmNvcnJlY3RseSB1 cGRhdGVkL3JlYWQsIHdoaWNoIGxlYWRzIHRvIHRoaXMgZmFpbHVyZS4KQmVsb3cgaXMgdGhlIGZh aWx1cmUgc2lnbmF0dXJlOgoJW2RybTphbWRncHVfdmNlX3JpbmdfdGVzdF9yaW5nXSAqRVJST1Iq IGFtZGdwdTogcmluZyAxMiB0ZXN0IGZhaWxlZAoJW2RybTphbWRncHVfZGV2aWNlX2lwX3Jlc3Vt ZV9waGFzZTJdICpFUlJPUiogcmVzdW1lIG9mIElQIGJsb2NrIDx2Y2VfdjNfMD4gZmFpbGVkIC0x MTAKCVtkcm06YW1kZ3B1X2RldmljZV9yZXN1bWVdICpFUlJPUiogYW1kZ3B1X2RldmljZV9pcF9y ZXN1bWUgZmFpbGVkICgtMTEwKS4KCltIb3ddCmZldGNoIHJwdHIgYXBwcm9wcmlhdGVseSwgbWVh bmluZyBtb3ZlIGl0cyByZWFkIGxvY2F0aW9uIGZ1cnRoZXIgZG93bgppbiB0aGUgY29kZSBmbG93 LgpXaXRoIHRoaXMgcGF0Y2ggYXBwbGllZCB0aGUgczMgZmFpbHVyZSBpcyBubyBtb3JlIHNlZW4g Zm9yID41ayBzMyBjeWNsZXMsCndoaWNoIG90aGVyd2lzZSBpcyBwcmV0dHkgY29uc2lzdGVudC4K ClYyOiByZW1vdmUgcmVkdW50YW50IGZldGNoIG9mIHJwdHIKClNpZ25lZC1vZmYtYnk6IExvdWlz IExpIDxDaGluZy1zaGloLkxpQGFtZC5jb20+ClJldmlld2VkLWJ5OiBDaHJpc3RpYW4gS8O2bmln IDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8 YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKU2ln bmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y2UuYyB8IDUgKysrKy0KIDEgZmlsZSBjaGFuZ2Vk LCA0IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfdmNlLmMKaW5kZXggNWYzZjU0MDczODE4Ny4uMTc4NjJiOWVjY2NkNyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZjZS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y2UuYwpAQCAtMTA3MCw3ICsxMDcwLDcgQEAg dm9pZCBhbWRncHVfdmNlX3JpbmdfZW1pdF9mZW5jZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcs IHU2NCBhZGRyLCB1NjQgc2VxLAogaW50IGFtZGdwdV92Y2VfcmluZ190ZXN0X3Jpbmcoc3RydWN0 IGFtZGdwdV9yaW5nICpyaW5nKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcmlu Zy0+YWRldjsKLQl1aW50MzJfdCBycHRyID0gYW1kZ3B1X3JpbmdfZ2V0X3JwdHIocmluZyk7CisJ dWludDMyX3QgcnB0cjsKIAl1bnNpZ25lZCBpOwogCWludCByLCB0aW1lb3V0ID0gYWRldi0+dXNl Y190aW1lb3V0OwogCkBAIC0xMDg0LDYgKzEwODQsOSBAQCBpbnQgYW1kZ3B1X3ZjZV9yaW5nX3Rl c3RfcmluZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJCQkgIHJpbmctPmlkeCwgcik7CiAJ CXJldHVybiByOwogCX0KKworCXJwdHIgPSBhbWRncHVfcmluZ19nZXRfcnB0cihyaW5nKTsKKwog CWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIFZDRV9DTURfRU5EKTsKIAlhbWRncHVfcmluZ19jb21t aXQocmluZyk7CiAKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9h bWQtZ2Z4 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 D3795C3A5A2 for ; Tue, 3 Sep 2019 16:31:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAF0023431 for ; Tue, 3 Sep 2019 16:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528270; bh=ACuq4WuBRpCSB7xWkWBjA44XlYiLFHErnApYBjTmmtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GF2ZuYxPAQ+eDNzZGNKsH1VyeA2wNATXBkwVYR9hP2nFq4RVSOR8y9sk+CdS6aXvg B1soOYWACRG4s3G2rAmwjx2CtQnpT4KBWLcQyWjCZP8M4PkOhM4ElOCDgw6xip+nSr +/iFC0U+SOgC6DJz6yAhJVL7jjDOaXIgxd8pBaUo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730978AbfICQbJ (ORCPT ); Tue, 3 Sep 2019 12:31:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:50666 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729113AbfICQ2f (ORCPT ); Tue, 3 Sep 2019 12:28:35 -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 8CF67215EA; Tue, 3 Sep 2019 16:28:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528114; bh=ACuq4WuBRpCSB7xWkWBjA44XlYiLFHErnApYBjTmmtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ID2d7U4Y6rOhL0+LUOFqRSpqpqDr1lbGtgkM/FDga69pqsQkFJ9reWM3nuikfZqEi 1lcdpqdyGyxPuko4TEmRNJCpPRoNKJZXtBHT1zNGQF0NmzGxUllTIA7A0agvBUF9// zCwDD4J8EEoBWos68yII1QNwIkC9W1f6/6+Aoy0g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Louis Li , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 116/167] drm/amdgpu: fix ring test failure issue during s3 in vce 3.0 (V2) Date: Tue, 3 Sep 2019 12:24:28 -0400 Message-Id: <20190903162519.7136-116-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review 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: Louis Li [ Upstream commit ce0e22f5d886d1b56c7ab4347c45b9ac5fcc058d ] [What] vce ring test fails consistently during resume in s3 cycle, due to mismatch read & write pointers. On debug/analysis its found that rptr to be compared is not being correctly updated/read, which leads to this failure. Below is the failure signature: [drm:amdgpu_vce_ring_test_ring] *ERROR* amdgpu: ring 12 test failed [drm:amdgpu_device_ip_resume_phase2] *ERROR* resume of IP block failed -110 [drm:amdgpu_device_resume] *ERROR* amdgpu_device_ip_resume failed (-110). [How] fetch rptr appropriately, meaning move its read location further down in the code flow. With this patch applied the s3 failure is no more seen for >5k s3 cycles, which otherwise is pretty consistent. V2: remove reduntant fetch of rptr Signed-off-by: Louis Li Reviewed-by: Christian König Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index 5f3f540738187..17862b9ecccd7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c @@ -1070,7 +1070,7 @@ void amdgpu_vce_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq, int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) { struct amdgpu_device *adev = ring->adev; - uint32_t rptr = amdgpu_ring_get_rptr(ring); + uint32_t rptr; unsigned i; int r, timeout = adev->usec_timeout; @@ -1084,6 +1084,9 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) ring->idx, r); return r; } + + rptr = amdgpu_ring_get_rptr(ring); + amdgpu_ring_write(ring, VCE_CMD_END); amdgpu_ring_commit(ring); -- 2.20.1