From: Felix Kuehling Subject: [PATCH 06/16] drm/amdkfd: Clean up kfd_wait_on_events Date: Fri, 20 Oct 2017 20:23:10 -0400 Message-ID: <1508545400-24338-7-git-send-email-Felix.Kuehling@amd.com> References: <1508545400-24338-1-git-send-email-Felix.Kuehling@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1508545400-24338-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@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: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, oded.gabbay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: Felix Kuehling Q2xlYW5lZCB1cCB0aGUgY29kZSB3aGlsZSByZXNvbHZpbmcgc29tZSBwb3RlbnRpYWwgYnVncyBh bmQKaW5jb25zaXN0ZW5jaWVzIGluIHRoZSBwcm9jZXNzLgoKQ2xlYW4tdXBzOgoqIFJlbW92ZSBl bnVtIGtmZF9ldmVudF93YWl0X3Jlc3VsdCwgd2hpY2ggZHVwbGljYXRlcwogIEtGRF9JT0NfRVZF TlRfUkVTVUxUIGRlZmluaXRpb25zCiogYWxsb2NfZXZlbnRfd2FpdGVycyBjYW4gYmUgY2FsbGVk IHdpdGhvdXQgaG9sZGluZyBwLT5ldmVudF9tdXRleAoqIFJldHVybiBhbiBlcnJvciBjb2RlIGZy b20gY29weV9zaWduYWxlZF9ldmVudF9kYXRhIGluc3RlYWQgb2YgYm9vbAoqIENsZWFuIHVwIGVy cm9yIGhhbmRsaW5nIGNvZGUgcGF0aHMgdG8gbWluaW1pemUgZHVwbGljYXRpb24gaW4KICBrZmRf d2FpdF9vbl9ldmVudHMKCkZpeGVzOgoqIENvbnNpc3RlbnRseSByZXR1cm4gYW4gZXJyb3IgY29k ZSBmcm9tIGtmZF93YWl0X29uX2V2ZW50cyBhbmQgc2V0CiAgd2FpdF9yZXN1bHQgdG8gS0ZEX0lP Q19XQUlUX1JFU1VMVF9GQUlMIGluIGFsbCBmYWlsdXJlIGNhc2VzLgoqIEFsd2F5cyBjYWxsIGZy ZWVfd2FpdGVycyB3aGlsZSBob2xkaW5nIHAtPmV2ZW50X211dGV4CiogY29weV9zaWduYWxlZF9l dmVudF9kYXRhIG1pZ2h0IHNsZWVwLiBEb24ndCBjYWxsIGl0IHdoaWxlIHRoZSB0YXNrIHN0YXRl CiAgaXMgVEFTS19JTlRFUlJVUFRJQkxFLgoKU2lnbmVkLW9mZi1ieTogRmVsaXggS3VlaGxpbmcg PEZlbGl4Lkt1ZWhsaW5nQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQv a2ZkX2NoYXJkZXYuYyB8ICA1ICstLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2V2 ZW50cy5jICB8IDcxICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGtmZC9rZmRfcHJpdi5oICAgIHwgIDggKy0tLQogMyBmaWxlcyBjaGFuZ2Vk LCAzMiBpbnNlcnRpb25zKCspLCA1MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfY2hhcmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRrZmQva2ZkX2NoYXJkZXYuYwppbmRleCAwZWY4MmIyLi5hMjUzMjFmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfY2hhcmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1ka2ZkL2tmZF9jaGFyZGV2LmMKQEAgLTgzNSwxNSArODM1LDEyIEBAIHN0YXRp YyBpbnQga2ZkX2lvY3RsX3dhaXRfZXZlbnRzKHN0cnVjdCBmaWxlICpmaWxwLCBzdHJ1Y3Qga2Zk X3Byb2Nlc3MgKnAsCiAJCQkJdm9pZCAqZGF0YSkKIHsKIAlzdHJ1Y3Qga2ZkX2lvY3RsX3dhaXRf ZXZlbnRzX2FyZ3MgKmFyZ3MgPSBkYXRhOwotCWVudW0ga2ZkX2V2ZW50X3dhaXRfcmVzdWx0IHdh aXRfcmVzdWx0OwogCWludCBlcnI7CiAKIAllcnIgPSBrZmRfd2FpdF9vbl9ldmVudHMocCwgYXJn cy0+bnVtX2V2ZW50cywKIAkJCSh2b2lkIF9fdXNlciAqKWFyZ3MtPmV2ZW50c19wdHIsCiAJCQko YXJncy0+d2FpdF9mb3JfYWxsICE9IDApLAotCQkJYXJncy0+dGltZW91dCwgJndhaXRfcmVzdWx0 KTsKLQotCWFyZ3MtPndhaXRfcmVzdWx0ID0gd2FpdF9yZXN1bHQ7CisJCQlhcmdzLT50aW1lb3V0 LCAmYXJncy0+d2FpdF9yZXN1bHQpOwogCiAJcmV0dXJuIGVycjsKIH0KZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9ldmVudHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1ka2ZkL2tmZF9ldmVudHMuYwppbmRleCBjNmQ5NTcyLi41YmI4OGI3NCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2V2ZW50cy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9ldmVudHMuYwpAQCAtNjY4LDcgKzY2OCw3IEBAIHN0YXRp YyBib29sIHRlc3RfZXZlbnRfY29uZGl0aW9uKGJvb2wgYWxsLCB1aW50MzJfdCBudW1fZXZlbnRz LAogICogQ29weSBldmVudCBzcGVjaWZpYyBkYXRhLCBpZiBkZWZpbmVkLgogICogQ3VycmVudGx5 IG9ubHkgbWVtb3J5IGV4Y2VwdGlvbiBldmVudHMgaGF2ZSBhZGRpdGlvbmFsIGRhdGEgdG8gY29w eSB0byB1c2VyCiAgKi8KLXN0YXRpYyBib29sIGNvcHlfc2lnbmFsZWRfZXZlbnRfZGF0YSh1aW50 MzJfdCBudW1fZXZlbnRzLAorc3RhdGljIGludCBjb3B5X3NpZ25hbGVkX2V2ZW50X2RhdGEodWlu dDMyX3QgbnVtX2V2ZW50cywKIAkJc3RydWN0IGtmZF9ldmVudF93YWl0ZXIgKmV2ZW50X3dhaXRl cnMsCiAJCXN0cnVjdCBrZmRfZXZlbnRfZGF0YSBfX3VzZXIgKmRhdGEpCiB7CkBAIC02ODYsMTEg KzY4NiwxMSBAQCBzdGF0aWMgYm9vbCBjb3B5X3NpZ25hbGVkX2V2ZW50X2RhdGEodWludDMyX3Qg bnVtX2V2ZW50cywKIAkJCXNyYyA9ICZldmVudC0+bWVtb3J5X2V4Y2VwdGlvbl9kYXRhOwogCQkJ aWYgKGNvcHlfdG9fdXNlcihkc3QsIHNyYywKIAkJCQlzaXplb2Yoc3RydWN0IGtmZF9oc2FfbWVt b3J5X2V4Y2VwdGlvbl9kYXRhKSkpCi0JCQkJcmV0dXJuIGZhbHNlOworCQkJCXJldHVybiAtRUZB VUxUOwogCQl9CiAJfQogCi0JcmV0dXJuIHRydWU7CisJcmV0dXJuIDA7CiAKIH0KIApAQCAtNzI3 LDcgKzcyNyw3IEBAIHN0YXRpYyB2b2lkIGZyZWVfd2FpdGVycyh1aW50MzJfdCBudW1fZXZlbnRz LCBzdHJ1Y3Qga2ZkX2V2ZW50X3dhaXRlciAqd2FpdGVycykKIGludCBrZmRfd2FpdF9vbl9ldmVu dHMoc3RydWN0IGtmZF9wcm9jZXNzICpwLAogCQkgICAgICAgdWludDMyX3QgbnVtX2V2ZW50cywg dm9pZCBfX3VzZXIgKmRhdGEsCiAJCSAgICAgICBib29sIGFsbCwgdWludDMyX3QgdXNlcl90aW1l b3V0X21zLAotCQkgICAgICAgZW51bSBrZmRfZXZlbnRfd2FpdF9yZXN1bHQgKndhaXRfcmVzdWx0 KQorCQkgICAgICAgdWludDMyX3QgKndhaXRfcmVzdWx0KQogewogCXN0cnVjdCBrZmRfZXZlbnRf ZGF0YSBfX3VzZXIgKmV2ZW50cyA9CiAJCQkoc3RydWN0IGtmZF9ldmVudF9kYXRhIF9fdXNlciAq KSBkYXRhOwpAQCAtNzM3LDE4ICs3MzcsMTggQEAgaW50IGtmZF93YWl0X29uX2V2ZW50cyhzdHJ1 Y3Qga2ZkX3Byb2Nlc3MgKnAsCiAJc3RydWN0IGtmZF9ldmVudF93YWl0ZXIgKmV2ZW50X3dhaXRl cnMgPSBOVUxMOwogCWxvbmcgdGltZW91dCA9IHVzZXJfdGltZW91dF90b19qaWZmaWVzKHVzZXJf dGltZW91dF9tcyk7CiAKKwlldmVudF93YWl0ZXJzID0gYWxsb2NfZXZlbnRfd2FpdGVycyhudW1f ZXZlbnRzKTsKKwlpZiAoIWV2ZW50X3dhaXRlcnMpIHsKKwkJcmV0ID0gLUVOT01FTTsKKwkJZ290 byBvdXQ7CisJfQorCiAJbXV0ZXhfbG9jaygmcC0+ZXZlbnRfbXV0ZXgpOwogCiAJLyogU2V0IHRv IHNvbWV0aGluZyB1bnJlYXNvbmFibGUgLSB0aGlzIGlzIHJlYWxseQogCSAqIGp1c3QgYSBib29s IGZvciBub3cuCiAJICovCi0JKndhaXRfcmVzdWx0ID0gS0ZEX1dBSVRfVElNRU9VVDsKLQotCWV2 ZW50X3dhaXRlcnMgPSBhbGxvY19ldmVudF93YWl0ZXJzKG51bV9ldmVudHMpOwotCWlmICghZXZl bnRfd2FpdGVycykgewotCQlyZXQgPSAtRU5PTUVNOwotCQlnb3RvIGZhaWw7Ci0JfQorCSp3YWl0 X3Jlc3VsdCA9IEtGRF9JT0NfV0FJVF9SRVNVTFRfVElNRU9VVDsKIAogCWZvciAoaSA9IDA7IGkg PCBudW1fZXZlbnRzOyBpKyspIHsKIAkJc3RydWN0IGtmZF9ldmVudF9kYXRhIGV2ZW50X2RhdGE7 CkBAIC03NTYsMjMgKzc1NiwyMSBAQCBpbnQga2ZkX3dhaXRfb25fZXZlbnRzKHN0cnVjdCBrZmRf cHJvY2VzcyAqcCwKIAkJaWYgKGNvcHlfZnJvbV91c2VyKCZldmVudF9kYXRhLCAmZXZlbnRzW2ld LAogCQkJCXNpemVvZihzdHJ1Y3Qga2ZkX2V2ZW50X2RhdGEpKSkgewogCQkJcmV0ID0gLUVGQVVM VDsKLQkJCWdvdG8gZmFpbDsKKwkJCWdvdG8gb3V0X3VubG9jazsKIAkJfQogCiAJCXJldCA9IGlu aXRfZXZlbnRfd2FpdGVyX2dldF9zdGF0dXMocCwgJmV2ZW50X3dhaXRlcnNbaV0sCiAJCQkJZXZl bnRfZGF0YS5ldmVudF9pZCwgaSk7CiAJCWlmIChyZXQpCi0JCQlnb3RvIGZhaWw7CisJCQlnb3Rv IG91dF91bmxvY2s7CiAJfQogCiAJLyogQ2hlY2sgY29uZGl0aW9uIG9uY2UuICovCiAJaWYgKHRl c3RfZXZlbnRfY29uZGl0aW9uKGFsbCwgbnVtX2V2ZW50cywgZXZlbnRfd2FpdGVycykpIHsKLQkJ aWYgKGNvcHlfc2lnbmFsZWRfZXZlbnRfZGF0YShudW1fZXZlbnRzLAotCQkJCWV2ZW50X3dhaXRl cnMsIGV2ZW50cykpCi0JCQkqd2FpdF9yZXN1bHQgPSBLRkRfV0FJVF9DT01QTEVURTsKLQkJZWxz ZQotCQkJKndhaXRfcmVzdWx0ID0gS0ZEX1dBSVRfRVJST1I7Ci0JCWZyZWVfd2FpdGVycyhudW1f ZXZlbnRzLCBldmVudF93YWl0ZXJzKTsKKwkJKndhaXRfcmVzdWx0ID0gS0ZEX0lPQ19XQUlUX1JF U1VMVF9DT01QTEVURTsKKwkJcmV0ID0gY29weV9zaWduYWxlZF9ldmVudF9kYXRhKG51bV9ldmVu dHMsCisJCQkJCSAgICAgICBldmVudF93YWl0ZXJzLCBldmVudHMpOworCQlnb3RvIG91dF91bmxv Y2s7CiAJfSBlbHNlIHsKIAkJLyogQWRkIHRvIHdhaXQgbGlzdHMgaWYgd2UgbmVlZCB0byB3YWl0 LiAqLwogCQlmb3IgKGkgPSAwOyBpIDwgbnVtX2V2ZW50czsgaSsrKQpAQCAtNzgxLDEyICs3Nzks NiBAQCBpbnQga2ZkX3dhaXRfb25fZXZlbnRzKHN0cnVjdCBrZmRfcHJvY2VzcyAqcCwKIAogCW11 dGV4X3VubG9jaygmcC0+ZXZlbnRfbXV0ZXgpOwogCi0JLyogUmV0dXJuIGlmIGFsbCB3YWl0cyB3 ZXJlIGFscmVhZHkgc2F0aXNmaWVkLiAqLwotCWlmICgqd2FpdF9yZXN1bHQgIT0gS0ZEX1dBSVRf VElNRU9VVCkgewotCQlfX3NldF9jdXJyZW50X3N0YXRlKFRBU0tfUlVOTklORyk7Ci0JCXJldHVy biByZXQ7Ci0JfQotCiAJd2hpbGUgKHRydWUpIHsKIAkJaWYgKGZhdGFsX3NpZ25hbF9wZW5kaW5n KGN1cnJlbnQpKSB7CiAJCQlyZXQgPSAtRUlOVFI7CkBAIC04MTgsMTYgKzgxMCwxMiBAQCBpbnQg a2ZkX3dhaXRfb25fZXZlbnRzKHN0cnVjdCBrZmRfcHJvY2VzcyAqcCwKIAkJc2V0X2N1cnJlbnRf c3RhdGUoVEFTS19JTlRFUlJVUFRJQkxFKTsKIAogCQlpZiAodGVzdF9ldmVudF9jb25kaXRpb24o YWxsLCBudW1fZXZlbnRzLCBldmVudF93YWl0ZXJzKSkgewotCQkJaWYgKGNvcHlfc2lnbmFsZWRf ZXZlbnRfZGF0YShudW1fZXZlbnRzLAotCQkJCQlldmVudF93YWl0ZXJzLCBldmVudHMpKQotCQkJ CSp3YWl0X3Jlc3VsdCA9IEtGRF9XQUlUX0NPTVBMRVRFOwotCQkJZWxzZQotCQkJCSp3YWl0X3Jl c3VsdCA9IEtGRF9XQUlUX0VSUk9SOworCQkJKndhaXRfcmVzdWx0ID0gS0ZEX0lPQ19XQUlUX1JF U1VMVF9DT01QTEVURTsKIAkJCWJyZWFrOwogCQl9CiAKIAkJaWYgKHRpbWVvdXQgPD0gMCkgewot CQkJKndhaXRfcmVzdWx0ID0gS0ZEX1dBSVRfVElNRU9VVDsKKwkJCSp3YWl0X3Jlc3VsdCA9IEtG RF9JT0NfV0FJVF9SRVNVTFRfVElNRU9VVDsKIAkJCWJyZWFrOwogCQl9CiAKQEAgLTgzNSwxOSAr ODIzLDIwIEBAIGludCBrZmRfd2FpdF9vbl9ldmVudHMoc3RydWN0IGtmZF9wcm9jZXNzICpwLAog CX0KIAlfX3NldF9jdXJyZW50X3N0YXRlKFRBU0tfUlVOTklORyk7CiAKKwkvKiBjb3B5X3NpZ25h bGVkX2V2ZW50X2RhdGEgbWF5IHNsZWVwLiBTbyB0aGlzIGhhcyB0byBoYXBwZW4KKwkgKiBhZnRl ciB0aGUgdGFzayBzdGF0ZSBpcyBzZXQgYmFjayB0byBSVU5OSU5HLgorCSAqLworCWlmICghcmV0 ICYmICp3YWl0X3Jlc3VsdCA9PSBLRkRfSU9DX1dBSVRfUkVTVUxUX0NPTVBMRVRFKQorCQlyZXQg PSBjb3B5X3NpZ25hbGVkX2V2ZW50X2RhdGEobnVtX2V2ZW50cywKKwkJCQkJICAgICAgIGV2ZW50 X3dhaXRlcnMsIGV2ZW50cyk7CisKIAltdXRleF9sb2NrKCZwLT5ldmVudF9tdXRleCk7CitvdXRf dW5sb2NrOgogCWZyZWVfd2FpdGVycyhudW1fZXZlbnRzLCBldmVudF93YWl0ZXJzKTsKIAltdXRl eF91bmxvY2soJnAtPmV2ZW50X211dGV4KTsKLQotCXJldHVybiByZXQ7Ci0KLWZhaWw6Ci0JaWYg KGV2ZW50X3dhaXRlcnMpCi0JCWZyZWVfd2FpdGVycyhudW1fZXZlbnRzLCBldmVudF93YWl0ZXJz KTsKLQotCW11dGV4X3VubG9jaygmcC0+ZXZlbnRfbXV0ZXgpOwotCi0JKndhaXRfcmVzdWx0ID0g S0ZEX1dBSVRfRVJST1I7CitvdXQ6CisJaWYgKHJldCkKKwkJKndhaXRfcmVzdWx0ID0gS0ZEX0lP Q19XQUlUX1JFU1VMVF9GQUlMOwogCiAJcmV0dXJuIHJldDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9wcml2LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGtmZC9rZmRfcHJpdi5oCmluZGV4IDFhNDgzYTcuLmQzY2Y1M2EgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9wcml2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRrZmQva2ZkX3ByaXYuaApAQCAtNzI2LDE5ICs3MjYsMTMgQEAgdWludDY0X3Qga2ZkX2dl dF9udW1iZXJfZWxlbXMoc3RydWN0IGtmZF9kZXYgKmtmZCk7CiBleHRlcm4gY29uc3Qgc3RydWN0 IGtmZF9ldmVudF9pbnRlcnJ1cHRfY2xhc3MgZXZlbnRfaW50ZXJydXB0X2NsYXNzX2NpazsKIGV4 dGVybiBjb25zdCBzdHJ1Y3Qga2ZkX2RldmljZV9nbG9iYWxfaW5pdF9jbGFzcyBkZXZpY2VfZ2xv YmFsX2luaXRfY2xhc3NfY2lrOwogCi1lbnVtIGtmZF9ldmVudF93YWl0X3Jlc3VsdCB7Ci0JS0ZE X1dBSVRfQ09NUExFVEUsCi0JS0ZEX1dBSVRfVElNRU9VVCwKLQlLRkRfV0FJVF9FUlJPUgotfTsK LQogdm9pZCBrZmRfZXZlbnRfaW5pdF9wcm9jZXNzKHN0cnVjdCBrZmRfcHJvY2VzcyAqcCk7CiB2 b2lkIGtmZF9ldmVudF9mcmVlX3Byb2Nlc3Moc3RydWN0IGtmZF9wcm9jZXNzICpwKTsKIGludCBr ZmRfZXZlbnRfbW1hcChzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnByb2Nlc3MsIHN0cnVjdCB2bV9hcmVh X3N0cnVjdCAqdm1hKTsKIGludCBrZmRfd2FpdF9vbl9ldmVudHMoc3RydWN0IGtmZF9wcm9jZXNz ICpwLAogCQkgICAgICAgdWludDMyX3QgbnVtX2V2ZW50cywgdm9pZCBfX3VzZXIgKmRhdGEsCiAJ CSAgICAgICBib29sIGFsbCwgdWludDMyX3QgdXNlcl90aW1lb3V0X21zLAotCQkgICAgICAgZW51 bSBrZmRfZXZlbnRfd2FpdF9yZXN1bHQgKndhaXRfcmVzdWx0KTsKKwkJICAgICAgIHVpbnQzMl90 ICp3YWl0X3Jlc3VsdCk7CiB2b2lkIGtmZF9zaWduYWxfZXZlbnRfaW50ZXJydXB0KHVuc2lnbmVk IGludCBwYXNpZCwgdWludDMyX3QgcGFydGlhbF9pZCwKIAkJCQl1aW50MzJfdCB2YWxpZF9pZF9i aXRzKTsKIHZvaWQga2ZkX3NpZ25hbF9pb21tdV9ldmVudChzdHJ1Y3Qga2ZkX2RldiAqZGV2LAot LSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=