From mboxrd@z Thu Jan 1 00:00:00 1970 From: jeff.mcgee@intel.com Subject: [RFC 3/8] drm/i915: Move engine reset prepare/finish to backends Date: Wed, 21 Mar 2018 10:26:20 -0700 Message-ID: <20180321172625.6415-4-jeff.mcgee@intel.com> References: <20180321172625.6415-1-jeff.mcgee@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id BDC2E6E964 for ; Wed, 21 Mar 2018 17:41:19 +0000 (UTC) In-Reply-To: <20180321172625.6415-1-jeff.mcgee@intel.com> 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 Cc: ben@bwidawsk.net, kalyan.kondapally@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpJbiBwcmVwYXJh dGlvbiB0byBtb3JlIGNhcmVmdWxseSBoYW5kbGluZyBpbmNvbXBsZXRlIHByZWVtcHRpb24gZHVy aW5nCnJlc2V0IGJ5IGV4ZWNsaXN0cywgd2UgbW92ZSB0aGUgZXhpc3RpbmcgY29kZSB3aG9sZXNh bGUgdG8gdGhlIGJhY2tlbmRzCnVuZGVyIGEgY291cGxlIG9mIG5ldyByZXNldCB2ZnVuY3MuCgpT aWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6 IE1pY2hhxYIgV2luaWFyc2tpIDxtaWNoYWwud2luaWFyc2tpQGludGVsLmNvbT4KQ0M6IE1pY2hl bCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+CkNjOiBKZWZmIE1jR2VlIDxqZWZm Lm1jZ2VlQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAg ICAgICAgfCA0MiArKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgNTIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr Ky0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAyMCArKysrKysr KysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgOSArKysr LS0KIDQgZmlsZXMgY2hhbmdlZCwgNzggaW5zZXJ0aW9ucygrKSwgNDUgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggODAyZGY4ZTFhNTQ0Li4zOGY3MTYwZDk5YzkgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjkxNyw3ICsyOTE3LDcgQEAgc3RhdGljIGJvb2wg ZW5naW5lX3N0YWxsZWQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogc3RydWN0IGk5 MTVfcmVxdWVzdCAqCiBpOTE1X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGk5MTVfcmVxdWVzdCAqcmVxdWVzdCA9IE5V TEw7CisJc3RydWN0IGk5MTVfcmVxdWVzdCAqcmVxdWVzdDsKIAogCS8qCiAJICogRHVyaW5nIHRo ZSByZXNldCBzZXF1ZW5jZSwgd2UgbXVzdCBwcmV2ZW50IHRoZSBlbmdpbmUgZnJvbQpAQCAtMjk0 MCw0MCArMjk0MCw3IEBAIGk5MTVfZ2VtX3Jlc2V0X3ByZXBhcmVfZW5naW5lKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkgKi8KIAlrdGhyZWFkX3BhcmsoZW5naW5lLT5icmVhZGNy dW1icy5zaWduYWxlcik7CiAKLQkvKgotCSAqIFByZXZlbnQgcmVxdWVzdCBzdWJtaXNzaW9uIHRv IHRoZSBoYXJkd2FyZSB1bnRpbCB3ZSBoYXZlCi0JICogY29tcGxldGVkIHRoZSByZXNldCBpbiBp OTE1X2dlbV9yZXNldF9maW5pc2goKS4gSWYgYSByZXF1ZXN0Ci0JICogaXMgY29tcGxldGVkIGJ5 IG9uZSBlbmdpbmUsIGl0IG1heSB0aGVuIHF1ZXVlIGEgcmVxdWVzdAotCSAqIHRvIGEgc2Vjb25k IHZpYSBpdHMgZXhlY2xpc3RzLT50YXNrbGV0ICpqdXN0KiBhcyB3ZSBhcmUKLQkgKiBjYWxsaW5n IGVuZ2luZS0+aW5pdF9odygpIGFuZCBhbHNvIHdyaXRpbmcgdGhlIEVMU1AuCi0JICogVHVybmlu ZyBvZmYgdGhlIGV4ZWNsaXN0cy0+dGFza2xldCB1bnRpbCB0aGUgcmVzZXQgaXMgb3ZlcgotCSAq IHByZXZlbnRzIHRoZSByYWNlLgotCSAqCi0JICogTm90ZSB0aGF0IHRoaXMgbmVlZHMgdG8gYmUg YSBzaW5nbGUgYXRvbWljIG9wZXJhdGlvbiBvbiB0aGUKLQkgKiB0YXNrbGV0IChmbHVzaCBleGlz dGluZyB0YXNrcywgcHJldmVudCBuZXcgdGFza3MpIHRvIHByZXZlbnQKLQkgKiBhIHJhY2UgYmV0 d2VlbiByZXNldCBhbmQgc2V0LXdlZGdlZC4gSXQgaXMgbm90LCBzbyB3ZSBkbyB0aGUgYmVzdAot CSAqIHdlIGNhbiBhdG0gYW5kIG1ha2Ugc3VyZSB3ZSBkb24ndCBsb2NrIHRoZSBtYWNoaW5lIHVw IGluIHRoZSBtb3JlCi0JICogY29tbW9uIGNhc2Ugb2YgcmVjdXJzaXZlbHkgYmVpbmcgY2FsbGVk IGZyb20gc2V0LXdlZGdlZCBmcm9tIGluc2lkZQotCSAqIGk5MTVfcmVzZXQuCi0JICovCi0JaWYg KCFhdG9taWNfcmVhZCgmZW5naW5lLT5leGVjbGlzdHMudGFza2xldC5jb3VudCkpCi0JCXRhc2ts ZXRfa2lsbCgmZW5naW5lLT5leGVjbGlzdHMudGFza2xldCk7Ci0JdGFza2xldF9kaXNhYmxlKCZl bmdpbmUtPmV4ZWNsaXN0cy50YXNrbGV0KTsKLQotCS8qCi0JICogV2UncmUgdXNpbmcgd29ya2Vy IHRvIHF1ZXVlIHByZWVtcHRpb24gcmVxdWVzdHMgZnJvbSB0aGUgdGFza2xldCBpbgotCSAqIEd1 QyBzdWJtaXNzaW9uIG1vZGUuCi0JICogRXZlbiB0aG91Z2ggdGFza2xldCB3YXMgZGlzYWJsZWQs IHdlIG1heSBzdGlsbCBoYXZlIGEgd29ya2VyIHF1ZXVlZC4KLQkgKiBMZXQncyBtYWtlIHN1cmUg dGhhdCBhbGwgd29ya2VycyBzY2hlZHVsZWQgYmVmb3JlIGRpc2FibGluZyB0aGUKLQkgKiB0YXNr bGV0IGFyZSBjb21wbGV0ZWQgYmVmb3JlIGNvbnRpbnVpbmcgd2l0aCB0aGUgcmVzZXQuCi0JICov Ci0JaWYgKGVuZ2luZS0+aTkxNS0+Z3VjLnByZWVtcHRfd3EpCi0JCWZsdXNoX3dvcmtxdWV1ZShl bmdpbmUtPmk5MTUtPmd1Yy5wcmVlbXB0X3dxKTsKLQotCWlmIChlbmdpbmUtPmlycV9zZXFub19i YXJyaWVyKQotCQllbmdpbmUtPmlycV9zZXFub19iYXJyaWVyKGVuZ2luZSk7Ci0KLQlyZXF1ZXN0 ID0gaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVzdChlbmdpbmUpOworCXJlcXVlc3QgPSBlbmdp bmUtPnJlc2V0LnByZXBhcmUoZW5naW5lKTsKIAlpZiAocmVxdWVzdCAmJiByZXF1ZXN0LT5mZW5j ZS5lcnJvciA9PSAtRUlPKQogCQlyZXF1ZXN0ID0gRVJSX1BUUigtRUlPKTsgLyogUHJldmlvdXMg cmVzZXQgZmFpbGVkISAqLwogCkBAIC0zMTIwLDcgKzMwODcsNyBAQCB2b2lkIGk5MTVfZ2VtX3Jl c2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJfQogCiAJLyogU2V0 dXAgdGhlIENTIHRvIHJlc3VtZSBmcm9tIHRoZSBicmVhZGNydW1iIG9mIHRoZSBodW5nIHJlcXVl c3QgKi8KLQllbmdpbmUtPnJlc2V0X2h3KGVuZ2luZSwgcmVxdWVzdCk7CisJZW5naW5lLT5yZXNl dC5yZXNldChlbmdpbmUsIHJlcXVlc3QpOwogfQogCiB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKQEAgLTMxNzIsNyArMzEzOSw4IEBAIHZvaWQg aTkxNV9nZW1fcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiB2b2lk IGk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogewotCXRhc2tsZXRfZW5hYmxlKCZlbmdpbmUtPmV4ZWNsaXN0cy50YXNrbGV0KTsKKwll bmdpbmUtPnJlc2V0LmZpbmlzaChlbmdpbmUpOworCiAJa3RocmVhZF91bnBhcmsoZW5naW5lLT5i cmVhZGNydW1icy5zaWduYWxlcik7CiAKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChlbmdp bmUtPmk5MTUsIEZPUkNFV0FLRV9BTEwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAw YmZhZWI1NmI4YzcuLmY2NjJhOTUyNDIzMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAg LTE2NjMsNiArMTY2Myw0NCBAQCBzdGF0aWMgaW50IGdlbjlfaW5pdF9yZW5kZXJfcmluZyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJcmV0dXJuIGluaXRfd29ya2Fyb3VuZHNfcmlu ZyhlbmdpbmUpOwogfQogCitzdGF0aWMgc3RydWN0IGk5MTVfcmVxdWVzdCAqCitleGVjbGlzdHNf cmVzZXRfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJc3RydWN0 IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKiBjb25zdCBleGVjbGlzdHMgPSAmZW5naW5lLT5leGVj bGlzdHM7CisKKwkvKgorCSAqIFByZXZlbnQgcmVxdWVzdCBzdWJtaXNzaW9uIHRvIHRoZSBoYXJk d2FyZSB1bnRpbCB3ZSBoYXZlCisJICogY29tcGxldGVkIHRoZSByZXNldCBpbiBpOTE1X2dlbV9y ZXNldF9maW5pc2goKS4gSWYgYSByZXF1ZXN0CisJICogaXMgY29tcGxldGVkIGJ5IG9uZSBlbmdp bmUsIGl0IG1heSB0aGVuIHF1ZXVlIGEgcmVxdWVzdAorCSAqIHRvIGEgc2Vjb25kIHZpYSBpdHMg ZXhlY2xpc3RzLT50YXNrbGV0ICpqdXN0KiBhcyB3ZSBhcmUKKwkgKiBjYWxsaW5nIGVuZ2luZS0+ aW5pdF9odygpIGFuZCBhbHNvIHdyaXRpbmcgdGhlIEVMU1AuCisJICogVHVybmluZyBvZmYgdGhl IGV4ZWNsaXN0cy0+dGFza2xldCB1bnRpbCB0aGUgcmVzZXQgaXMgb3ZlcgorCSAqIHByZXZlbnRz IHRoZSByYWNlLgorCSAqCisJICogTm90ZSB0aGF0IHRoaXMgbmVlZHMgdG8gYmUgYSBzaW5nbGUg YXRvbWljIG9wZXJhdGlvbiBvbiB0aGUKKwkgKiB0YXNrbGV0IChmbHVzaCBleGlzdGluZyB0YXNr cywgcHJldmVudCBuZXcgdGFza3MpIHRvIHByZXZlbnQKKwkgKiBhIHJhY2UgYmV0d2VlbiByZXNl dCBhbmQgc2V0LXdlZGdlZC4gSXQgaXMgbm90LCBzbyB3ZSBkbyB0aGUgYmVzdAorCSAqIHdlIGNh biBhdG0gYW5kIG1ha2Ugc3VyZSB3ZSBkb24ndCBsb2NrIHRoZSBtYWNoaW5lIHVwIGluIHRoZSBt b3JlCisJICogY29tbW9uIGNhc2Ugb2YgcmVjdXJzaXZlbHkgYmVpbmcgY2FsbGVkIGZyb20gc2V0 LXdlZGdlZCBmcm9tIGluc2lkZQorCSAqIGk5MTVfcmVzZXQuCisJICovCisJaWYgKCFhdG9taWNf cmVhZCgmZXhlY2xpc3RzLT50YXNrbGV0LmNvdW50KSkKKwkJdGFza2xldF9raWxsKCZleGVjbGlz dHMtPnRhc2tsZXQpOworCXRhc2tsZXRfZGlzYWJsZSgmZXhlY2xpc3RzLT50YXNrbGV0KTsKKwor CS8qCisJICogV2UncmUgdXNpbmcgd29ya2VyIHRvIHF1ZXVlIHByZWVtcHRpb24gcmVxdWVzdHMg ZnJvbSB0aGUgdGFza2xldCBpbgorCSAqIEd1QyBzdWJtaXNzaW9uIG1vZGUuCisJICogRXZlbiB0 aG91Z2ggdGFza2xldCB3YXMgZGlzYWJsZWQsIHdlIG1heSBzdGlsbCBoYXZlIGEgd29ya2VyIHF1 ZXVlZC4KKwkgKiBMZXQncyBtYWtlIHN1cmUgdGhhdCBhbGwgd29ya2VycyBzY2hlZHVsZWQgYmVm b3JlIGRpc2FibGluZyB0aGUKKwkgKiB0YXNrbGV0IGFyZSBjb21wbGV0ZWQgYmVmb3JlIGNvbnRp bnVpbmcgd2l0aCB0aGUgcmVzZXQuCisJICovCisJaWYgKGVuZ2luZS0+aTkxNS0+Z3VjLnByZWVt cHRfd3EpCisJCWZsdXNoX3dvcmtxdWV1ZShlbmdpbmUtPmk5MTUtPmd1Yy5wcmVlbXB0X3dxKTsK KworCXJldHVybiBpOTE1X2dlbV9maW5kX2FjdGl2ZV9yZXF1ZXN0KGVuZ2luZSk7Cit9CisKIHN0 YXRpYyB2b2lkIHJlc2V0X2lycShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwpAQCAtMTY5 Miw4ICsxNzMwLDggQEAgc3RhdGljIHZvaWQgcmVzZXRfaXJxKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKIAljbGVhcl9iaXQoRU5HSU5FX0lSUV9FWEVDTElTVCwgJmVuZ2luZS0+aXJx X3Bvc3RlZCk7CiB9CiAKLXN0YXRpYyB2b2lkIHJlc2V0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSwKLQkJCSAgICAgIHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVl c3QpCitzdGF0aWMgdm9pZCBleGVjbGlzdHNfcmVzZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lLAorCQkJICAgIHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJc3RydWN0 IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKiBjb25zdCBleGVjbGlzdHMgPSAmZW5naW5lLT5leGVj bGlzdHM7CiAJc3RydWN0IGludGVsX2NvbnRleHQgKmNlOwpAQCAtMTc2Niw2ICsxODA0LDExIEBA IHN0YXRpYyB2b2lkIHJlc2V0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSwKIAl1bndpbmRfd2FfdGFpbChyZXF1ZXN0KTsKIH0KIAorc3RhdGljIHZvaWQgZXhlY2xp c3RzX3Jlc2V0X2ZpbmlzaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJdGFz a2xldF9lbmFibGUoJmVuZ2luZS0+ZXhlY2xpc3RzLnRhc2tsZXQpOworfQorCiBzdGF0aWMgaW50 IGludGVsX2xvZ2ljYWxfcmluZ19lbWl0X3BkcHMoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEpCiB7 CiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gcnEtPmN0eC0+cHBndHQ7CkBAIC0yMDkw LDcgKzIxMzMsMTAgQEAgbG9naWNhbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKIHsKIAkvKiBEZWZhdWx0IHZmdW5jcyB3aGljaCBjYW4gYmUgb3Zl cnJpZGVuIGJ5IGVhY2ggZW5naW5lLiAqLwogCWVuZ2luZS0+aW5pdF9odyA9IGdlbjhfaW5pdF9j b21tb25fcmluZzsKLQllbmdpbmUtPnJlc2V0X2h3ID0gcmVzZXRfY29tbW9uX3Jpbmc7CisKKwll bmdpbmUtPnJlc2V0LnByZXBhcmUgPSBleGVjbGlzdHNfcmVzZXRfcHJlcGFyZTsKKwllbmdpbmUt PnJlc2V0LnJlc2V0ID0gZXhlY2xpc3RzX3Jlc2V0OworCWVuZ2luZS0+cmVzZXQuZmluaXNoID0g ZXhlY2xpc3RzX3Jlc2V0X2ZpbmlzaDsKIAogCWVuZ2luZS0+Y29udGV4dF9waW4gPSBleGVjbGlz dHNfY29udGV4dF9waW47CiAJZW5naW5lLT5jb250ZXh0X3VucGluID0gZXhlY2xpc3RzX2NvbnRl eHRfdW5waW47CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggMDRk OWQ5YTk0NmE3Li5lZWJjYzg3N2VmNjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmMKQEAgLTUzMCw4ICs1MzAsMTYgQEAgc3RhdGljIGludCBpbml0X3JpbmdfY29tbW9u KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0 aWMgdm9pZCByZXNldF9yaW5nX2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUs Ci0JCQkgICAgICBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0KQorc3RhdGljIHN0cnVjdCBp OTE1X3JlcXVlc3QgKnJlc2V0X3ByZXBhcmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQoreworCWlmIChlbmdpbmUtPmlycV9zZXFub19iYXJyaWVyKQorCQllbmdpbmUtPmlycV9zZXFu b19iYXJyaWVyKGVuZ2luZSk7CisKKwlyZXR1cm4gaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVz dChlbmdpbmUpOworfQorCitzdGF0aWMgdm9pZCByZXNldF9yaW5nKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSwKKwkJICAgICAgIHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVlc3QpCiB7 CiAJLyoKIAkgKiBSQzYgbXVzdCBiZSBwcmV2ZW50ZWQgdW50aWwgdGhlIHJlc2V0IGlzIGNvbXBs ZXRlIGFuZCB0aGUgZW5naW5lCkBAIC01OTUsNiArNjAzLDEwIEBAIHN0YXRpYyB2b2lkIHJlc2V0 X3JpbmdfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAl9CiB9CiAKK3N0 YXRpYyB2b2lkIHJlc2V0X2ZpbmlzaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7 Cit9CisKIHN0YXRpYyBpbnQgaW50ZWxfcmNzX2N0eF9pbml0KHN0cnVjdCBpOTE1X3JlcXVlc3Qg KnJxKQogewogCWludCByZXQ7CkBAIC0xOTg3LDcgKzE5OTksOSBAQCBzdGF0aWMgdm9pZCBpbnRl bF9yaW5nX2RlZmF1bHRfdmZ1bmNzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IAlpbnRlbF9yaW5nX2luaXRfc2VtYXBob3JlcyhkZXZfcHJpdiwgZW5naW5lKTsKIAogCWVuZ2lu ZS0+aW5pdF9odyA9IGluaXRfcmluZ19jb21tb247Ci0JZW5naW5lLT5yZXNldF9odyA9IHJlc2V0 X3JpbmdfY29tbW9uOworCWVuZ2luZS0+cmVzZXQucHJlcGFyZSA9IHJlc2V0X3ByZXBhcmU7CisJ ZW5naW5lLT5yZXNldC5yZXNldCA9IHJlc2V0X3Jpbmc7CisJZW5naW5lLT5yZXNldC5maW5pc2gg PSByZXNldF9maW5pc2g7CiAKIAllbmdpbmUtPmNvbnRleHRfcGluID0gaW50ZWxfcmluZ19jb250 ZXh0X3BpbjsKIAllbmdpbmUtPmNvbnRleHRfdW5waW4gPSBpbnRlbF9yaW5nX2NvbnRleHRfdW5w aW47CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggMWY1MDcyN2E1 ZGRiLi5lMjY4MTMwM2NlMjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmgKQEAgLTQxOCw4ICs0MTgsMTMgQEAgc3RydWN0IGludGVsX2VuZ2luZV9jcyB7CiAJdm9pZAkJ KCppcnFfZGlzYWJsZSkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAogCWludAkJ KCppbml0X2h3KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwotCXZvaWQJCSgqcmVz ZXRfaHcpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKLQkJCQkgICAgc3RydWN0IGk5 MTVfcmVxdWVzdCAqcnEpOworCisJc3RydWN0IHsKKwkJc3RydWN0IGk5MTVfcmVxdWVzdCAqKCpw cmVwYXJlKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworCQl2b2lkICgqcmVzZXQp KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKKwkJCSAgICAgIHN0cnVjdCBpOTE1X3Jl cXVlc3QgKnJxKTsKKwkJdm9pZCAoKmZpbmlzaCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKTsKKwl9IHJlc2V0OwogCiAJdm9pZAkJKCpwYXJrKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpOwogCXZvaWQJCSgqdW5wYXJrKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpOwotLSAKMi4xNi4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK