From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH] drm/i915: pass the vma to insert_entries Date: Thu, 22 Jun 2017 10:58:36 +0100 Message-ID: <20170622095836.6800-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF86C6E626 for ; Thu, 22 Jun 2017 09:58:38 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhlIHZtYSBhbHJlYWR5IGNvbnRhaW5zIG1vc3Qgb2YgdGhlIGluZm9ybWF0aW9uIHdlIG5lZWQg Zm9yIGluc2VydGlvbi4KQnV0IGFsc28gaW4gcHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgaHVn ZSBndHQgcGFnZXMsIGl0IHdvdWxkIGJlCnVzZWZ1bCB0byBrbm93IHRoZSBkZXRhaWxzIG9mIHRo ZSB2bWEsIHN1Y2ggdGhhdCB3ZSBjYW4gd2UgY2FuIGVhc2lseQpkZXRlcm1pbmUgdGhlIHBhZ2Ug c2l6ZXMgd2UgYXJlIGFsbG93ZWQgdG8gdXNlIHdoZW4gaW5zZXJ0aW5nIGludG8gdGhlCjQ4YiBQ UEdUVC4gIFRoaXMgaXMgZXNwZWNpYWxseSB0cnVlIGZvciA2NEsgd2hlcmUgd2UgY2FuJ3QganVz dAphcmJpdHJhcmlseSB1c2UgaXQsIHNpbmNlIHdlIHJlcXVpcmUgYWxpZ25pbmcvcGFkZGluZyB0 aGUgdm0gc3BhY2UgdG8KMk0sIHdoaWNoIHNvbWV0aW1lcyB3ZSBjYW4ndCBlbmZvcmNlIGluIHRo ZSB1cHBlciBsZXZlbHMuCgpTdWdnZXN0ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMt d2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBp bnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRl bC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51 az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAgICAgICAgICAgfCA2 OCArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5oICAgICAgICAgICB8ICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVz dHMvaTkxNV9nZW1fZ3R0LmMgfCAxMCArKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVz dHMvbW9ja19ndHQuYyAgICAgfCAgMyArLQogNCBmaWxlcyBjaGFuZ2VkLCAzOCBpbnNlcnRpb25z KCspLCA0NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4 IDYxZmM3ZTkwYTdkYS4uZGU2NzA4NGQ1ZmNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuYwpAQCAtMjA3LDggKzIwNyw3IEBAIHN0YXRpYyBpbnQgcHBndHRfYmluZF92bWEoc3RydWN0 IGk5MTVfdm1hICp2bWEsCiAJaWYgKHZtYS0+b2JqLT5ndF9ybykKIAkJcHRlX2ZsYWdzIHw9IFBU RV9SRUFEX09OTFk7CiAKLQl2bWEtPnZtLT5pbnNlcnRfZW50cmllcyh2bWEtPnZtLCB2bWEtPnBh Z2VzLCB2bWEtPm5vZGUuc3RhcnQsCi0JCQkJY2FjaGVfbGV2ZWwsIHB0ZV9mbGFncyk7CisJdm1h LT52bS0+aW5zZXJ0X2VudHJpZXModm1hLT52bSwgdm1hLCBjYWNoZV9sZXZlbCwgcHRlX2ZsYWdz KTsKIAogCXJldHVybiAwOwogfQpAQCAtOTA3LDM3ICs5MDYsMzUgQEAgZ2VuOF9wcGd0dF9pbnNl cnRfcHRlX2VudHJpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogfQogCiBzdGF0aWMg dm9pZCBnZW44X3BwZ3R0X2luc2VydF8zbHZsKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZt LAotCQkJCSAgIHN0cnVjdCBzZ190YWJsZSAqcGFnZXMsCi0JCQkJICAgdTY0IHN0YXJ0LAorCQkJ CSAgIHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQkJCSAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBj YWNoZV9sZXZlbCwKIAkJCQkgICB1MzIgdW51c2VkKQogewotCXN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCA9IGk5MTVfdm1fdG9fcHBndHQodm0pOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpw cGd0dCA9IGk5MTVfdm1fdG9fcHBndHQodm1hLT52bSk7CiAJc3RydWN0IHNndF9kbWEgaXRlciA9 IHsKLQkJLnNnID0gcGFnZXMtPnNnbCwKKwkJLnNnID0gdm1hLT5wYWdlcy0+c2dsLAogCQkuZG1h ID0gc2dfZG1hX2FkZHJlc3MoaXRlci5zZyksCiAJCS5tYXggPSBpdGVyLmRtYSArIGl0ZXIuc2ct Pmxlbmd0aCwKIAl9OwotCXN0cnVjdCBnZW44X2luc2VydF9wdGUgaWR4ID0gZ2VuOF9pbnNlcnRf cHRlKHN0YXJ0KTsKKwlzdHJ1Y3QgZ2VuOF9pbnNlcnRfcHRlIGlkeCA9IGdlbjhfaW5zZXJ0X3B0 ZSh2bWEtPm5vZGUuc3RhcnQpOwogCiAJZ2VuOF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXMocHBn dHQsICZwcGd0dC0+cGRwLCAmaXRlciwgJmlkeCwKIAkJCQkgICAgICBjYWNoZV9sZXZlbCk7CiB9 CiAKIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0XzRsdmwoc3RydWN0IGk5MTVfYWRkcmVz c19zcGFjZSAqdm0sCi0JCQkJICAgc3RydWN0IHNnX3RhYmxlICpwYWdlcywKLQkJCQkgICB1NjQg c3RhcnQsCisJCQkJICAgc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJCQkJICAgZW51bSBpOTE1X2Nh Y2hlX2xldmVsIGNhY2hlX2xldmVsLAogCQkJCSAgIHUzMiB1bnVzZWQpCiB7CiAJc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0ID0gaTkxNV92bV90b19wcGd0dCh2bSk7CiAJc3RydWN0IHNndF9k bWEgaXRlciA9IHsKLQkJLnNnID0gcGFnZXMtPnNnbCwKKwkJLnNnID0gdm1hLT5wYWdlcy0+c2ds LAogCQkuZG1hID0gc2dfZG1hX2FkZHJlc3MoaXRlci5zZyksCiAJCS5tYXggPSBpdGVyLmRtYSAr IGl0ZXIuc2ctPmxlbmd0aCwKIAl9OwogCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50 ZXIgKipwZHBzID0gcHBndHQtPnBtbDQucGRwczsKLQlzdHJ1Y3QgZ2VuOF9pbnNlcnRfcHRlIGlk eCA9IGdlbjhfaW5zZXJ0X3B0ZShzdGFydCk7CisJc3RydWN0IGdlbjhfaW5zZXJ0X3B0ZSBpZHgg PSBnZW44X2luc2VydF9wdGUodm1hLT5ub2RlLnN0YXJ0KTsKIAogCXdoaWxlIChnZW44X3BwZ3R0 X2luc2VydF9wdGVfZW50cmllcyhwcGd0dCwgcGRwc1tpZHgucG1sNGUrK10sICZpdGVyLAogCQkJ CQkgICAgICZpZHgsIGNhY2hlX2xldmVsKSkKQEAgLTE2MjEsMTMgKzE2MTgsMTIgQEAgc3RhdGlj IHZvaWQgZ2VuNl9wcGd0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSwKIH0KIAogc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKLQkJCQkgICAgICBzdHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzLAot CQkJCSAgICAgIHU2NCBzdGFydCwKKwkJCQkgICAgICBzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKIAkJ CQkgICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCiAJCQkJICAgICAgdTMy IGZsYWdzKQogewogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9IGk5MTVfdm1fdG9fcHBn dHQodm0pOwotCXVuc2lnbmVkIGZpcnN0X2VudHJ5ID0gc3RhcnQgPj4gUEFHRV9TSElGVDsKKwl1 bnNpZ25lZCBmaXJzdF9lbnRyeSA9IHZtYS0+bm9kZS5zdGFydCA+PiBQQUdFX1NISUZUOwogCXVu c2lnbmVkIGFjdF9wdCA9IGZpcnN0X2VudHJ5IC8gR0VONl9QVEVTOwogCXVuc2lnbmVkIGFjdF9w dGUgPSBmaXJzdF9lbnRyeSAlIEdFTjZfUFRFUzsKIAljb25zdCB1MzIgcHRlX2VuY29kZSA9IHZt LT5wdGVfZW5jb2RlKDAsIGNhY2hlX2xldmVsLCBmbGFncyk7CkBAIC0xNjM1LDcgKzE2MzEsNyBA QCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJl c3Nfc3BhY2UgKnZtLAogCWdlbjZfcHRlX3QgKnZhZGRyOwogCiAJdmFkZHIgPSBrbWFwX2F0b21p Y19weChwcGd0dC0+cGQucGFnZV90YWJsZVthY3RfcHRdKTsKLQlpdGVyLnNnID0gcGFnZXMtPnNn bDsKKwlpdGVyLnNnID0gdm1hLT5wYWdlcy0+c2dsOwogCWl0ZXIuZG1hID0gc2dfZG1hX2FkZHJl c3MoaXRlci5zZyk7CiAJaXRlci5tYXggPSBpdGVyLmRtYSArIGl0ZXIuc2ctPmxlbmd0aDsKIAlk byB7CkBAIC0yMDkwLDggKzIwODYsNyBAQCBzdGF0aWMgdm9pZCBnZW44X2dndHRfaW5zZXJ0X3Bh Z2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiB9CiAKIHN0YXRpYyB2b2lkIGdlbjhf Z2d0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKLQkJCQkg ICAgIHN0cnVjdCBzZ190YWJsZSAqc3QsCi0JCQkJICAgICB1NjQgc3RhcnQsCisJCQkJICAgICBz dHJ1Y3QgaTkxNV92bWEgKnZtYSwKIAkJCQkgICAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBsZXZl bCwKIAkJCQkgICAgIHUzMiB1bnVzZWQpCiB7CkBAIC0yMTAyLDggKzIwOTcsOCBAQCBzdGF0aWMg dm9pZCBnZW44X2dndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAq dm0sCiAJZG1hX2FkZHJfdCBhZGRyOwogCiAJZ3R0X2VudHJpZXMgPSAoZ2VuOF9wdGVfdCBfX2lv bWVtICopZ2d0dC0+Z3NtOwotCWd0dF9lbnRyaWVzICs9IHN0YXJ0ID4+IFBBR0VfU0hJRlQ7Ci0J Zm9yX2VhY2hfc2d0X2RtYShhZGRyLCBzZ3RfaXRlciwgc3QpCisJZ3R0X2VudHJpZXMgKz0gdm1h LT5ub2RlLnN0YXJ0ID4+IFBBR0VfU0hJRlQ7CisJZm9yX2VhY2hfc2d0X2RtYShhZGRyLCBzZ3Rf aXRlciwgdm1hLT5wYWdlcykKIAkJZ2VuOF9zZXRfcHRlKGd0dF9lbnRyaWVzKyssIHB0ZV9lbmNv ZGUgfCBhZGRyKTsKIAogCXdtYigpOwpAQCAtMjEzNywxNyArMjEzMiwxNiBAQCBzdGF0aWMgdm9p ZCBnZW42X2dndHRfaW5zZXJ0X3BhZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAg KiBtYXBwZWQgQkFSIChkZXZfcHJpdi0+bW0uZ3R0LT5ndHQpLgogICovCiBzdGF0aWMgdm9pZCBn ZW42X2dndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCi0J CQkJICAgICBzdHJ1Y3Qgc2dfdGFibGUgKnN0LAotCQkJCSAgICAgdTY0IHN0YXJ0LAorCQkJCSAg ICAgc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJCQkJICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwg bGV2ZWwsCiAJCQkJICAgICB1MzIgZmxhZ3MpCiB7CiAJc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCA9 IGk5MTVfdm1fdG9fZ2d0dCh2bSk7CiAJZ2VuNl9wdGVfdCBfX2lvbWVtICplbnRyaWVzID0gKGdl bjZfcHRlX3QgX19pb21lbSAqKWdndHQtPmdzbTsKLQl1bnNpZ25lZCBpbnQgaSA9IHN0YXJ0ID4+ IFBBR0VfU0hJRlQ7CisJdW5zaWduZWQgaW50IGkgPSB2bWEtPm5vZGUuc3RhcnQgPj4gUEFHRV9T SElGVDsKIAlzdHJ1Y3Qgc2d0X2l0ZXIgaXRlcjsKIAlkbWFfYWRkcl90IGFkZHI7Ci0JZm9yX2Vh Y2hfc2d0X2RtYShhZGRyLCBpdGVyLCBzdCkKKwlmb3JfZWFjaF9zZ3RfZG1hKGFkZHIsIGl0ZXIs IHZtYS0+cGFnZXMpCiAJCWlvd3JpdGUzMih2bS0+cHRlX2VuY29kZShhZGRyLCBsZXZlbCwgZmxh Z3MpLCAmZW50cmllc1tpKytdKTsKIAl3bWIoKTsKIApAQCAtMjIyOSw4ICsyMjIzLDcgQEAgc3Rh dGljIHZvaWQgYnh0X3Z0ZF9nZ3R0X2luc2VydF9wYWdlX19CS0woc3RydWN0IGk5MTVfYWRkcmVz c19zcGFjZSAqdm0sCiAKIHN0cnVjdCBpbnNlcnRfZW50cmllcyB7CiAJc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm07Ci0Jc3RydWN0IHNnX3RhYmxlICpzdDsKLQl1NjQgc3RhcnQ7CisJc3Ry dWN0IGk5MTVfdm1hICp2bWE7CiAJZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsOwogfTsKIApA QCAtMjIzOCwxOSArMjIzMSwxOCBAQCBzdGF0aWMgaW50IGJ4dF92dGRfZ2d0dF9pbnNlcnRfZW50 cmllc19fY2Iodm9pZCAqX2FyZykKIHsKIAlzdHJ1Y3QgaW5zZXJ0X2VudHJpZXMgKmFyZyA9IF9h cmc7CiAKLQlnZW44X2dndHRfaW5zZXJ0X2VudHJpZXMoYXJnLT52bSwgYXJnLT5zdCwgYXJnLT5z dGFydCwgYXJnLT5sZXZlbCwgMCk7CisJZ2VuOF9nZ3R0X2luc2VydF9lbnRyaWVzKGFyZy0+dm0s IGFyZy0+dm1hLCBhcmctPmxldmVsLCAwKTsKIAlieHRfdnRkX2dndHRfd2EoYXJnLT52bSk7CiAK IAlyZXR1cm4gMDsKIH0KIAogc3RhdGljIHZvaWQgYnh0X3Z0ZF9nZ3R0X2luc2VydF9lbnRyaWVz X19CS0woc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCi0JCQkJCSAgICAgc3RydWN0IHNn X3RhYmxlICpzdCwKLQkJCQkJICAgICB1NjQgc3RhcnQsCisJCQkJCSAgICAgc3RydWN0IGk5MTVf dm1hICp2bWEsCiAJCQkJCSAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsLAogCQkJCQkg ICAgIHUzMiB1bnVzZWQpCiB7Ci0Jc3RydWN0IGluc2VydF9lbnRyaWVzIGFyZyA9IHsgdm0sIHN0 LCBzdGFydCwgbGV2ZWwgfTsKKwlzdHJ1Y3QgaW5zZXJ0X2VudHJpZXMgYXJnID0geyB2bWEtPnZt LCB2bWEsIGxldmVsIH07CiAKIAlzdG9wX21hY2hpbmUoYnh0X3Z0ZF9nZ3R0X2luc2VydF9lbnRy aWVzX19jYiwgJmFyZywgTlVMTCk7CiB9CkBAIC0yMzE2LDE1ICsyMzA4LDE1IEBAIHN0YXRpYyB2 b2lkIGk5MTVfZ2d0dF9pbnNlcnRfcGFnZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwK IH0KIAogc3RhdGljIHZvaWQgaTkxNV9nZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2Fk ZHJlc3Nfc3BhY2UgKnZtLAotCQkJCSAgICAgc3RydWN0IHNnX3RhYmxlICpwYWdlcywKLQkJCQkg ICAgIHU2NCBzdGFydCwKKwkJCQkgICAgIHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQkJCSAgICAg ZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAogCQkJCSAgICAgdTMyIHVudXNlZCkK IHsKIAl1bnNpZ25lZCBpbnQgZmxhZ3MgPSAoY2FjaGVfbGV2ZWwgPT0gSTkxNV9DQUNIRV9OT05F KSA/CiAJCUFHUF9VU0VSX01FTU9SWSA6IEFHUF9VU0VSX0NBQ0hFRF9NRU1PUlk7CiAKLQlpbnRl bF9ndHRfaW5zZXJ0X3NnX2VudHJpZXMocGFnZXMsIHN0YXJ0ID4+IFBBR0VfU0hJRlQsIGZsYWdz KTsKKwlpbnRlbF9ndHRfaW5zZXJ0X3NnX2VudHJpZXModm1hLT5wYWdlcywgdm1hLT5ub2RlLnN0 YXJ0ID4+IFBBR0VfU0hJRlQsCisJCQkJICAgIGZsYWdzKTsKIH0KIAogc3RhdGljIHZvaWQgaTkx NV9nZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLApAQCAtMjM1 Myw4ICsyMzQ1LDcgQEAgc3RhdGljIGludCBnZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAq dm1hLAogCQlwdGVfZmxhZ3MgfD0gUFRFX1JFQURfT05MWTsKIAogCWludGVsX3J1bnRpbWVfcG1f Z2V0KGk5MTUpOwotCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sIHZtYS0+cGFnZXMs IHZtYS0+bm9kZS5zdGFydCwKLQkJCQljYWNoZV9sZXZlbCwgcHRlX2ZsYWdzKTsKKwl2bWEtPnZt LT5pbnNlcnRfZW50cmllcyh2bWEtPnZtLCB2bWEsIGNhY2hlX2xldmVsLCBwdGVfZmxhZ3MpOwog CWludGVsX3J1bnRpbWVfcG1fcHV0KGk5MTUpOwogCiAJLyoKQEAgLTI0MDcsMTYgKzIzOTgsMTMg QEAgc3RhdGljIGludCBhbGlhc2luZ19ndHRfYmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEs CiAJCQkJZ290byBlcnJfcGFnZXM7CiAJCX0KIAotCQlhcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJp ZXMoJmFwcGd0dC0+YmFzZSwKLQkJCQkJICAgIHZtYS0+cGFnZXMsIHZtYS0+bm9kZS5zdGFydCwK LQkJCQkJICAgIGNhY2hlX2xldmVsLCBwdGVfZmxhZ3MpOworCQlhcHBndHQtPmJhc2UuaW5zZXJ0 X2VudHJpZXMoJmFwcGd0dC0+YmFzZSwgdm1hLCBjYWNoZV9sZXZlbCwKKwkJCQkJICAgIHB0ZV9m bGFncyk7CiAJfQogCiAJaWYgKGZsYWdzICYgSTkxNV9WTUFfR0xPQkFMX0JJTkQpIHsKIAkJaW50 ZWxfcnVudGltZV9wbV9nZXQoaTkxNSk7Ci0JCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+ dm0sCi0JCQkJCXZtYS0+cGFnZXMsIHZtYS0+bm9kZS5zdGFydCwKLQkJCQkJY2FjaGVfbGV2ZWws IHB0ZV9mbGFncyk7CisJCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sIHZtYSwgY2Fj aGVfbGV2ZWwsIHB0ZV9mbGFncyk7CiAJCWludGVsX3J1bnRpbWVfcG1fcHV0KGk5MTUpOwogCX0K IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCAxYjJhNTZjM2U1ZDMuLmI0ZTNh YTdjMGNlMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTMxMyw4ICszMTMs NyBAQCBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlIHsKIAkJCSAgICBlbnVtIGk5MTVfY2FjaGVf bGV2ZWwgY2FjaGVfbGV2ZWwsCiAJCQkgICAgdTMyIGZsYWdzKTsKIAl2b2lkICgqaW5zZXJ0X2Vu dHJpZXMpKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAotCQkJICAgICAgIHN0cnVjdCBz Z190YWJsZSAqc3QsCi0JCQkgICAgICAgdTY0IHN0YXJ0LAorCQkJICAgICAgIHN0cnVjdCBpOTE1 X3ZtYSAqdm1hLAogCQkJICAgICAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwK IAkJCSAgICAgICB1MzIgZmxhZ3MpOwogCXZvaWQgKCpjbGVhbnVwKShzdHJ1Y3QgaTkxNV9hZGRy ZXNzX3NwYWNlICp2bSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVz dHMvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9n ZW1fZ3R0LmMKaW5kZXggNTA3MTBlM2YxY2FhLi42YjEzMmNhZmZhMTggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fZ3R0LmMKQEAgLTE5Nyw2ICsxOTcsOSBA QCBzdGF0aWMgaW50IGxvd2xldmVsX2hvbGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUs CiB7CiAJSTkxNV9STkRfU1RBVEUoc2VlZF9wcm5nKTsKIAl1bnNpZ25lZCBpbnQgc2l6ZTsKKwlz dHJ1Y3QgaTkxNV92bWEgbW9ja192bWE7CisKKwltZW1zZXQoJm1vY2tfdm1hLCAwLCBzaXplb2Yo c3RydWN0IGk5MTVfdm1hKSk7CiAKIAkvKiBLZWVwIGNyZWF0aW5nIGxhcmdlciBvYmplY3RzIHVu dGlsIG9uZSBjYW5ub3QgZml0IGludG8gdGhlIGhvbGUgKi8KIAlmb3IgKHNpemUgPSAxMjsgKGhv bGVfZW5kIC0gaG9sZV9zdGFydCkgPj4gc2l6ZTsgc2l6ZSsrKSB7CkBAIC0yNTUsOCArMjU4LDEx IEBAIHN0YXRpYyBpbnQgbG93bGV2ZWxfaG9sZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSwKIAkJCSAgICB2bS0+YWxsb2NhdGVfdmFfcmFuZ2Uodm0sIGFkZHIsIEJJVF9VTEwoc2l6ZSkp KQogCQkJCWJyZWFrOwogCi0JCQl2bS0+aW5zZXJ0X2VudHJpZXModm0sIG9iai0+bW0ucGFnZXMs IGFkZHIsCi0JCQkJCSAgIEk5MTVfQ0FDSEVfTk9ORSwgMCk7CisJCQltb2NrX3ZtYS5wYWdlcyA9 IG9iai0+bW0ucGFnZXM7CisJCQltb2NrX3ZtYS5ub2RlLnNpemUgPSBCSVRfVUxMKHNpemUpOwor CQkJbW9ja192bWEubm9kZS5zdGFydCA9IGFkZHI7CisKKwkJCXZtLT5pbnNlcnRfZW50cmllcyh2 bSwgJm1vY2tfdm1hLCBJOTE1X0NBQ0hFX05PTkUsIDApOwogCQl9CiAJCWNvdW50ID0gbjsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ3R0LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19ndHQuYwppbmRleCBhNjEzMDljN2Ni M2UuLmYyMTE4Y2Y1MzVhMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRl c3RzL21vY2tfZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tf Z3R0LmMKQEAgLTMzLDggKzMzLDcgQEAgc3RhdGljIHZvaWQgbW9ja19pbnNlcnRfcGFnZShzdHJ1 Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIH0KIAogc3RhdGljIHZvaWQgbW9ja19pbnNlcnRf ZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKLQkJCQlzdHJ1Y3Qgc2dfdGFi bGUgKnN0LAotCQkJCXU2NCBzdGFydCwKKwkJCQlzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKIAkJCQll bnVtIGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwsIHUzMiBmbGFncykKIHsKIH0KLS0gCjIuOS40Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK