From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-co1nam03on0047.outbound.protection.outlook.com ([104.47.40.47]:35273 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752147AbeGDDCd (ORCPT ); Tue, 3 Jul 2018 23:02:33 -0400 From: Junwei Zhang To: CC: , , , Junwei Zhang Subject: [PATCH] drm/amdgpu: Reserve fence slots for command submission Date: Wed, 4 Jul 2018 11:02:38 +0800 Message-ID: <1530673358-20219-1-git-send-email-Jerry.Zhang@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: From: Michel Dänzer Without this, there could not be enough slots, which could trigger the BUG_ON in reservation_object_add_shared_fence. v2: * Jump to the error label instead of returning directly (Jerry Zhang) v3: * Reserve slots for command submission after VM updates (Christian König) Cc: stable@vger.kernel.org Bugzilla: https://bugs.freedesktop.org/106418 Reported-by: mikhail.v.gavrilov@gmail.com Signed-off-by: Michel Dänzer Signed-off-by: Junwei Zhang --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 7a625f3..1bc0281 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -928,6 +928,10 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev, r = amdgpu_bo_vm_update_pte(p); if (r) return r; + + r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv); + if (r) + return r; } return amdgpu_cs_sync_rings(p); -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junwei Zhang Subject: [PATCH] drm/amdgpu: Reserve fence slots for command submission Date: Wed, 4 Jul 2018 11:02:38 +0800 Message-ID: <1530673358-20219-1-git-send-email-Jerry.Zhang@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Junwei Zhang , michel.daenzer-5C7GfCeVMHo@public.gmane.org, christian.koenig-5C7GfCeVMHo@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpXaXRob3V0IHRo aXMsIHRoZXJlIGNvdWxkIG5vdCBiZSBlbm91Z2ggc2xvdHMsIHdoaWNoIGNvdWxkIHRyaWdnZXIg dGhlCkJVR19PTiBpbiByZXNlcnZhdGlvbl9vYmplY3RfYWRkX3NoYXJlZF9mZW5jZS4KCnYyOgoq IEp1bXAgdG8gdGhlIGVycm9yIGxhYmVsIGluc3RlYWQgb2YgcmV0dXJuaW5nIGRpcmVjdGx5IChK ZXJyeSBaaGFuZykKdjM6CiogUmVzZXJ2ZSBzbG90cyBmb3IgY29tbWFuZCBzdWJtaXNzaW9uIGFm dGVyIFZNIHVwZGF0ZXMgKENocmlzdGlhbiBLw7ZuaWcpCgpDYzogc3RhYmxlQHZnZXIua2VybmVs Lm9yZwpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy8xMDY0MTgKUmVwb3J0 ZWQtYnk6IG1pa2hhaWwudi5nYXZyaWxvdkBnbWFpbC5jb20KU2lnbmVkLW9mZi1ieTogTWljaGVs IETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEp1bndlaSBa aGFuZyA8SmVycnkuWmhhbmdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfY3MuYyB8IDQgKysrKwogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMKaW5kZXggN2E2MjVmMy4uMWJjMDI4 MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMKQEAgLTkyOCw2ICs5Mjgs MTAgQEAgc3RhdGljIGludCBhbWRncHVfY3NfaWJfdm1fY2h1bmsoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsCiAJCXIgPSBhbWRncHVfYm9fdm1fdXBkYXRlX3B0ZShwKTsKIAkJaWYgKHIpCiAJ CQlyZXR1cm4gcjsKKworCQlyID0gcmVzZXJ2YXRpb25fb2JqZWN0X3Jlc2VydmVfc2hhcmVkKHZt LT5yb290LmJhc2UuYm8tPnRiby5yZXN2KTsKKwkJaWYgKHIpCisJCQlyZXR1cm4gcjsKIAl9CiAK IAlyZXR1cm4gYW1kZ3B1X2NzX3N5bmNfcmluZ3MocCk7Ci0tIAoxLjkuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QK YW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==