From: bradley.d.volkin@intel.com Subject: [PATCH v3 2/5] drm/i915: Use batch pools with the command parser Date: Mon, 3 Nov 2014 11:19:42 -0800 Message-ID: <1415042385-26445-3-git-send-email-bradley.d.volkin@intel.com> References: <1415042385-26445-1-git-send-email-bradley.d.volkin@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E9656E35C for ; Mon, 3 Nov 2014 11:19:06 -0800 (PST) In-Reply-To: <1415042385-26445-1-git-send-email-bradley.d.volkin@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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQnJhZCBWb2xraW4gPGJyYWRsZXkuZC52b2xraW5AaW50ZWwuY29tPgoKVGhpcyBwYXRj aCBzZXRzIHVwIGFsbCBvZiB0aGUgdHJhY2tpbmcgYW5kIGNvcHlpbmcgbmVjZXNzYXJ5IHRvCnVz ZSBiYXRjaCBwb29scyB3aXRoIHRoZSBjb21tYW5kIHBhcnNlciBhbmQgZGlzcGF0Y2hlcyB0aGUg Y29waWVkCihzaGFkb3cpIGJhdGNoIHRvIHRoZSBoYXJkd2FyZS4KCkFmdGVyIHRoaXMgcGF0Y2gs IHRoZSBwYXJzZXIgaXMgaW4gJ2VuYWJsaW5nJyBtb2RlLgoKTm90ZSB0aGF0IHBlcmZvcm1hbmNl IHRha2VzIGEgaGl0IGZyb20gdGhlIGNvcHkgaW4gc29tZSBjYXNlcwphbmQgd2lsbCBsaWtlbHkg bmVlZCBzb21lIHdvcmsuIEF0IGEgcm91Z2ggcGFzcywgdGhlIG1lbWNweQphcHBlYXJzIHRvIGJl IHRoZSBib3R0bGVuZWNrLiBXaXRob3V0IGhhdmluZyBkb25lIGEgZGVlcGVyCmFuYWx5c2lzLCB0 d28gaWRlYXMgdGhhdCBjb21lIHRvIG1pbmQgYXJlOgoxKSBDb3B5IHNlY3Rpb25zIG9mIHRoZSBi YXRjaCBhdCBhIHRpbWUsIGFzIHRoZXkgYXJlIHJlYWNoZWQKICAgYnkgcGFyc2luZy4gTWlnaHQg aW1wcm92ZSBjYWNoZSBsb2NhbGl0eS4KMikgQ29weSBvbmx5IHVwIHRvIHRoZSB1c2Vyc3BhY2Ut c3VwcGxpZWQgYmF0Y2ggbGVuZ3RoIGFuZAogICBtZW1zZXQgdGhlIHJlc3Qgb2YgdGhlIGJ1ZmZl ci4gUmVkdWNlcyB0aGUgbnVtYmVyIG9mIHJlYWRzLgoKdjI6Ci0gUmVtb3ZlIHNldHRpbmcgdGhl IGNhcGFjaXR5IG9mIHRoZSBwb29sCi0gT25lIGdsb2JhbCBwb29sIGluc3RlYWQgb2YgcGVyLXJp bmcgcG9vbHMKLSBSZXBsYWNlIGJhdGNoX29iaiB3aXRoIHNoYWRvd19iYXRjaF9vYmogYW5kIGhv b2sgaW50byBlYi0+dm1hcwotIE1lbXNldCBhbnkgc3BhY2UgaW4gdGhlIHNoYWRvdyBiYXRjaCBi ZXlvbmQgd2hhdCBnZXRzIGNvcGllZAotIFJlYmFzZWQgb24gZXhlY2xpc3QgcHJlcCByZWZhY3Rv cmluZwoKdjM6Ci0gUmViYXNlIG9uIGNoYWluZWQgYmF0Y2ggaGFuZGxpbmcKLSBTcXVhc2ggaW4g c2V0dGluZyB0aGUgc2VjdXJlIGRpc3BhdGNoIGZsYWcKLSBBZGQgYSBub3RlIGFib3V0IHRoZSBp bnRlcmFjdGlvbiB3L3NlY3VyZSBkaXNwYXRjaCBwaW5uaW5nCi0gQ2hlY2sgZm9yIHJlcXVlc3Qt PmJhdGNoX29iaiA9PSBOVUxMIGluIGk5MTVfZ2VtX2ZyZWVfcmVxdWVzdAoKU2lnbmVkLW9mZi1i eTogQnJhZCBWb2xraW4gPGJyYWRsZXkuZC52b2xraW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5jICAgICB8IDg0ICsrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyAgICAgICAgICAg IHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgIDgg KysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgICAgfCAxMCArKysr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCA2MSArKysrKysr KysrKysrKysrKysrKy0tCiA1IGZpbGVzIGNoYW5nZWQsIDE0MyBpbnNlcnRpb25zKCspLCAyMSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2NtZF9w YXJzZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5jCmluZGV4IDgw OWJiOTUuLmM4ZmU0MDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfY21k X3BhcnNlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5jCkBA IC04MzgsNiArODM4LDU2IEBAIGZpbmlzaDoKIAlyZXR1cm4gKHUzMiopYWRkcjsKIH0KIAorLyog UmV0dXJucyBhIHZtYXAnZCBwb2ludGVyIHRvIGRlc3Rfb2JqLCB3aGljaCB0aGUgY2FsbGVyIG11 c3QgdW5tYXAgKi8KK3N0YXRpYyB1MzIgKmNvcHlfYmF0Y2goc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKmRlc3Rfb2JqLAorCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKnNy Y19vYmopCit7CisJaW50IHJldCA9IDA7CisJaW50IG5lZWRzX2NsZmx1c2ggPSAwOworCXUzMiAq c3JjX2FkZHIsICpkZXN0X2FkZHIgPSBOVUxMOworCisJcmV0ID0gaTkxNV9nZW1fb2JqX3ByZXBh cmVfc2htZW1fcmVhZChzcmNfb2JqLCAmbmVlZHNfY2xmbHVzaCk7CisJaWYgKHJldCkgeworCQlE Uk1fREVCVUdfRFJJVkVSKCJDTUQ6IGZhaWxlZCB0byBwcmVwIHJlYWRcbiIpOworCQlyZXR1cm4g RVJSX1BUUihyZXQpOworCX0KKworCXNyY19hZGRyID0gdm1hcF9iYXRjaChzcmNfb2JqKTsKKwlp ZiAoIXNyY19hZGRyKSB7CisJCURSTV9ERUJVR19EUklWRVIoIkNNRDogRmFpbGVkIHRvIHZtYXAg YmF0Y2hcbiIpOworCQlyZXQgPSAtRU5PTUVNOworCQlnb3RvIHVucGluX3NyYzsKKwl9CisKKwlp ZiAobmVlZHNfY2xmbHVzaCkKKwkJZHJtX2NsZmx1c2hfdmlydF9yYW5nZSgoY2hhciAqKXNyY19h ZGRyLCBzcmNfb2JqLT5iYXNlLnNpemUpOworCisJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3NldF90 b19jcHVfZG9tYWluKGRlc3Rfb2JqLCB0cnVlKTsKKwlpZiAocmV0KSB7CisJCURSTV9ERUJVR19E UklWRVIoIkNNRDogRmFpbGVkIHRvIHNldCBiYXRjaCBDUFUgZG9tYWluXG4iKTsKKwkJZ290byB1 bm1hcF9zcmM7CisJfQorCisJZGVzdF9hZGRyID0gdm1hcF9iYXRjaChkZXN0X29iaik7CisJaWYg KCFkZXN0X2FkZHIpIHsKKwkJRFJNX0RFQlVHX0RSSVZFUigiQ01EOiBGYWlsZWQgdG8gdm1hcCBz aGFkb3cgYmF0Y2hcbiIpOworCQlyZXQgPSAtRU5PTUVNOworCQlnb3RvIHVubWFwX3NyYzsKKwl9 CisKKwltZW1jcHkoZGVzdF9hZGRyLCBzcmNfYWRkciwgc3JjX29iai0+YmFzZS5zaXplKTsKKwlp ZiAoZGVzdF9vYmotPmJhc2Uuc2l6ZSA+IHNyY19vYmotPmJhc2Uuc2l6ZSkKKwkJbWVtc2V0KCh1 OCAqKWRlc3RfYWRkciArIHNyY19vYmotPmJhc2Uuc2l6ZSwgMCwKKwkJICAgICAgIGRlc3Rfb2Jq LT5iYXNlLnNpemUgLSBzcmNfb2JqLT5iYXNlLnNpemUpOworCit1bm1hcF9zcmM6CisJdnVubWFw KHNyY19hZGRyKTsKK3VucGluX3NyYzoKKwlpOTE1X2dlbV9vYmplY3RfdW5waW5fcGFnZXMoc3Jj X29iaik7CisKKwlyZXR1cm4gcmV0ID8gRVJSX1BUUihyZXQpIDogZGVzdF9hZGRyOworfQorCiAv KioKICAqIGk5MTVfbmVlZHNfY21kX3BhcnNlcigpIC0gc2hvdWxkIGEgZ2l2ZW4gcmluZyB1c2Ug c29mdHdhcmUgY29tbWFuZCBwYXJzaW5nPwogICogQHJpbmc6IHRoZSByaW5nIGluIHF1ZXN0aW9u CkBAIC05NTQsNiArMTAwNCw3IEBAIHN0YXRpYyBib29sIGNoZWNrX2NtZChjb25zdCBzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nLAogICogaTkxNV9wYXJzZV9jbWRzKCkgLSBwYXJzZSBhIHN1 Ym1pdHRlZCBiYXRjaCBidWZmZXIgZm9yIHByaXZpbGVnZSB2aW9sYXRpb25zCiAgKiBAcmluZzog dGhlIHJpbmcgb24gd2hpY2ggdGhlIGJhdGNoIGlzIHRvIGV4ZWN1dGUKICAqIEBiYXRjaF9vYmo6 IHRoZSBiYXRjaCBidWZmZXIgaW4gcXVlc3Rpb24KKyAqIEBzaGFkb3dfYmF0Y2hfb2JqOiBjb3B5 IG9mIHRoZSBiYXRjaCBidWZmZXIgaW4gcXVlc3Rpb24KICAqIEBiYXRjaF9zdGFydF9vZmZzZXQ6 IGJ5dGUgb2Zmc2V0IGluIHRoZSBiYXRjaCBhdCB3aGljaCBleGVjdXRpb24gc3RhcnRzCiAgKiBA aXNfbWFzdGVyOiBpcyB0aGUgc3VibWl0dGluZyBwcm9jZXNzIHRoZSBkcm0gbWFzdGVyPwogICoK QEAgLTk2NSwzMiArMTAxNiwyOCBAQCBzdGF0aWMgYm9vbCBjaGVja19jbWQoY29uc3Qgc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywKICAqLwogaW50IGk5MTVfcGFyc2VfY21kcyhzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg KmJhdGNoX29iaiwKKwkJICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpzaGFkb3dfYmF0 Y2hfb2JqLAogCQkgICAgdTMyIGJhdGNoX3N0YXJ0X29mZnNldCwKIAkJICAgIGJvb2wgaXNfbWFz dGVyKQogewogCWludCByZXQgPSAwOwogCXUzMiAqY21kLCAqYmF0Y2hfYmFzZSwgKmJhdGNoX2Vu ZDsKIAlzdHJ1Y3QgZHJtX2k5MTVfY21kX2Rlc2NyaXB0b3IgZGVmYXVsdF9kZXNjID0geyAwIH07 Ci0JaW50IG5lZWRzX2NsZmx1c2ggPSAwOwogCWJvb2wgb2Fjb250cm9sX3NldCA9IGZhbHNlOyAv KiBPQUNPTlRST0wgdHJhY2tpbmcuIFNlZSBjaGVja19jbWQoKSAqLwogCi0JcmV0ID0gaTkxNV9n ZW1fb2JqX3ByZXBhcmVfc2htZW1fcmVhZChiYXRjaF9vYmosICZuZWVkc19jbGZsdXNoKTsKLQlp ZiAocmV0KSB7Ci0JCURSTV9ERUJVR19EUklWRVIoIkNNRDogZmFpbGVkIHRvIHByZXAgcmVhZFxu Iik7Ci0JCXJldHVybiByZXQ7CisJYmF0Y2hfYmFzZSA9IGNvcHlfYmF0Y2goc2hhZG93X2JhdGNo X29iaiwgYmF0Y2hfb2JqKTsKKwlpZiAoSVNfRVJSKGJhdGNoX2Jhc2UpKSB7CisJCURSTV9ERUJV R19EUklWRVIoIkNNRDogRmFpbGVkIHRvIGNvcHkgYmF0Y2hcbiIpOworCQlyZXR1cm4gUFRSX0VS UihiYXRjaF9iYXNlKTsKIAl9CiAKLQliYXRjaF9iYXNlID0gdm1hcF9iYXRjaChiYXRjaF9vYmop OwotCWlmICghYmF0Y2hfYmFzZSkgewotCQlEUk1fREVCVUdfRFJJVkVSKCJDTUQ6IEZhaWxlZCB0 byB2bWFwIGJhdGNoXG4iKTsKLQkJaTkxNV9nZW1fb2JqZWN0X3VucGluX3BhZ2VzKGJhdGNoX29i aik7Ci0JCXJldHVybiAtRU5PTUVNOwotCX0KLQotCWlmIChuZWVkc19jbGZsdXNoKQotCQlkcm1f Y2xmbHVzaF92aXJ0X3JhbmdlKChjaGFyICopYmF0Y2hfYmFzZSwgYmF0Y2hfb2JqLT5iYXNlLnNp emUpOwotCiAJY21kID0gYmF0Y2hfYmFzZSArIChiYXRjaF9zdGFydF9vZmZzZXQgLyBzaXplb2Yo KmNtZCkpOworCisJLyoKKwkgKiBXZSB1c2UgdGhlIHNvdXJjZSBvYmplY3QncyBzaXplIGJlY2F1 c2UgdGhlIHNoYWRvdyBvYmplY3QgaXMgYXMKKwkgKiBsYXJnZSBvciBsYXJnZXIgYW5kIGNvcHlf YmF0Y2goKSB3aWxsIHdyaXRlIE1JX05PUHMgdG8gdGhlIGV4dHJhCisJICogc3BhY2UuIFBhcnNp bmcgc2hvdWxkIGJlIGZhc3RlciBpbiBzb21lIGNhc2VzIHRoaXMgd2F5LgorCSAqLwogCWJhdGNo X2VuZCA9IGNtZCArIChiYXRjaF9vYmotPmJhc2Uuc2l6ZSAvIHNpemVvZigqYmF0Y2hfZW5kKSk7 CiAKIAl3aGlsZSAoY21kIDwgYmF0Y2hfZW5kKSB7CkBAIC0xMDUyLDcgKzEwOTksMTIgQEAgaW50 IGk5MTVfcGFyc2VfY21kcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCiAJdnVubWFw KGJhdGNoX2Jhc2UpOwogCi0JaTkxNV9nZW1fb2JqZWN0X3VucGluX3BhZ2VzKGJhdGNoX29iaik7 CisJaWYgKCFyZXQpIHsKKwkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3NldF90b19ndHRfZG9tYWlu KHNoYWRvd19iYXRjaF9vYmosCisJCQkJCQkJZmFsc2UpOworCQlpZiAocmV0KQorCQkJRFJNX0RF QlVHX0RSSVZFUigiQ01EOiBGYWlsZWQgdG8gc2V0IGJhdGNoIEdUVCBkb21haW5cbiIpOworCX0K IAogCXJldHVybiByZXQ7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwppbmRleCA5YTczNTMzLi5k ZWEwZjQ1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKQEAgLTE4OTEsNiArMTg5MSw3IEBAIGlu dCBpOTE1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCQltdXRleF9s b2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihk ZXYpOworCQlpOTE1X2dlbV9iYXRjaF9wb29sX2ZpbmkoJmRldl9wcml2LT5tbS5iYXRjaF9wb29s KTsKIAkJaTkxNV9nZW1fY29udGV4dF9maW5pKGRldik7CiAJCW11dGV4X3VubG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOwogCQlpOTE1X2dlbV9jbGVhbnVwX3N0b2xlbihkZXYpOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKaW5kZXggZmJmMTBjYy4uNTBkOTc0ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCkBAIC0xMTQ1LDYgKzExNDUsMTMgQEAgc3RydWN0IGk5MTVfZ2VtX21tIHsKIAkgKi8KIAlz dHJ1Y3QgbGlzdF9oZWFkIHVuYm91bmRfbGlzdDsKIAorCS8qCisJICogQSBwb29sIG9mIG9iamVj dHMgdG8gdXNlIGFzIHNoYWRvdyBjb3BpZXMgb2YgY2xpZW50IGJhdGNoIGJ1ZmZlcnMKKwkgKiB3 aGVuIHRoZSBjb21tYW5kIHBhcnNlciBpcyBlbmFibGVkLiBQcmV2ZW50cyB0aGUgY2xpZW50IGZy b20KKwkgKiBtb2RpZnlpbmcgdGhlIGJhdGNoIGNvbnRlbnRzIGFmdGVyIHNvZnR3YXJlIHBhcnNp bmcuCisJICovCisJc3RydWN0IGk5MTVfZ2VtX2JhdGNoX3Bvb2wgYmF0Y2hfcG9vbDsKKwogCS8q KiBVc2FibGUgcG9ydGlvbiBvZiB0aGUgR1RUIGZvciBHRU0gKi8KIAl1bnNpZ25lZCBsb25nIHN0 b2xlbl9iYXNlOyAvKiBsaW1pdGVkIHRvIGxvdyBtZW1vcnkgKDMyLWJpdCkgKi8KIApAQCAtMjc4 Miw2ICsyNzg5LDcgQEAgdm9pZCBpOTE1X2NtZF9wYXJzZXJfZmluaV9yaW5nKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcpOwogYm9vbCBpOTE1X25lZWRzX2NtZF9wYXJzZXIoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZyk7CiBpbnQgaTkxNV9wYXJzZV9jbWRzKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcsCiAJCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqYmF0Y2hf b2JqLAorCQkgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKnNoYWRvd19iYXRjaF9vYmos CiAJCSAgICB1MzIgYmF0Y2hfc3RhcnRfb2Zmc2V0LAogCQkgICAgYm9vbCBpc19tYXN0ZXIpOwog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA0ZGJkN2I5Li5jNTkxMDBkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKQEAgLTI1MDAsNiArMjUwMCwxNCBAQCBzdGF0aWMgdm9pZCBpOTE1X2dl bV9mcmVlX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCWlm IChyZXF1ZXN0LT5jdHgpCiAJCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UocmVxdWVzdC0+ Y3R4KTsKIAorCWlmIChyZXF1ZXN0LT5iYXRjaF9vYmogJiYKKwkgICAgIWxpc3RfZW1wdHkoJnJl cXVlc3QtPmJhdGNoX29iai0+YmF0Y2hfcG9vbF9saXN0KSkgeworCQlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHJlcXVlc3QtPnJpbmctPmRldik7CisKKwkJaTkx NV9nZW1fYmF0Y2hfcG9vbF9wdXQoJmRldl9wcml2LT5tbS5iYXRjaF9wb29sLAorCQkJCQlyZXF1 ZXN0LT5iYXRjaF9vYmopOworCX0KKwogCWtmcmVlKHJlcXVlc3QpOwogfQogCkBAIC01MDE5LDYg KzUwMjcsOCBAQCBpOTE1X2dlbV9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZGV2X3By aXYtPm1tLm9vbV9ub3RpZmllci5ub3RpZmllcl9jYWxsID0gaTkxNV9nZW1fc2hyaW5rZXJfb29t OwogCXJlZ2lzdGVyX29vbV9ub3RpZmllcigmZGV2X3ByaXYtPm1tLm9vbV9ub3RpZmllcik7CiAK KwlpOTE1X2dlbV9iYXRjaF9wb29sX2luaXQoZGV2LCAmZGV2X3ByaXYtPm1tLmJhdGNoX3Bvb2wp OworCiAJbXV0ZXhfaW5pdCgmZGV2X3ByaXYtPmZiX3RyYWNraW5nLmxvY2spOwogfQogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggNGI3ZjVjMS4uYzIx NmZmMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAt MTIzNiw2ICsxMjM2LDggQEAgaTkxNV9nZW1fZG9fZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCB2b2lkICpkYXRhLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGViX3ZtYXMgKmViOwogCXN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpiYXRjaF9vYmo7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKnNo YWRvd19iYXRjaF9vYmogPSBOVUxMOworCXN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY19vYmplY3Qy IHNoYWRvd19leGVjX2VudHJ5OwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CiAJc3Ry dWN0IGludGVsX2NvbnRleHQgKmN0eDsKIAlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bTsK QEAgLTEzNjEsMjIgKzEzNjMsNjMgQEAgaTkxNV9nZW1fZG9fZXhlY2J1ZmZlcihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCWJhdGNoX29iai0+YmFzZS5wZW5kaW5nX3JlYWRf ZG9tYWlucyB8PSBJOTE1X0dFTV9ET01BSU5fQ09NTUFORDsKIAogCWlmIChpOTE1X25lZWRzX2Nt ZF9wYXJzZXIocmluZykpIHsKKwkJc2hhZG93X2JhdGNoX29iaiA9CisJCQlpOTE1X2dlbV9iYXRj aF9wb29sX2dldCgmZGV2X3ByaXYtPm1tLmJhdGNoX3Bvb2wsCisJCQkJCQliYXRjaF9vYmotPmJh c2Uuc2l6ZSk7CisJCWlmIChJU19FUlIoc2hhZG93X2JhdGNoX29iaikpIHsKKwkJCXJldCA9IFBU Ul9FUlIoc2hhZG93X2JhdGNoX29iaik7CisJCQkvKiBEb24ndCB0cnkgdG8gY2xlYW4gdXAgdGhl IG9iaiBpbiB0aGUgZXJyb3IgcGF0aCAqLworCQkJc2hhZG93X2JhdGNoX29iaiA9IE5VTEw7CisJ CQlnb3RvIGVycjsKKwkJfQorCisJCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihzaGFkb3df YmF0Y2hfb2JqLCA0MDk2LCAwKTsKKwkJaWYgKHJldCkKKwkJCWdvdG8gZXJyOworCiAJCXJldCA9 IGk5MTVfcGFyc2VfY21kcyhyaW5nLAogCQkJCSAgICAgIGJhdGNoX29iaiwKKwkJCQkgICAgICBz aGFkb3dfYmF0Y2hfb2JqLAogCQkJCSAgICAgIGFyZ3MtPmJhdGNoX3N0YXJ0X29mZnNldCwKIAkJ CQkgICAgICBmaWxlLT5pc19tYXN0ZXIpOwogCQlpZiAocmV0KSB7CiAJCQlpZiAocmV0ICE9IC1F QUNDRVMpCiAJCQkJZ290byBlcnI7CisJCQllbHNlIHsKKwkJCQlpOTE1X2dlbV9vYmplY3RfZ2d0 dF91bnBpbihzaGFkb3dfYmF0Y2hfb2JqKTsKKwkJCQlpOTE1X2dlbV9iYXRjaF9wb29sX3B1dCgm ZGV2X3ByaXYtPm1tLmJhdGNoX3Bvb2wsCisJCQkJCQkJc2hhZG93X2JhdGNoX29iaik7CisJCQl9 CiAJCX0gZWxzZSB7CisJCQlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKKworCQkJbWVtc2V0KCZzaGFk b3dfZXhlY19lbnRyeSwgMCwKKwkJCSAgICAgICBzaXplb2Yoc2hhZG93X2V4ZWNfZW50cnkpKTsK KworCQkJdm1hID0gaTkxNV9nZW1fb2JqX3RvX2dndHQoc2hhZG93X2JhdGNoX29iaik7CisJCQl2 bWEtPmV4ZWNfZW50cnkgPSAmc2hhZG93X2V4ZWNfZW50cnk7CisJCQl2bWEtPmV4ZWNfZW50cnkt PmZsYWdzID0gX19FWEVDX09CSkVDVF9IQVNfUElOOworCQkJZHJtX2dlbV9vYmplY3RfcmVmZXJl bmNlKCZzaGFkb3dfYmF0Y2hfb2JqLT5iYXNlKTsKKwkJCWxpc3RfYWRkX3RhaWwoJnZtYS0+ZXhl Y19saXN0LCAmZWItPnZtYXMpOworCisJCQliYXRjaF9vYmogPSBzaGFkb3dfYmF0Y2hfb2JqOwor CiAJCQkvKgotCQkJICogWFhYOiBBY3R1YWxseSBkbyB0aGlzIHdoZW4gZW5hYmxpbmcgYmF0Y2gg Y29weS4uLgorCQkJICogU2V0IHRoZSBESVNQQVRDSF9TRUNVUkUgYml0IHRvIHJlbW92ZSB0aGUg Tk9OX1NFQ1VSRQorCQkJICogYml0IGZyb20gTUlfQkFUQ0hfQlVGRkVSX1NUQVJUIGNvbW1hbmRz IGlzc3VlZCBpbiB0aGUKKwkJCSAqIGRpc3BhdGNoX2V4ZWNidWZmZXIgaW1wbGVtZW50YXRpb25z LiBXZSBzcGVjaWZpY2FsbHkKKwkJCSAqIGRvbid0IHdhbnQgdGhhdCBzZXQgd2hlbiB0aGUgY29t bWFuZCBwYXJzZXIgaXMKKwkJCSAqIGVuYWJsZWQuCiAJCQkgKgotCQkJICogU2V0IHRoZSBESVNQ QVRDSF9TRUNVUkUgYml0IHRvIHJlbW92ZSB0aGUgTk9OX1NFQ1VSRSBiaXQKLQkJCSAqIGZyb20g TUlfQkFUQ0hfQlVGRkVSX1NUQVJUIGNvbW1hbmRzIGlzc3VlZCBpbiB0aGUKLQkJCSAqIGRpc3Bh dGNoX2V4ZWNidWZmZXIgaW1wbGVtZW50YXRpb25zLiBXZSBzcGVjaWZpY2FsbHkgZG9uJ3QKLQkJ CSAqIHdhbnQgdGhhdCBzZXQgd2hlbiB0aGUgY29tbWFuZCBwYXJzZXIgaXMgZW5hYmxlZC4KKwkJ CSAqIE5COiBCeSBzZXR0aW5nIHRoaXMgZmxhZywgd2UncmUgZ29pbmcgdG8gaGl0IHRoZQorCQkJ ICogbm9ybWFsIHNlY3VyZSBkaXNwYXRjaCBwYXRoIGJlbG93LiBUaGF0IHBhdGggd2lsbAorCQkJ ICogZG8gYW4gZXh0cmEgcGluIG9mIHRoZSBzaGFkb3cgYmF0Y2ggb2JqZWN0IGFuZCB0aGVuCisJ CQkgKiB1bnBpbiBhZnRlciAtPmd0LmRvX2V4ZWNidWYoKS4gQXQgdGhhdCBwb2ludCwgdGhlCisJ CQkgKiBvYmplY3Qgd2lsbCBoYXZlIHRoZSBzaW5nbGUgb3V0c3RhbmRpbmcgcGluIGZyb20KKwkJ CSAqIGp1c3QgYmVmb3JlIGNhbGxpbmcgaTkxNV9wYXJzZV9jbWRzKCksIGFuZCB3aWxsIGdldAor CQkJICogdW5waW5uZWQgdmlhIGViX2Rlc3Ryb3koKSBhbmQgX19FWEVDX09CSkVDVF9IQVNfUElO LgogCQkJICovCisJCQlmbGFncyB8PSBJOTE1X0RJU1BBVENIX1NFQ1VSRTsKIAkJfQogCX0KIApA QCAtMTQxOCw2ICsxNDYxLDE0IEBAIGVycjoKIAlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNl KGN0eCk7CiAJZWJfZGVzdHJveShlYik7CiAKKwlpZiAocmV0ICYmIHJpbmcgJiYgc2hhZG93X2Jh dGNoX29iaikgeworCQlpZiAoaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChzaGFkb3dfYmF0Y2hfb2Jq KSkKKwkJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKHNoYWRvd19iYXRjaF9vYmopOworCisJ CWk5MTVfZ2VtX2JhdGNoX3Bvb2xfcHV0KCZkZXZfcHJpdi0+bW0uYmF0Y2hfcG9vbCwKKwkJCQkJ c2hhZG93X2JhdGNoX29iaik7CisJfQorCiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiAKIHByZV9tdXRleF9lcnI6Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK