From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 11/71] drm/i915: Move engine reset prepare/finish to backends Date: Thu, 3 May 2018 07:36:57 +0100 Message-ID: <20180503063757.22238-11-chris@chris-wilson.co.uk> References: <20180503063757.22238-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id DDC776E6B5 for ; Thu, 3 May 2018 06:38:31 +0000 (UTC) In-Reply-To: <20180503063757.22238-1-chris@chris-wilson.co.uk> 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 SW4gcHJlcGFyYXRpb24gdG8gbW9yZSBjYXJlZnVsbHkgaGFuZGxpbmcgaW5jb21wbGV0ZSBwcmVl bXB0aW9uIGR1cmluZwpyZXNldCBieSBleGVjbGlzdHMsIHdlIG1vdmUgdGhlIGV4aXN0aW5nIGNv ZGUgd2hvbGVzYWxlIHRvIHRoZSBiYWNrZW5kcwp1bmRlciBhIGNvdXBsZSBvZiBuZXcgcmVzZXQg dmZ1bmNzLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u Y28udWs+CkNjOiBNaWNoYcWCIFdpbmlhcnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+ CkNDOiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgpDYzogSmVmZiBN Y0dlZSA8amVmZi5tY2dlZUBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBKZWZmIE1jR2VlIDxqZWZm Lm1jZ2VlQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAg ICAgICAgfCA0NyArKystLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMgICAgICAgIHwgNTkgKysrKysrKysrKysrKysrKysrKysrKystLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgMjMgKysrKysrKystLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDkgKysrLQogNCBmaWxlcyBjaGFuZ2Vk LCA4OCBpbnNlcnRpb25zKCspLCA1MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwppbmRleCA4YThhNzdjMmVmNWYuLjY5NDQ3MWZiYTc3NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCkBAIC0zMDAyLDcgKzMwMDIsNyBAQCBpOTE1X2dlbV9maW5kX2FjdGl2ZV9yZXF1ZXN0KHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHN0cnVjdCBpOTE1X3JlcXVlc3QgKgogaTkx NV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQogewotCXN0cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVlc3QgPSBOVUxMOworCXN0cnVjdCBpOTE1 X3JlcXVlc3QgKnJlcXVlc3Q7CiAKIAkvKgogCSAqIER1cmluZyB0aGUgcmVzZXQgc2VxdWVuY2Us IHdlIG11c3QgcHJldmVudCB0aGUgZW5naW5lIGZyb20KQEAgLTMwMjUsNDAgKzMwMjUsNyBAQCBp OTE1X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiAJICovCiAJa3RocmVhZF9wYXJrKGVuZ2luZS0+YnJlYWRjcnVtYnMuc2lnbmFsZXIpOwog Ci0JLyoKLQkgKiBQcmV2ZW50IHJlcXVlc3Qgc3VibWlzc2lvbiB0byB0aGUgaGFyZHdhcmUgdW50 aWwgd2UgaGF2ZQotCSAqIGNvbXBsZXRlZCB0aGUgcmVzZXQgaW4gaTkxNV9nZW1fcmVzZXRfZmlu aXNoKCkuIElmIGEgcmVxdWVzdAotCSAqIGlzIGNvbXBsZXRlZCBieSBvbmUgZW5naW5lLCBpdCBt YXkgdGhlbiBxdWV1ZSBhIHJlcXVlc3QKLQkgKiB0byBhIHNlY29uZCB2aWEgaXRzIGV4ZWNsaXN0 cy0+dGFza2xldCAqanVzdCogYXMgd2UgYXJlCi0JICogY2FsbGluZyBlbmdpbmUtPmluaXRfaHco KSBhbmQgYWxzbyB3cml0aW5nIHRoZSBFTFNQLgotCSAqIFR1cm5pbmcgb2ZmIHRoZSBleGVjbGlz dHMtPnRhc2tsZXQgdW50aWwgdGhlIHJlc2V0IGlzIG92ZXIKLQkgKiBwcmV2ZW50cyB0aGUgcmFj ZS4KLQkgKgotCSAqIE5vdGUgdGhhdCB0aGlzIG5lZWRzIHRvIGJlIGEgc2luZ2xlIGF0b21pYyBv cGVyYXRpb24gb24gdGhlCi0JICogdGFza2xldCAoZmx1c2ggZXhpc3RpbmcgdGFza3MsIHByZXZl bnQgbmV3IHRhc2tzKSB0byBwcmV2ZW50Ci0JICogYSByYWNlIGJldHdlZW4gcmVzZXQgYW5kIHNl dC13ZWRnZWQuIEl0IGlzIG5vdCwgc28gd2UgZG8gdGhlIGJlc3QKLQkgKiB3ZSBjYW4gYXRtIGFu ZCBtYWtlIHN1cmUgd2UgZG9uJ3QgbG9jayB0aGUgbWFjaGluZSB1cCBpbiB0aGUgbW9yZQotCSAq IGNvbW1vbiBjYXNlIG9mIHJlY3Vyc2l2ZWx5IGJlaW5nIGNhbGxlZCBmcm9tIHNldC13ZWRnZWQg ZnJvbSBpbnNpZGUKLQkgKiBpOTE1X3Jlc2V0LgotCSAqLwotCWlmICghYXRvbWljX3JlYWQoJmVu Z2luZS0+ZXhlY2xpc3RzLnRhc2tsZXQuY291bnQpKQotCQl0YXNrbGV0X2tpbGwoJmVuZ2luZS0+ ZXhlY2xpc3RzLnRhc2tsZXQpOwotCXRhc2tsZXRfZGlzYWJsZSgmZW5naW5lLT5leGVjbGlzdHMu dGFza2xldCk7Ci0KLQkvKgotCSAqIFdlJ3JlIHVzaW5nIHdvcmtlciB0byBxdWV1ZSBwcmVlbXB0 aW9uIHJlcXVlc3RzIGZyb20gdGhlIHRhc2tsZXQgaW4KLQkgKiBHdUMgc3VibWlzc2lvbiBtb2Rl LgotCSAqIEV2ZW4gdGhvdWdoIHRhc2tsZXQgd2FzIGRpc2FibGVkLCB3ZSBtYXkgc3RpbGwgaGF2 ZSBhIHdvcmtlciBxdWV1ZWQuCi0JICogTGV0J3MgbWFrZSBzdXJlIHRoYXQgYWxsIHdvcmtlcnMg c2NoZWR1bGVkIGJlZm9yZSBkaXNhYmxpbmcgdGhlCi0JICogdGFza2xldCBhcmUgY29tcGxldGVk IGJlZm9yZSBjb250aW51aW5nIHdpdGggdGhlIHJlc2V0LgotCSAqLwotCWlmIChlbmdpbmUtPmk5 MTUtPmd1Yy5wcmVlbXB0X3dxKQotCQlmbHVzaF93b3JrcXVldWUoZW5naW5lLT5pOTE1LT5ndWMu cHJlZW1wdF93cSk7Ci0KLQlpZiAoZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcikKLQkJZW5naW5l LT5pcnFfc2Vxbm9fYmFycmllcihlbmdpbmUpOwotCi0JcmVxdWVzdCA9IGk5MTVfZ2VtX2ZpbmRf YWN0aXZlX3JlcXVlc3QoZW5naW5lKTsKKwlyZXF1ZXN0ID0gZW5naW5lLT5yZXNldC5wcmVwYXJl KGVuZ2luZSk7CiAJaWYgKHJlcXVlc3QgJiYgcmVxdWVzdC0+ZmVuY2UuZXJyb3IgPT0gLUVJTykK IAkJcmVxdWVzdCA9IEVSUl9QVFIoLUVJTyk7IC8qIFByZXZpb3VzIHJlc2V0IGZhaWxlZCEgKi8K IApAQCAtMzIwOSwxMyArMzE3Niw4IEBAIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAlpZiAocmVxdWVzdCkKIAkJcmVxdWVzdCA9IGk5 MTVfZ2VtX3Jlc2V0X3JlcXVlc3QoZW5naW5lLCByZXF1ZXN0LCBzdGFsbGVkKTsKIAotCWlmIChy ZXF1ZXN0KSB7Ci0JCURSTV9ERUJVR19EUklWRVIoInJlc2V0dGluZyAlcyB0byByZXN0YXJ0IGZy b20gdGFpbCBvZiByZXF1ZXN0IDB4JXhcbiIsCi0JCQkJIGVuZ2luZS0+bmFtZSwgcmVxdWVzdC0+ Z2xvYmFsX3NlcW5vKTsKLQl9Ci0KIAkvKiBTZXR1cCB0aGUgQ1MgdG8gcmVzdW1lIGZyb20gdGhl IGJyZWFkY3J1bWIgb2YgdGhlIGh1bmcgcmVxdWVzdCAqLwotCWVuZ2luZS0+cmVzZXRfaHcoZW5n aW5lLCByZXF1ZXN0KTsKKwllbmdpbmUtPnJlc2V0LnJlc2V0KGVuZ2luZSwgcmVxdWVzdCk7CiB9 CiAKIHZvaWQgaTkxNV9nZW1fcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LApAQCAtMzI2Myw3ICszMjI1LDggQEAgdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIHZvaWQgaTkxNV9nZW1fcmVzZXRfZmluaXNoX2VuZ2lu ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JdGFza2xldF9lbmFibGUoJmVu Z2luZS0+ZXhlY2xpc3RzLnRhc2tsZXQpOworCWVuZ2luZS0+cmVzZXQuZmluaXNoKGVuZ2luZSk7 CisKIAlrdGhyZWFkX3VucGFyayhlbmdpbmUtPmJyZWFkY3J1bWJzLnNpZ25hbGVyKTsKIAogCWlu dGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGVuZ2luZS0+aTkxNSwgRk9SQ0VXQUtFX0FMTCk7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDYwNjdkMWRjMDZlZi4uZDIzMzg2ODIzZDk0IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTgyOSw4ICsxODI5LDQ4IEBAIHN0YXRpYyBp bnQgZ2VuOV9pbml0X3JlbmRlcl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK IAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgcmVzZXRfY29tbW9uX3Jpbmcoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lLAotCQkJICAgICAgc3RydWN0IGk5MTVfcmVxdWVzdCAqcmVx dWVzdCkKK3N0YXRpYyBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICoKK2V4ZWNsaXN0c19yZXNldF9wcmVw YXJlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cyA9ICZlbmdpbmUtPmV4ZWNsaXN0czsKKwor CUdFTV9UUkFDRSgiJXNcbiIsIGVuZ2luZS0+bmFtZSk7CisKKwkvKgorCSAqIFByZXZlbnQgcmVx dWVzdCBzdWJtaXNzaW9uIHRvIHRoZSBoYXJkd2FyZSB1bnRpbCB3ZSBoYXZlCisJICogY29tcGxl dGVkIHRoZSByZXNldCBpbiBpOTE1X2dlbV9yZXNldF9maW5pc2goKS4gSWYgYSByZXF1ZXN0CisJ ICogaXMgY29tcGxldGVkIGJ5IG9uZSBlbmdpbmUsIGl0IG1heSB0aGVuIHF1ZXVlIGEgcmVxdWVz dAorCSAqIHRvIGEgc2Vjb25kIHZpYSBpdHMgZXhlY2xpc3RzLT50YXNrbGV0ICpqdXN0KiBhcyB3 ZSBhcmUKKwkgKiBjYWxsaW5nIGVuZ2luZS0+aW5pdF9odygpIGFuZCBhbHNvIHdyaXRpbmcgdGhl IEVMU1AuCisJICogVHVybmluZyBvZmYgdGhlIGV4ZWNsaXN0cy0+dGFza2xldCB1bnRpbCB0aGUg cmVzZXQgaXMgb3ZlcgorCSAqIHByZXZlbnRzIHRoZSByYWNlLgorCSAqCisJICogTm90ZSB0aGF0 IHRoaXMgbmVlZHMgdG8gYmUgYSBzaW5nbGUgYXRvbWljIG9wZXJhdGlvbiBvbiB0aGUKKwkgKiB0 YXNrbGV0IChmbHVzaCBleGlzdGluZyB0YXNrcywgcHJldmVudCBuZXcgdGFza3MpIHRvIHByZXZl bnQKKwkgKiBhIHJhY2UgYmV0d2VlbiByZXNldCBhbmQgc2V0LXdlZGdlZC4gSXQgaXMgbm90LCBz byB3ZSBkbyB0aGUgYmVzdAorCSAqIHdlIGNhbiBhdG0gYW5kIG1ha2Ugc3VyZSB3ZSBkb24ndCBs b2NrIHRoZSBtYWNoaW5lIHVwIGluIHRoZSBtb3JlCisJICogY29tbW9uIGNhc2Ugb2YgcmVjdXJz aXZlbHkgYmVpbmcgY2FsbGVkIGZyb20gc2V0LXdlZGdlZCBmcm9tIGluc2lkZQorCSAqIGk5MTVf cmVzZXQuCisJICovCisJaWYgKCFhdG9taWNfcmVhZCgmZXhlY2xpc3RzLT50YXNrbGV0LmNvdW50 KSkKKwkJdGFza2xldF9raWxsKCZleGVjbGlzdHMtPnRhc2tsZXQpOworCXRhc2tsZXRfZGlzYWJs ZSgmZXhlY2xpc3RzLT50YXNrbGV0KTsKKworCS8qCisJICogV2UncmUgdXNpbmcgd29ya2VyIHRv IHF1ZXVlIHByZWVtcHRpb24gcmVxdWVzdHMgZnJvbSB0aGUgdGFza2xldCBpbgorCSAqIEd1QyBz dWJtaXNzaW9uIG1vZGUuCisJICogRXZlbiB0aG91Z2ggdGFza2xldCB3YXMgZGlzYWJsZWQsIHdl IG1heSBzdGlsbCBoYXZlIGEgd29ya2VyIHF1ZXVlZC4KKwkgKiBMZXQncyBtYWtlIHN1cmUgdGhh dCBhbGwgd29ya2VycyBzY2hlZHVsZWQgYmVmb3JlIGRpc2FibGluZyB0aGUKKwkgKiB0YXNrbGV0 IGFyZSBjb21wbGV0ZWQgYmVmb3JlIGNvbnRpbnVpbmcgd2l0aCB0aGUgcmVzZXQuCisJICovCisJ aWYgKGVuZ2luZS0+aTkxNS0+Z3VjLnByZWVtcHRfd3EpCisJCWZsdXNoX3dvcmtxdWV1ZShlbmdp bmUtPmk5MTUtPmd1Yy5wcmVlbXB0X3dxKTsKKworCXJldHVybiBpOTE1X2dlbV9maW5kX2FjdGl2 ZV9yZXF1ZXN0KGVuZ2luZSk7Cit9CisKK3N0YXRpYyB2b2lkIGV4ZWNsaXN0c19yZXNldChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCQkgICAgc3RydWN0IGk5MTVfcmVxdWVzdCAq cmVxdWVzdCkKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNs aXN0cyA9ICZlbmdpbmUtPmV4ZWNsaXN0czsKIAl1bnNpZ25lZCBsb25nIGZsYWdzOwpAQCAtMTg0 MCw2ICsxODgwLDkgQEAgc3RhdGljIHZvaWQgcmVzZXRfY29tbW9uX3Jpbmcoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lLAogCQkgIGVuZ2luZS0+bmFtZSwgcmVxdWVzdCA/IHJlcXVlc3Qt Pmdsb2JhbF9zZXFubyA6IDAsCiAJCSAgaW50ZWxfZW5naW5lX2dldF9zZXFubyhlbmdpbmUpKTsK IAorCS8qIFRoZSBzdWJtaXNzaW9uIHRhc2tsZXQgbXVzdCBiZSBkaXNhYmxlZCwgZW5naW5lLT5y ZXNldC5wcmVwYXJlKCkuICovCisJR0VNX0JVR19PTighYXRvbWljX3JlYWQoJmV4ZWNsaXN0cy0+ dGFza2xldC5jb3VudCkpOworCiAJLyogU2VlIGV4ZWNsaXN0c19jYW5jZWxfcmVxdWVzdHMoKSBm b3IgdGhlIGlycS9zcGlubG9jayBzcGxpdC4gKi8KIAlsb2NhbF9pcnFfc2F2ZShmbGFncyk7CiAK QEAgLTE5MTEsNiArMTk1NCwxMyBAQCBzdGF0aWMgdm9pZCByZXNldF9jb21tb25fcmluZyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJdW53aW5kX3dhX3RhaWwocmVxdWVzdCk7CiB9 CiAKK3N0YXRpYyB2b2lkIGV4ZWNsaXN0c19yZXNldF9maW5pc2goc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQoreworCXRhc2tsZXRfZW5hYmxlKCZlbmdpbmUtPmV4ZWNsaXN0cy50YXNr bGV0KTsKKworCUdFTV9UUkFDRSgiJXNcbiIsIGVuZ2luZS0+bmFtZSk7Cit9CisKIHN0YXRpYyBp bnQgaW50ZWxfbG9naWNhbF9yaW5nX2VtaXRfcGRwcyhzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSkK IHsKIAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBycS0+Z2VtX2NvbnRleHQtPnBwZ3R0 OwpAQCAtMjI0MCw3ICsyMjkwLDEwIEBAIGxvZ2ljYWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJLyogRGVmYXVsdCB2ZnVuY3Mgd2hpY2gg Y2FuIGJlIG92ZXJyaWRlbiBieSBlYWNoIGVuZ2luZS4gKi8KIAllbmdpbmUtPmluaXRfaHcgPSBn ZW44X2luaXRfY29tbW9uX3Jpbmc7Ci0JZW5naW5lLT5yZXNldF9odyA9IHJlc2V0X2NvbW1vbl9y aW5nOworCisJZW5naW5lLT5yZXNldC5wcmVwYXJlID0gZXhlY2xpc3RzX3Jlc2V0X3ByZXBhcmU7 CisJZW5naW5lLT5yZXNldC5yZXNldCA9IGV4ZWNsaXN0c19yZXNldDsKKwllbmdpbmUtPnJlc2V0 LmZpbmlzaCA9IGV4ZWNsaXN0c19yZXNldF9maW5pc2g7CiAKIAllbmdpbmUtPmNvbnRleHRfcGlu ID0gZXhlY2xpc3RzX2NvbnRleHRfcGluOwogCWVuZ2luZS0+cmVxdWVzdF9hbGxvYyA9IGV4ZWNs aXN0c19yZXF1ZXN0X2FsbG9jOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j CmluZGV4IDUyNmVlODMwMmZjZS4uMWUzN2UxYmUxNmMyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5jCkBAIC01MzEsOSArNTMxLDIwIEBAIHN0YXRpYyBpbnQgaW5pdF9y aW5nX2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJcmV0dXJuIHJldDsK IH0KIAotc3RhdGljIHZvaWQgcmVzZXRfcmluZ19jb21tb24oc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lLAotCQkJICAgICAgc3RydWN0IGk5MTVfcmVxdWVzdCAqcmVxdWVzdCkKK3N0YXRp YyBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXNldF9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKIHsKKwlpZiAoZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcikKKwkJZW5naW5l LT5pcnFfc2Vxbm9fYmFycmllcihlbmdpbmUpOworCisJcmV0dXJuIGk5MTVfZ2VtX2ZpbmRfYWN0 aXZlX3JlcXVlc3QoZW5naW5lKTsKK30KKworc3RhdGljIHZvaWQgcmVzZXRfcmluZyhzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCSAgICAgICBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpy ZXF1ZXN0KQoreworCUdFTV9UUkFDRSgiJXMgc2Vxbm89JXhcbiIsCisJCSAgZW5naW5lLT5uYW1l LCByZXF1ZXN0ID8gcmVxdWVzdC0+Z2xvYmFsX3NlcW5vIDogMCk7CisKIAkvKgogCSAqIFJDNiBt dXN0IGJlIHByZXZlbnRlZCB1bnRpbCB0aGUgcmVzZXQgaXMgY29tcGxldGUgYW5kIHRoZSBlbmdp bmUKIAkgKiByZWluaXRpYWxpc2VkLiBJZiBpdCBvY2N1cnMgaW4gdGhlIG1pZGRsZSBvZiB0aGlz IHNlcXVlbmNlLCB0aGUKQEAgLTU5Niw2ICs2MDcsMTAgQEAgc3RhdGljIHZvaWQgcmVzZXRfcmlu Z19jb21tb24oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCX0KIH0KIAorc3RhdGlj IHZvaWQgcmVzZXRfZmluaXNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKK30K Kwogc3RhdGljIGludCBpbnRlbF9yY3NfY3R4X2luaXQoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEp CiB7CiAJaW50IHJldDsKQEAgLTIwMzAsNyArMjA0NSw5IEBAIHN0YXRpYyB2b2lkIGludGVsX3Jp bmdfZGVmYXVsdF92ZnVuY3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWlu dGVsX3JpbmdfaW5pdF9zZW1hcGhvcmVzKGRldl9wcml2LCBlbmdpbmUpOwogCiAJZW5naW5lLT5p bml0X2h3ID0gaW5pdF9yaW5nX2NvbW1vbjsKLQllbmdpbmUtPnJlc2V0X2h3ID0gcmVzZXRfcmlu Z19jb21tb247CisJZW5naW5lLT5yZXNldC5wcmVwYXJlID0gcmVzZXRfcHJlcGFyZTsKKwllbmdp bmUtPnJlc2V0LnJlc2V0ID0gcmVzZXRfcmluZzsKKwllbmdpbmUtPnJlc2V0LmZpbmlzaCA9IHJl c2V0X2ZpbmlzaDsKIAogCWVuZ2luZS0+Y29udGV4dF9waW4gPSBpbnRlbF9yaW5nX2NvbnRleHRf cGluOwogCWVuZ2luZS0+cmVxdWVzdF9hbGxvYyA9IHJpbmdfcmVxdWVzdF9hbGxvYzsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA1ZTc4ZWUzZjU3NzUuLjU2N2U3 ZWMyY2VmNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNDIz LDggKzQyMywxMyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAl2b2lkCQkoKmlycV9kaXNh YmxlKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogCiAJaW50CQkoKmluaXRfaHcp KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci0Jdm9pZAkJKCpyZXNldF9odykoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAotCQkJCSAgICBzdHJ1Y3QgaTkxNV9yZXF1ZXN0 ICpycSk7CisKKwlzdHJ1Y3QgeworCQlzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICooKnByZXBhcmUpKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CisJCXZvaWQgKCpyZXNldCkoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lLAorCQkJICAgICAgc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEp OworCQl2b2lkICgqZmluaXNoKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworCX0g cmVzZXQ7CiAKIAl2b2lkCQkoKnBhcmspKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7 CiAJdm9pZAkJKCp1bnBhcmspKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci0tIAoy LjE3LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=