From: Junwei Zhang Subject: [PATCH libdrm 2/2] amdgpu: add a function to create amdgpu bo internally (v4) Date: Tue, 14 Aug 2018 11:00:09 +0800 Message-ID: <1534215609-18668-2-git-send-email-Jerry.Zhang@amd.com> References: <1534215609-18668-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: In-Reply-To: <1534215609-18668-1-git-send-email-Jerry.Zhang-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 Cc: Junwei Zhang , christian.koenig-5C7GfCeVMHo@public.gmane.org YSBoZWxwZXIgZnVuY3Rpb24gdG8gY3JlYXRlIGFuZCBpbml0aWFsaXplIGFtZGdwdSBibwoKdjI6 IHVwZGF0ZSBlcnJvciBoYW5kbGluZzogYWRkIGxhYmVsIGFuZCBmcmVlIGJvCnYzOiB1cGRhdGUg ZXJyb3IgaGFuZGxpbmc6IHNlcGFyYXRlIGVhY2ggZXJyb3IgbGFiZWwKdjQ6IHVwZGF0ZSBlcnJv ciBoYW5kbGluZyBhbmQgcmViYXNlCgpTaWduZWQtb2ZmLWJ5OiBKdW53ZWkgWmhhbmcgPEplcnJ5 LlpoYW5nQGFtZC5jb20+ClJldmlld2VkLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4u a29lbmlnQGFtZC5jb20+Ci0tLQogYW1kZ3B1L2FtZGdwdV9iby5jIHwgMjExICsrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMTA2IGluc2VydGlvbnMoKyksIDEwNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hbWRn cHUvYW1kZ3B1X2JvLmMgYi9hbWRncHUvYW1kZ3B1X2JvLmMKaW5kZXggZDk1NTZlYy4uNzU3YTBk MyAxMDA2NDQKLS0tIGEvYW1kZ3B1L2FtZGdwdV9iby5jCisrKyBiL2FtZGdwdS9hbWRncHVfYm8u YwpAQCAtNDgsMTEgKzQ4LDMxIEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9jbG9zZV9rbXNfaGFuZGxl KGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwKIAlkcm1Jb2N0bChkZXYtPmZkLCBEUk1fSU9DVExf R0VNX0NMT1NFLCAmYXJncyk7CiB9CiAKK3N0YXRpYyBpbnQgYW1kZ3B1X2JvX2NyZWF0ZShhbWRn cHVfZGV2aWNlX2hhbmRsZSBkZXYsCisJCQkgICAgdWludDY0X3Qgc2l6ZSwKKwkJCSAgICB1aW50 MzJfdCBoYW5kbGUsCisJCQkgICAgYW1kZ3B1X2JvX2hhbmRsZSAqYnVmX2hhbmRsZSkKK3sKKwlz dHJ1Y3QgYW1kZ3B1X2JvICpibzsKKworCWJvID0gY2FsbG9jKDEsIHNpemVvZihzdHJ1Y3QgYW1k Z3B1X2JvKSk7CisJaWYgKCFibykKKwkJcmV0dXJuIC1FTk9NRU07CisKKwlhdG9taWNfc2V0KCZi by0+cmVmY291bnQsIDEpOworCWJvLT5kZXYgPSBkZXY7CisJYm8tPmFsbG9jX3NpemUgPSBzaXpl OworCWJvLT5oYW5kbGUgPSBoYW5kbGU7CisJcHRocmVhZF9tdXRleF9pbml0KCZiby0+Y3B1X2Fj Y2Vzc19tdXRleCwgTlVMTCk7CisKKwkqYnVmX2hhbmRsZSA9IGJvOworCXJldHVybiAwOworfQor CiBpbnQgYW1kZ3B1X2JvX2FsbG9jKGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwKIAkJICAgIHN0 cnVjdCBhbWRncHVfYm9fYWxsb2NfcmVxdWVzdCAqYWxsb2NfYnVmZmVyLAogCQkgICAgYW1kZ3B1 X2JvX2hhbmRsZSAqYnVmX2hhbmRsZSkKIHsKLQlzdHJ1Y3QgYW1kZ3B1X2JvICpibzsKIAl1bmlv biBkcm1fYW1kZ3B1X2dlbV9jcmVhdGUgYXJnczsKIAl1bnNpZ25lZCBoZWFwID0gYWxsb2NfYnVm ZmVyLT5wcmVmZXJyZWRfaGVhcDsKIAlpbnQgciA9IDA7CkBAIC02MSwxNCArODEsNiBAQCBpbnQg YW1kZ3B1X2JvX2FsbG9jKGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwKIAlpZiAoIShoZWFwICYg KEFNREdQVV9HRU1fRE9NQUlOX0dUVCB8IEFNREdQVV9HRU1fRE9NQUlOX1ZSQU0pKSkKIAkJcmV0 dXJuIC1FSU5WQUw7CiAKLQlibyA9IGNhbGxvYygxLCBzaXplb2Yoc3RydWN0IGFtZGdwdV9ibykp OwotCWlmICghYm8pCi0JCXJldHVybiAtRU5PTUVNOwotCi0JYXRvbWljX3NldCgmYm8tPnJlZmNv dW50LCAxKTsKLQliby0+ZGV2ID0gZGV2OwotCWJvLT5hbGxvY19zaXplID0gYWxsb2NfYnVmZmVy LT5hbGxvY19zaXplOwotCiAJbWVtc2V0KCZhcmdzLCAwLCBzaXplb2YoYXJncykpOwogCWFyZ3Mu aW4uYm9fc2l6ZSA9IGFsbG9jX2J1ZmZlci0+YWxsb2Nfc2l6ZTsKIAlhcmdzLmluLmFsaWdubWVu dCA9IGFsbG9jX2J1ZmZlci0+cGh5c19hbGlnbm1lbnQ7CkBAIC04MCwyNCArOTIsMjMgQEAgaW50 IGFtZGdwdV9ib19hbGxvYyhhbWRncHVfZGV2aWNlX2hhbmRsZSBkZXYsCiAJLyogQWxsb2NhdGUg dGhlIGJ1ZmZlciB3aXRoIHRoZSBwcmVmZXJyZWQgaGVhcC4gKi8KIAlyID0gZHJtQ29tbWFuZFdy aXRlUmVhZChkZXYtPmZkLCBEUk1fQU1ER1BVX0dFTV9DUkVBVEUsCiAJCQkJJmFyZ3MsIHNpemVv ZihhcmdzKSk7CisJaWYgKHIpCisJCWdvdG8gb3V0OworCisJciA9IGFtZGdwdV9ib19jcmVhdGUo ZGV2LCBhbGxvY19idWZmZXItPmFsbG9jX3NpemUsIGFyZ3Mub3V0LmhhbmRsZSwKKwkJCSAgICAg YnVmX2hhbmRsZSk7CiAJaWYgKHIpIHsKLQkJZnJlZShibyk7Ci0JCXJldHVybiByOworCQlhbWRn cHVfY2xvc2Vfa21zX2hhbmRsZShkZXYsIGFyZ3Mub3V0LmhhbmRsZSk7CisJCWdvdG8gb3V0Owog CX0KIAotCWJvLT5oYW5kbGUgPSBhcmdzLm91dC5oYW5kbGU7Ci0KLQlwdGhyZWFkX211dGV4X2xv Y2soJmJvLT5kZXYtPmJvX3RhYmxlX211dGV4KTsKLQlyID0gaGFuZGxlX3RhYmxlX2luc2VydCgm Ym8tPmRldi0+Ym9faGFuZGxlcywgYm8tPmhhbmRsZSwgYm8pOwotCXB0aHJlYWRfbXV0ZXhfdW5s b2NrKCZiby0+ZGV2LT5ib190YWJsZV9tdXRleCk7Ci0KLQlwdGhyZWFkX211dGV4X2luaXQoJmJv LT5jcHVfYWNjZXNzX211dGV4LCBOVUxMKTsKLQorCXB0aHJlYWRfbXV0ZXhfbG9jaygmZGV2LT5i b190YWJsZV9tdXRleCk7CisJciA9IGhhbmRsZV90YWJsZV9pbnNlcnQoJmRldi0+Ym9faGFuZGxl cywgKCpidWZfaGFuZGxlKS0+aGFuZGxlLAorCQkJCSpidWZfaGFuZGxlKTsKKwlwdGhyZWFkX211 dGV4X3VubG9jaygmZGV2LT5ib190YWJsZV9tdXRleCk7CiAJaWYgKHIpCi0JCWFtZGdwdV9ib19m cmVlKGJvKTsKLQllbHNlCi0JCSpidWZfaGFuZGxlID0gYm87Ci0KKwkJYW1kZ3B1X2JvX2ZyZWUo KmJ1Zl9oYW5kbGUpOworb3V0OgogCXJldHVybiByOwogfQogCkBAIC0yNTcsNyArMjY4LDkgQEAg aW50IGFtZGdwdV9ib19pbXBvcnQoYW1kZ3B1X2RldmljZV9oYW5kbGUgZGV2LAogCXN0cnVjdCBk cm1fZ2VtX29wZW4gb3Blbl9hcmcgPSB7fTsKIAlzdHJ1Y3QgZHJtX2dlbV9jbG9zZSBjbG9zZV9h cmcgPSB7fTsKIAlzdHJ1Y3QgYW1kZ3B1X2JvICpibyA9IE5VTEw7Ci0JaW50IHI7CisJdWludDMy X3QgaGFuZGxlID0gMCwgZmxpbmtfbmFtZSA9IDA7CisJdWludDY0X3QgYWxsb2Nfc2l6ZSA9IDA7 CisJaW50IHIgPSAwOwogCWludCBkbWFfZmQ7CiAJdWludDY0X3QgZG1hX2J1Zl9zaXplID0gMDsK IApAQCAtMjY3LDIyICsyODAsMTggQEAgaW50IGFtZGdwdV9ib19pbXBvcnQoYW1kZ3B1X2Rldmlj ZV9oYW5kbGUgZGV2LAogCiAJLyogQ29udmVydCBhIERNQSBidWYgaGFuZGxlIHRvIGEgS01TIGhh bmRsZSBub3cuICovCiAJaWYgKHR5cGUgPT0gYW1kZ3B1X2JvX2hhbmRsZV90eXBlX2RtYV9idWZf ZmQpIHsKLQkJdWludDMyX3QgaGFuZGxlOwogCQlvZmZfdCBzaXplOwogCiAJCS8qIEdldCBhIEtN UyBoYW5kbGUuICovCiAJCXIgPSBkcm1QcmltZUZEVG9IYW5kbGUoZGV2LT5mZCwgc2hhcmVkX2hh bmRsZSwgJmhhbmRsZSk7Ci0JCWlmIChyKSB7Ci0JCQlwdGhyZWFkX211dGV4X3VubG9jaygmZGV2 LT5ib190YWJsZV9tdXRleCk7Ci0JCQlyZXR1cm4gcjsKLQkJfQorCQlpZiAocikKKwkJCWdvdG8g dW5sb2NrOwogCiAJCS8qIFF1ZXJ5IHRoZSBidWZmZXIgc2l6ZS4gKi8KIAkJc2l6ZSA9IGxzZWVr KHNoYXJlZF9oYW5kbGUsIDAsIFNFRUtfRU5EKTsKIAkJaWYgKHNpemUgPT0gKG9mZl90KS0xKSB7 Ci0JCQlwdGhyZWFkX211dGV4X3VubG9jaygmZGV2LT5ib190YWJsZV9tdXRleCk7Ci0JCQlhbWRn cHVfY2xvc2Vfa21zX2hhbmRsZShkZXYsIGhhbmRsZSk7Ci0JCQlyZXR1cm4gLWVycm5vOworCQkJ ciA9IC1lcnJubzsKKwkJCWdvdG8gZnJlZV9ib19oYW5kbGU7CiAJCX0KIAkJbHNlZWsoc2hhcmVk X2hhbmRsZSwgMCwgU0VFS19TRVQpOwogCkBAIC0zMDMsMTIgKzMxMiwxMiBAQCBpbnQgYW1kZ3B1 X2JvX2ltcG9ydChhbWRncHVfZGV2aWNlX2hhbmRsZSBkZXYsCiAJY2FzZSBhbWRncHVfYm9faGFu ZGxlX3R5cGVfa21zOgogCWNhc2UgYW1kZ3B1X2JvX2hhbmRsZV90eXBlX2ttc19ub2ltcG9ydDoK IAkJLyogSW1wb3J0aW5nIGEgS01TIGhhbmRsZSBpbiBub3QgYWxsb3dlZC4gKi8KLQkJcHRocmVh ZF9tdXRleF91bmxvY2soJmRldi0+Ym9fdGFibGVfbXV0ZXgpOwotCQlyZXR1cm4gLUVQRVJNOwor CQlyID0gLUVQRVJNOworCQlnb3RvIHVubG9jazsKIAogCWRlZmF1bHQ6Ci0JCXB0aHJlYWRfbXV0 ZXhfdW5sb2NrKCZkZXYtPmJvX3RhYmxlX211dGV4KTsKLQkJcmV0dXJuIC1FSU5WQUw7CisJCXIg PSAtRUlOVkFMOworCQlnb3RvIHVubG9jazsKIAl9CiAKIAlpZiAoYm8pIHsKQEAgLTMyMSw2MiAr MzMwLDM3IEBAIGludCBhbWRncHVfYm9faW1wb3J0KGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwK IAkJcmV0dXJuIDA7CiAJfQogCi0JYm8gPSBjYWxsb2MoMSwgc2l6ZW9mKHN0cnVjdCBhbWRncHVf Ym8pKTsKLQlpZiAoIWJvKSB7Ci0JCXB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZkZXYtPmJvX3RhYmxl X211dGV4KTsKLQkJaWYgKHR5cGUgPT0gYW1kZ3B1X2JvX2hhbmRsZV90eXBlX2RtYV9idWZfZmQp IHsKLQkJCWFtZGdwdV9jbG9zZV9rbXNfaGFuZGxlKGRldiwgc2hhcmVkX2hhbmRsZSk7Ci0JCX0K LQkJcmV0dXJuIC1FTk9NRU07Ci0JfQotCiAJLyogT3BlbiB0aGUgaGFuZGxlLiAqLwogCXN3aXRj aCAodHlwZSkgewogCWNhc2UgYW1kZ3B1X2JvX2hhbmRsZV90eXBlX2dlbV9mbGlua19uYW1lOgog CQlvcGVuX2FyZy5uYW1lID0gc2hhcmVkX2hhbmRsZTsKIAkJciA9IGRybUlvY3RsKGRldi0+Zmxp bmtfZmQsIERSTV9JT0NUTF9HRU1fT1BFTiwgJm9wZW5fYXJnKTsKLQkJaWYgKHIpIHsKLQkJCWZy ZWUoYm8pOwotCQkJcHRocmVhZF9tdXRleF91bmxvY2soJmRldi0+Ym9fdGFibGVfbXV0ZXgpOwot CQkJcmV0dXJuIHI7Ci0JCX0KKwkJaWYgKHIpCisJCQlnb3RvIHVubG9jazsKIAotCQliby0+aGFu ZGxlID0gb3Blbl9hcmcuaGFuZGxlOworCQlmbGlua19uYW1lID0gc2hhcmVkX2hhbmRsZTsKKwkJ aGFuZGxlID0gb3Blbl9hcmcuaGFuZGxlOworCQlhbGxvY19zaXplID0gb3Blbl9hcmcuc2l6ZTsK IAkJaWYgKGRldi0+ZmxpbmtfZmQgIT0gZGV2LT5mZCkgewotCQkJY2xvc2VfYXJnLmhhbmRsZSA9 IG9wZW5fYXJnLmhhbmRsZTsKLQkJCXIgPSBkcm1QcmltZUhhbmRsZVRvRkQoZGV2LT5mbGlua19m ZCwgYm8tPmhhbmRsZSwgRFJNX0NMT0VYRUMsICZkbWFfZmQpOwotCQkJaWYgKHIpIHsKLQkJCQlm cmVlKGJvKTsKLQkJCQlkcm1Jb2N0bChkZXYtPmZsaW5rX2ZkLCBEUk1fSU9DVExfR0VNX0NMT1NF LAotCQkJCQkgJmNsb3NlX2FyZyk7Ci0JCQkJcHRocmVhZF9tdXRleF91bmxvY2soJmRldi0+Ym9f dGFibGVfbXV0ZXgpOwotCQkJCXJldHVybiByOwotCQkJfQotCQkJciA9IGRybVByaW1lRkRUb0hh bmRsZShkZXYtPmZkLCBkbWFfZmQsICZiby0+aGFuZGxlICk7Ci0KKwkJCXIgPSBkcm1QcmltZUhh bmRsZVRvRkQoZGV2LT5mbGlua19mZCwgaGFuZGxlLAorCQkJCQkgICAgICAgRFJNX0NMT0VYRUMs ICZkbWFfZmQpOworCQkJaWYgKHIpCisJCQkJZ290byBmcmVlX2JvX2hhbmRsZTsKKwkJCXIgPSBk cm1QcmltZUZEVG9IYW5kbGUoZGV2LT5mZCwgZG1hX2ZkLCAmaGFuZGxlKTsKIAkJCWNsb3NlKGRt YV9mZCk7Ci0JCQlkcm1Jb2N0bChkZXYtPmZsaW5rX2ZkLCBEUk1fSU9DVExfR0VNX0NMT1NFLCAm Y2xvc2VfYXJnKTsKLQotCQkJaWYgKHIpIHsKLQkJCQlmcmVlKGJvKTsKLQkJCQlwdGhyZWFkX211 dGV4X3VubG9jaygmZGV2LT5ib190YWJsZV9tdXRleCk7Ci0JCQkJcmV0dXJuIHI7Ci0JCQl9Ci0J CX0KLQkJYm8tPmZsaW5rX25hbWUgPSBzaGFyZWRfaGFuZGxlOwotCQliby0+YWxsb2Nfc2l6ZSA9 IG9wZW5fYXJnLnNpemU7Ci0JCXIgPSBoYW5kbGVfdGFibGVfaW5zZXJ0KCZkZXYtPmJvX2ZsaW5r X25hbWVzLCBzaGFyZWRfaGFuZGxlLAotCQkJCQlibyk7Ci0JCWlmIChyKSB7Ci0JCQlwdGhyZWFk X211dGV4X3VubG9jaygmZGV2LT5ib190YWJsZV9tdXRleCk7Ci0JCQlhbWRncHVfYm9fZnJlZShi byk7Ci0JCQlyZXR1cm4gcjsKKwkJCWlmIChyKQorCQkJCWdvdG8gZnJlZV9ib19oYW5kbGU7CisJ CQljbG9zZV9hcmcuaGFuZGxlID0gb3Blbl9hcmcuaGFuZGxlOworCQkJciA9IGRybUlvY3RsKGRl di0+ZmxpbmtfZmQsIERSTV9JT0NUTF9HRU1fQ0xPU0UsCisJCQkJICAgICAmY2xvc2VfYXJnKTsK KwkJCWlmIChyKQorCQkJCWdvdG8gZnJlZV9ib19oYW5kbGU7CiAJCX0KIAkJYnJlYWs7CiAKIAlj YXNlIGFtZGdwdV9ib19oYW5kbGVfdHlwZV9kbWFfYnVmX2ZkOgotCQliby0+aGFuZGxlID0gc2hh cmVkX2hhbmRsZTsKLQkJYm8tPmFsbG9jX3NpemUgPSBkbWFfYnVmX3NpemU7CisJCWhhbmRsZSA9 IHNoYXJlZF9oYW5kbGU7CisJCWFsbG9jX3NpemUgPSBkbWFfYnVmX3NpemU7CiAJCWJyZWFrOwog CiAJY2FzZSBhbWRncHVfYm9faGFuZGxlX3R5cGVfa21zOgpAQCAtMzg1LDE2ICszNjksNDEgQEAg aW50IGFtZGdwdV9ib19pbXBvcnQoYW1kZ3B1X2RldmljZV9oYW5kbGUgZGV2LAogCX0KIAogCS8q IEluaXRpYWxpemUgaXQuICovCi0JYXRvbWljX3NldCgmYm8tPnJlZmNvdW50LCAxKTsKLQliby0+ ZGV2ID0gZGV2OwotCXB0aHJlYWRfbXV0ZXhfaW5pdCgmYm8tPmNwdV9hY2Nlc3NfbXV0ZXgsIE5V TEwpOworCXIgPSBhbWRncHVfYm9fY3JlYXRlKGRldiwgYWxsb2Nfc2l6ZSwgaGFuZGxlLCAmYm8p OworCWlmIChyKQorCQlnb3RvIGZyZWVfYm9faGFuZGxlOwogCi0JaGFuZGxlX3RhYmxlX2luc2Vy dCgmZGV2LT5ib19oYW5kbGVzLCBiby0+aGFuZGxlLCBibyk7Ci0JcHRocmVhZF9tdXRleF91bmxv Y2soJmRldi0+Ym9fdGFibGVfbXV0ZXgpOworCXIgPSBoYW5kbGVfdGFibGVfaW5zZXJ0KCZkZXYt PmJvX2hhbmRsZXMsIGJvLT5oYW5kbGUsIGJvKTsKKwlpZiAocikKKwkJZ290byBmcmVlX2JvX2hh bmRsZTsKKwlpZiAoZmxpbmtfbmFtZSkgeworCQliby0+ZmxpbmtfbmFtZSA9IGZsaW5rX25hbWU7 CisJCXIgPSBoYW5kbGVfdGFibGVfaW5zZXJ0KCZkZXYtPmJvX2ZsaW5rX25hbWVzLCBmbGlua19u YW1lLAorCQkJCQlibyk7CisJCWlmIChyKQorCQkJZ290byByZW1vdmVfaGFuZGxlOworCisJfQog CiAJb3V0cHV0LT5idWZfaGFuZGxlID0gYm87CiAJb3V0cHV0LT5hbGxvY19zaXplID0gYm8tPmFs bG9jX3NpemU7CisJcHRocmVhZF9tdXRleF91bmxvY2soJmRldi0+Ym9fdGFibGVfbXV0ZXgpOwog CXJldHVybiAwOworCityZW1vdmVfaGFuZGxlOgorCWhhbmRsZV90YWJsZV9yZW1vdmUoJmRldi0+ Ym9faGFuZGxlcywgYm8tPmhhbmRsZSk7CitmcmVlX2JvX2hhbmRsZToKKwlpZiAoZmxpbmtfbmFt ZSAmJiAhY2xvc2VfYXJnLmhhbmRsZSAmJiBvcGVuX2FyZy5oYW5kbGUpIHsKKwkJY2xvc2VfYXJn LmhhbmRsZSA9IG9wZW5fYXJnLmhhbmRsZTsKKwkJZHJtSW9jdGwoZGV2LT5mbGlua19mZCwgRFJN X0lPQ1RMX0dFTV9DTE9TRSwgJmNsb3NlX2FyZyk7CisJfQorCWlmIChibykKKwkJYW1kZ3B1X2Jv X2ZyZWUoYm8pOworCWVsc2UKKwkJYW1kZ3B1X2Nsb3NlX2ttc19oYW5kbGUoZGV2LCBoYW5kbGUp OwordW5sb2NrOgorCXB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZkZXYtPmJvX3RhYmxlX211dGV4KTsK KwlyZXR1cm4gcjsKIH0KIAogaW50IGFtZGdwdV9ib19mcmVlKGFtZGdwdV9ib19oYW5kbGUgYnVm X2hhbmRsZSkKQEAgLTU3OSw3ICs1ODgsNiBAQCBpbnQgYW1kZ3B1X2NyZWF0ZV9ib19mcm9tX3Vz ZXJfbWVtKGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwKIAkJCQkgICAgYW1kZ3B1X2JvX2hhbmRs ZSAqYnVmX2hhbmRsZSkKIHsKIAlpbnQgcjsKLQlzdHJ1Y3QgYW1kZ3B1X2JvICpibzsKIAlzdHJ1 Y3QgZHJtX2FtZGdwdV9nZW1fdXNlcnB0ciBhcmdzOwogCiAJYXJncy5hZGRyID0gKHVpbnRwdHJf dCljcHU7CkBAIC01ODksMjggKzU5NywyMSBAQCBpbnQgYW1kZ3B1X2NyZWF0ZV9ib19mcm9tX3Vz ZXJfbWVtKGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwKIAlyID0gZHJtQ29tbWFuZFdyaXRlUmVh ZChkZXYtPmZkLCBEUk1fQU1ER1BVX0dFTV9VU0VSUFRSLAogCQkJCSZhcmdzLCBzaXplb2YoYXJn cykpOwogCWlmIChyKQotCQlyZXR1cm4gcjsKLQotCWJvID0gY2FsbG9jKDEsIHNpemVvZihzdHJ1 Y3QgYW1kZ3B1X2JvKSk7Ci0JaWYgKCFibykKLQkJcmV0dXJuIC1FTk9NRU07Ci0KLQlhdG9taWNf c2V0KCZiby0+cmVmY291bnQsIDEpOwotCWJvLT5kZXYgPSBkZXY7Ci0JYm8tPmFsbG9jX3NpemUg PSBzaXplOwotCWJvLT5oYW5kbGUgPSBhcmdzLmhhbmRsZTsKKwkJZ290byBvdXQ7CiAKLQlwdGhy ZWFkX211dGV4X2xvY2soJmJvLT5kZXYtPmJvX3RhYmxlX211dGV4KTsKLQlyID0gaGFuZGxlX3Rh YmxlX2luc2VydCgmYm8tPmRldi0+Ym9faGFuZGxlcywgYm8tPmhhbmRsZSwgYm8pOwotCXB0aHJl YWRfbXV0ZXhfdW5sb2NrKCZiby0+ZGV2LT5ib190YWJsZV9tdXRleCk7Ci0KLQlwdGhyZWFkX211 dGV4X2luaXQoJmJvLT5jcHVfYWNjZXNzX211dGV4LCBOVUxMKTsKKwlyID0gYW1kZ3B1X2JvX2Ny ZWF0ZShkZXYsIHNpemUsIGFyZ3MuaGFuZGxlLCBidWZfaGFuZGxlKTsKKwlpZiAocikgeworCQlh bWRncHVfY2xvc2Vfa21zX2hhbmRsZShkZXYsIGFyZ3MuaGFuZGxlKTsKKwkJZ290byBvdXQ7CisJ fQogCisJcHRocmVhZF9tdXRleF9sb2NrKCZkZXYtPmJvX3RhYmxlX211dGV4KTsKKwlyID0gaGFu ZGxlX3RhYmxlX2luc2VydCgmZGV2LT5ib19oYW5kbGVzLCAoKmJ1Zl9oYW5kbGUpLT5oYW5kbGUs CisJCQkJKmJ1Zl9oYW5kbGUpOworCXB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZkZXYtPmJvX3RhYmxl X211dGV4KTsKIAlpZiAocikKLQkJYW1kZ3B1X2JvX2ZyZWUoYm8pOwotCWVsc2UKLQkJKmJ1Zl9o YW5kbGUgPSBibzsKLQorCQlhbWRncHVfYm9fZnJlZSgqYnVmX2hhbmRsZSk7CitvdXQ6CiAJcmV0 dXJuIHI7CiB9CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft ZC1nZngK