From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH] drm/i915: s/sg_mask/sg_page_sizes/ Date: Mon, 9 Oct 2017 12:00:24 +0100 Message-ID: <20171009110024.29114-1-matthew.auld@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 CAE1D89D56 for ; Mon, 9 Oct 2017 11:00:27 +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 SXQncyBhIGxpdHRsZSB1bmNsZWFyIHdoYXQgdGhlIHNnX21hc2sgYWN0dWFsbHkgaXMsIHNvIHBy ZWZlciB0aGUgbW9yZQptZWFuaW5nZnVsIG5hbWUgb2Ygc2dfcGFnZV9zaXplcy4KClN1Z2dlc3Rl ZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpT aWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+CkNjOiBK b29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYyAgICAgICAgICAgICAgIHwgMjggKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9kbWFidWYuYyAgICAgICAgfCAgNiAr KystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ludGVybmFsLmMgICAgICB8ICA4 ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMgICAgICAg fCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9odWdlX3BhZ2VzLmMg ICB8IDE4ICsrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMv aTkxNV9nZW1fZ3R0LmMgfCAgOCArKysrLS0tLQogNyBmaWxlcyBjaGFuZ2VkLCAzOCBpbnNlcnRp b25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA3OTlh OTBhYmQ4MWYuLjE1NjY2NzRjYjIwMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zNTM3 LDcgKzM1MzcsNyBAQCBpOTE1X2dlbV9vYmplY3RfZ2V0X2RtYV9hZGRyZXNzKHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmosCiAKIHZvaWQgX19pOTE1X2dlbV9vYmplY3Rfc2V0X3BhZ2Vz KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkJIHN0cnVjdCBzZ190YWJsZSAq cGFnZXMsCi0JCQkJIHVuc2lnbmVkIGludCBzZ19tYXNrKTsKKwkJCQkgdW5zaWduZWQgaW50IHNn X3BhZ2Vfc2l6ZXMpOwogaW50IF9faTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKIAogc3RhdGljIGlubGluZSBpbnQgX19tdXN0X2NoZWNr CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA4MmExMDAzNmZiMzguLmI3OWY3NGZkMTMyNCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yMzEwLDcgKzIzMTAsNyBAQCBzdGF0aWMgaW50 IGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZXNfZ3R0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmopCiAJc3RydWN0IHBhZ2UgKnBhZ2U7CiAJdW5zaWduZWQgbG9uZyBsYXN0X3BmbiA9IDA7 CS8qIHN1cHByZXNzIGdjYyB3YXJuaW5nICovCiAJdW5zaWduZWQgaW50IG1heF9zZWdtZW50ID0g aTkxNV9zZ19zZWdtZW50X3NpemUoKTsKLQl1bnNpZ25lZCBpbnQgc2dfbWFzazsKKwl1bnNpZ25l ZCBpbnQgc2dfcGFnZV9zaXplczsKIAlnZnBfdCBub3JlY2xhaW07CiAJaW50IHJldDsKIApAQCAt MjM0Miw3ICsyMzQyLDcgQEAgc3RhdGljIGludCBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzX2d0 dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCiAJc2cgPSBzdC0+c2dsOwogCXN0 LT5uZW50cyA9IDA7Ci0Jc2dfbWFzayA9IDA7CisJc2dfcGFnZV9zaXplcyA9IDA7CiAJZm9yIChp ID0gMDsgaSA8IHBhZ2VfY291bnQ7IGkrKykgewogCQljb25zdCB1bnNpZ25lZCBpbnQgc2hyaW5r W10gPSB7CiAJCQlJOTE1X1NIUklOS19CT1VORCB8IEk5MTVfU0hSSU5LX1VOQk9VTkQgfCBJOTE1 X1NIUklOS19QVVJHRUFCTEUsCkBAIC0yMzk2LDcgKzIzOTYsNyBAQCBzdGF0aWMgaW50IGk5MTVf Z2VtX29iamVjdF9nZXRfcGFnZXNfZ3R0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmop CiAJCSAgICBzZy0+bGVuZ3RoID49IG1heF9zZWdtZW50IHx8CiAJCSAgICBwYWdlX3RvX3Bmbihw YWdlKSAhPSBsYXN0X3BmbiArIDEpIHsKIAkJCWlmIChpKSB7Ci0JCQkJc2dfbWFzayB8PSBzZy0+ bGVuZ3RoOworCQkJCXNnX3BhZ2Vfc2l6ZXMgfD0gc2ctPmxlbmd0aDsKIAkJCQlzZyA9IHNnX25l eHQoc2cpOwogCQkJfQogCQkJc3QtPm5lbnRzKys7CkBAIC0yNDEwLDcgKzI0MTAsNyBAQCBzdGF0 aWMgaW50IGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZXNfZ3R0KHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmopCiAJCVdBUk5fT04oKGdmcCAmIF9fR0ZQX0RNQTMyKSAmJiAobGFzdF9wZm4g Pj0gMHgwMDEwMDAwMFVMKSk7CiAJfQogCWlmIChzZykgeyAvKiBsb29wIHRlcm1pbmF0ZWQgZWFy bHk7IHNob3J0IHNnIHRhYmxlICovCi0JCXNnX21hc2sgfD0gc2ctPmxlbmd0aDsKKwkJc2dfcGFn ZV9zaXplcyB8PSBzZy0+bGVuZ3RoOwogCQlzZ19tYXJrX2VuZChzZyk7CiAJfQogCkBAIC0yNDQx LDcgKzI0NDEsNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZXNfZ3R0KHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJaWYgKGk5MTVfZ2VtX29iamVjdF9uZWVk c19iaXQxN19zd2l6emxlKG9iaikpCiAJCWk5MTVfZ2VtX29iamVjdF9kb19iaXRfMTdfc3dpenps ZShvYmosIHN0KTsKIAotCV9faTkxNV9nZW1fb2JqZWN0X3NldF9wYWdlcyhvYmosIHN0LCBzZ19t YXNrKTsKKwlfX2k5MTVfZ2VtX29iamVjdF9zZXRfcGFnZXMob2JqLCBzdCwgc2dfcGFnZV9zaXpl cyk7CiAKIAlyZXR1cm4gMDsKIApAQCAtMjQ2OSw3ICsyNDY5LDcgQEAgc3RhdGljIGludCBpOTE1 X2dlbV9vYmplY3RfZ2V0X3BhZ2VzX2d0dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq KQogCiB2b2lkIF9faTkxNV9nZW1fb2JqZWN0X3NldF9wYWdlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqLAogCQkJCSBzdHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzLAotCQkJCSB1bnNpZ25l ZCBpbnQgc2dfbWFzaykKKwkJCQkgdW5zaWduZWQgaW50IHNnX3BhZ2Vfc2l6ZXMpCiB7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSB0b19pOTE1KG9iai0+YmFzZS5kZXYpOwogCXVu c2lnbmVkIGxvbmcgc3VwcG9ydGVkID0gSU5URUxfSU5GTyhpOTE1KS0+cGFnZV9zaXplczsKQEAg LTI0ODksMTYgKzI0ODksMTYgQEAgdm9pZCBfX2k5MTVfZ2VtX29iamVjdF9zZXRfcGFnZXMoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJb2JqLT5tbS5xdWlya2VkID0gdHJ1ZTsK IAl9CiAKLQlHRU1fQlVHX09OKCFzZ19tYXNrKTsKLQlvYmotPm1tLnBhZ2Vfc2l6ZXMucGh5cyA9 IHNnX21hc2s7CisJR0VNX0JVR19PTighc2dfcGFnZV9zaXplcyk7CisJb2JqLT5tbS5wYWdlX3Np emVzLnBoeXMgPSBzZ19wYWdlX3NpemVzOwogCiAJLyoKLQkgKiBDYWxjdWxhdGUgdGhlIHN1cHBv cnRlZCBwYWdlLXNpemVzIHdoaWNoIGZpdCBpbnRvIHRoZSBnaXZlbiBzZ19tYXNrLgotCSAqIFRo aXMgd2lsbCBnaXZlIHVzIHRoZSBwYWdlLXNpemVzIHdoaWNoIHdlIG1heSBiZSBhYmxlIHRvIHVz ZQotCSAqIG9wcG9ydHVuaXN0aWNhbGx5IHdoZW4gbGF0ZXIgaW5zZXJ0aW5nIGludG8gdGhlIEdU VC4gRm9yIGV4YW1wbGUgaWYKLQkgKiBwaHlzPTJHLCB0aGVuIGluIHRoZW9yeSB3ZSBzaG91bGQg YmUgYWJsZSB0byB1c2UgMUcsIDJNLCA2NEsgb3IgNEsKLQkgKiBwYWdlcywgYWx0aG91Z2ggaW4g cHJhY3RpY2UgdGhpcyB3aWxsIGRlcGVuZCBvbiBhIG51bWJlciBvZiBvdGhlcgotCSAqIGZhY3Rv cnMuCisJICogQ2FsY3VsYXRlIHRoZSBzdXBwb3J0ZWQgcGFnZS1zaXplcyB3aGljaCBmaXQgaW50 byB0aGUgZ2l2ZW4KKwkgKiBzZ19wYWdlX3NpemVzLiAgVGhpcyB3aWxsIGdpdmUgdXMgdGhlIHBh Z2Utc2l6ZXMgd2hpY2ggd2UgbWF5IGJlIGFibGUKKwkgKiB0byB1c2Ugb3Bwb3J0dW5pc3RpY2Fs bHkgd2hlbiBsYXRlciBpbnNlcnRpbmcgaW50byB0aGUgR1RULiBGb3IKKwkgKiBleGFtcGxlIGlm IHBoeXM9MkcsIHRoZW4gaW4gdGhlb3J5IHdlIHNob3VsZCBiZSBhYmxlIHRvIHVzZSAxRywgMk0s CisJICogNjRLIG9yIDRLIHBhZ2VzLCBhbHRob3VnaCBpbiBwcmFjdGljZSB0aGlzIHdpbGwgZGVw ZW5kIG9uIGEgbnVtYmVyIG9mCisJICogb3RoZXIgZmFjdG9ycy4KIAkgKi8KIAlvYmotPm1tLnBh Z2Vfc2l6ZXMuc2cgPSAwOwogCWZvcl9lYWNoX3NldF9iaXQoaSwgJnN1cHBvcnRlZCwgaWxvZzIo STkxNV9HVFRfTUFYX1BBR0VfU0laRSkgKyAxKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9kbWFidWYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2RtYWJ1Zi5jCmluZGV4IGU1NDJhOWQ4MDA3Ny4uODY0NDM5YTIxNGM4IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9kbWFidWYuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9kbWFidWYuYwpAQCAtMjU5LDE2ICsyNTksMTYgQEAgc3RydWN0IGRt YV9idWYgKmk5MTVfZ2VtX3ByaW1lX2V4cG9ydChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogc3Rh dGljIGludCBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzX2RtYWJ1ZihzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqKQogewogCXN0cnVjdCBzZ190YWJsZSAqcGFnZXM7Ci0JdW5zaWduZWQg aW50IHNnX21hc2s7CisJdW5zaWduZWQgaW50IHNnX3BhZ2Vfc2l6ZXM7CiAKIAlwYWdlcyA9IGRt YV9idWZfbWFwX2F0dGFjaG1lbnQob2JqLT5iYXNlLmltcG9ydF9hdHRhY2gsCiAJCQkJICAgICAg IERNQV9CSURJUkVDVElPTkFMKTsKIAlpZiAoSVNfRVJSKHBhZ2VzKSkKIAkJcmV0dXJuIFBUUl9F UlIocGFnZXMpOwogCi0Jc2dfbWFzayA9IGk5MTVfc2dfcGFnZV9zaXplcyhwYWdlcy0+c2dsKTsK KwlzZ19wYWdlX3NpemVzID0gaTkxNV9zZ19wYWdlX3NpemVzKHBhZ2VzLT5zZ2wpOwogCi0JX19p OTE1X2dlbV9vYmplY3Rfc2V0X3BhZ2VzKG9iaiwgcGFnZXMsIHNnX21hc2spOworCV9faTkxNV9n ZW1fb2JqZWN0X3NldF9wYWdlcyhvYmosIHBhZ2VzLCBzZ19wYWdlX3NpemVzKTsKIAogCXJldHVy biAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1faW50ZXJu YWwuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ludGVybmFsLmMKaW5kZXggYmRj MjNjNGM4NzgzLi5lZTgzZWM4MzhlZTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2ludGVybmFsLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f aW50ZXJuYWwuYwpAQCAtNDksNyArNDksNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9n ZXRfcGFnZXNfaW50ZXJuYWwoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHRvX2k5MTUob2JqLT5iYXNlLmRldik7CiAJc3Ry dWN0IHNnX3RhYmxlICpzdDsKIAlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnOwotCXVuc2lnbmVkIGlu dCBzZ19tYXNrOworCXVuc2lnbmVkIGludCBzZ19wYWdlX3NpemVzOwogCXVuc2lnbmVkIGludCBu cGFnZXM7CiAJaW50IG1heF9vcmRlcjsKIAlnZnBfdCBnZnA7CkBAIC04OCw3ICs4OCw3IEBAIHN0 YXRpYyBpbnQgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlc19pbnRlcm5hbChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqKQogCiAJc2cgPSBzdC0+c2dsOwogCXN0LT5uZW50cyA9IDA7Ci0J c2dfbWFzayA9IDA7CisJc2dfcGFnZV9zaXplcyA9IDA7CiAKIAlkbyB7CiAJCWludCBvcmRlciA9 IG1pbihmbHMobnBhZ2VzKSAtIDEsIG1heF9vcmRlcik7CkBAIC0xMDYsNyArMTA2LDcgQEAgc3Rh dGljIGludCBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzX2ludGVybmFsKHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpvYmopCiAJCX0gd2hpbGUgKDEpOwogCiAJCXNnX3NldF9wYWdlKHNnLCBw YWdlLCBQQUdFX1NJWkUgPDwgb3JkZXIsIDApOwotCQlzZ19tYXNrIHw9IFBBR0VfU0laRSA8PCBv cmRlcjsKKwkJc2dfcGFnZV9zaXplcyB8PSBQQUdFX1NJWkUgPDwgb3JkZXI7CiAJCXN0LT5uZW50 cysrOwogCiAJCW5wYWdlcyAtPSAxIDw8IG9yZGVyOwpAQCAtMTM1LDcgKzEzNSw3IEBAIHN0YXRp YyBpbnQgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlc19pbnRlcm5hbChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqKQogCSAqLwogCW9iai0+bW0ubWFkdiA9IEk5MTVfTUFEVl9ET05UTkVF RDsKIAotCV9faTkxNV9nZW1fb2JqZWN0X3NldF9wYWdlcyhvYmosIHN0LCBzZ19tYXNrKTsKKwlf X2k5MTVfZ2VtX29iamVjdF9zZXRfcGFnZXMob2JqLCBzdCwgc2dfcGFnZV9zaXplcyk7CiAKIAly ZXR1cm4gMDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdXNl cnB0ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdXNlcnB0ci5jCmluZGV4IDQx ZTE2ZTE5YzNmMy4uYzM2YTg0YjA3MGI2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV91c2VycHRyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f dXNlcnB0ci5jCkBAIC00MDUsNyArNDA1LDcgQEAgX19pOTE1X2dlbV91c2VycHRyX2FsbG9jX3Bh Z2VzKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiB7CiAJdW5zaWduZWQgaW50IG1h eF9zZWdtZW50ID0gaTkxNV9zZ19zZWdtZW50X3NpemUoKTsKIAlzdHJ1Y3Qgc2dfdGFibGUgKnN0 OwotCXVuc2lnbmVkIGludCBzZ19tYXNrOworCXVuc2lnbmVkIGludCBzZ19wYWdlX3NpemVzOwog CWludCByZXQ7CiAKIAlzdCA9IGttYWxsb2Moc2l6ZW9mKCpzdCksIEdGUF9LRVJORUwpOwpAQCAt NDM1LDkgKzQzNSw5IEBAIF9faTkxNV9nZW1fdXNlcnB0cl9hbGxvY19wYWdlcyhzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQlyZXR1cm4gRVJSX1BUUihyZXQpOwogCX0KIAotCXNn X21hc2sgPSBpOTE1X3NnX3BhZ2Vfc2l6ZXMoc3QtPnNnbCk7CisJc2dfcGFnZV9zaXplcyA9IGk5 MTVfc2dfcGFnZV9zaXplcyhzdC0+c2dsKTsKIAotCV9faTkxNV9nZW1fb2JqZWN0X3NldF9wYWdl cyhvYmosIHN0LCBzZ19tYXNrKTsKKwlfX2k5MTVfZ2VtX29iamVjdF9zZXRfcGFnZXMob2JqLCBz dCwgc2dfcGFnZV9zaXplcyk7CiAKIAlyZXR1cm4gc3Q7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaHVnZV9wYWdlcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL2h1Z2VfcGFnZXMuYwppbmRleCBiODQ5NTg4MmU1YjAuLmI4YjlkMDgyMjE5 OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2h1Z2VfcGFnZXMu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaHVnZV9wYWdlcy5jCkBAIC02 OCw3ICs2OCw3IEBAIHN0YXRpYyBpbnQgZ2V0X2h1Z2VfcGFnZXMoc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaikKIAl1bnNpZ25lZCBpbnQgcGFnZV9tYXNrID0gb2JqLT5tbS5wYWdlX21h c2s7CiAJc3RydWN0IHNnX3RhYmxlICpzdDsKIAlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnOwotCXVu c2lnbmVkIGludCBzZ19tYXNrOworCXVuc2lnbmVkIGludCBzZ19wYWdlX3NpemVzOwogCXU2NCBy ZW07CiAKIAlzdCA9IGttYWxsb2Moc2l6ZW9mKCpzdCksIEdGUCk7CkBAIC04Myw3ICs4Myw3IEBA IHN0YXRpYyBpbnQgZ2V0X2h1Z2VfcGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aikKIAlyZW0gPSBvYmotPmJhc2Uuc2l6ZTsKIAlzZyA9IHN0LT5zZ2w7CiAJc3QtPm5lbnRzID0g MDsKLQlzZ19tYXNrID0gMDsKKwlzZ19wYWdlX3NpemVzID0gMDsKIAogCS8qCiAJICogT3VyIGdv YWwgaGVyZSBpcyBzaW1wbGUsIHdlIHdhbnQgdG8gZ3JlZWRpbHkgZmlsbCB0aGUgb2JqZWN0IGZy b20KQEAgLTEwNCw3ICsxMDQsNyBAQCBzdGF0aWMgaW50IGdldF9odWdlX3BhZ2VzKHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJCQkJZ290byBlcnI7CiAKIAkJCXNnX3NldF9wYWdl KHNnLCBwYWdlLCBwYWdlX3NpemUsIDApOwotCQkJc2dfbWFzayB8PSBwYWdlX3NpemU7CisJCQlz Z19wYWdlX3NpemVzIHw9IHBhZ2Vfc2l6ZTsKIAkJCXN0LT5uZW50cysrOwogCiAJCQlyZW0gLT0g cGFnZV9zaXplOwpAQCAtMTI0LDggKzEyNCw4IEBAIHN0YXRpYyBpbnQgZ2V0X2h1Z2VfcGFnZXMo c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAogCW9iai0+bW0ubWFkdiA9IEk5MTVf TUFEVl9ET05UTkVFRDsKIAotCUdFTV9CVUdfT04oc2dfbWFzayAhPSBvYmotPm1tLnBhZ2VfbWFz ayk7Ci0JX19pOTE1X2dlbV9vYmplY3Rfc2V0X3BhZ2VzKG9iaiwgc3QsIHNnX21hc2spOworCUdF TV9CVUdfT04oc2dfcGFnZV9zaXplcyAhPSBvYmotPm1tLnBhZ2VfbWFzayk7CisJX19pOTE1X2dl bV9vYmplY3Rfc2V0X3BhZ2VzKG9iaiwgc3QsIHNnX3BhZ2Vfc2l6ZXMpOwogCiAJcmV0dXJuIDA7 CiAKQEAgLTE5Miw3ICsxOTIsNyBAQCBzdGF0aWMgaW50IGZha2VfZ2V0X2h1Z2VfcGFnZXMoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAljb25zdCB1NjQgbWF4X2xlbiA9IHJvdW5k ZG93bl9wb3dfb2ZfdHdvKFVJTlRfTUFYKTsKIAlzdHJ1Y3Qgc2dfdGFibGUgKnN0OwogCXN0cnVj dCBzY2F0dGVybGlzdCAqc2c7Ci0JdW5zaWduZWQgaW50IHNnX21hc2s7CisJdW5zaWduZWQgaW50 IHNnX3BhZ2Vfc2l6ZXM7CiAJdTY0IHJlbTsKIAogCXN0ID0ga21hbGxvYyhzaXplb2YoKnN0KSwg R0ZQKTsKQEAgLTIwOCw3ICsyMDgsNyBAQCBzdGF0aWMgaW50IGZha2VfZ2V0X2h1Z2VfcGFnZXMo c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAlyZW0gPSBvYmotPmJhc2Uuc2l6ZTsK IAlzZyA9IHN0LT5zZ2w7CiAJc3QtPm5lbnRzID0gMDsKLQlzZ19tYXNrID0gMDsKKwlzZ19wYWdl X3NpemVzID0gMDsKIAlkbyB7CiAJCXVuc2lnbmVkIGludCBwYWdlX3NpemUgPSBnZXRfbGFyZ2Vz dF9wYWdlX3NpemUoaTkxNSwgcmVtKTsKIAkJdW5zaWduZWQgaW50IGxlbiA9IG1pbihwYWdlX3Np emUgKiBkaXZfdTY0KHJlbSwgcGFnZV9zaXplKSwKQEAgLTIyMSw3ICsyMjEsNyBAQCBzdGF0aWMg aW50IGZha2VfZ2V0X2h1Z2VfcGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikK IAkJc2dfZG1hX2xlbihzZykgPSBsZW47CiAJCXNnX2RtYV9hZGRyZXNzKHNnKSA9IHBhZ2Vfc2l6 ZTsKIAotCQlzZ19tYXNrIHw9IGxlbjsKKwkJc2dfcGFnZV9zaXplcyB8PSBsZW47CiAKIAkJc3Qt Pm5lbnRzKys7CiAKQEAgLTIzNiw3ICsyMzYsNyBAQCBzdGF0aWMgaW50IGZha2VfZ2V0X2h1Z2Vf cGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAogCW9iai0+bW0ubWFkdiA9 IEk5MTVfTUFEVl9ET05UTkVFRDsKIAotCV9faTkxNV9nZW1fb2JqZWN0X3NldF9wYWdlcyhvYmos IHN0LCBzZ19tYXNrKTsKKwlfX2k5MTVfZ2VtX29iamVjdF9zZXRfcGFnZXMob2JqLCBzdCwgc2df cGFnZV9zaXplcyk7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl bGZ0ZXN0cy9pOTE1X2dlbV9ndHQuYwppbmRleCA4ODNiYzE5ZTNhYWYuLjlkYTBjOWY5OTkxNiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2d0dC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9ndHQuYwpAQCAt NDUsNyArNDUsNyBAQCBzdGF0aWMgaW50IGZha2VfZ2V0X3BhZ2VzKHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmopCiAjZGVmaW5lIFBGTl9CSUFTIDB4MTAwMAogCXN0cnVjdCBzZ190YWJs ZSAqcGFnZXM7CiAJc3RydWN0IHNjYXR0ZXJsaXN0ICpzZzsKLQl1bnNpZ25lZCBpbnQgc2dfbWFz azsKKwl1bnNpZ25lZCBpbnQgc2dfcGFnZV9zaXplczsKIAl0eXBlb2Yob2JqLT5iYXNlLnNpemUp IHJlbTsKIAogCXBhZ2VzID0ga21hbGxvYyhzaXplb2YoKnBhZ2VzKSwgR0ZQKTsKQEAgLTU4LDcg KzU4LDcgQEAgc3RhdGljIGludCBmYWtlX2dldF9wYWdlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqKQogCQlyZXR1cm4gLUVOT01FTTsKIAl9CiAKLQlzZ19tYXNrID0gMDsKKwlzZ19w YWdlX3NpemVzID0gMDsKIAlyZW0gPSBvYmotPmJhc2Uuc2l6ZTsKIAlmb3IgKHNnID0gcGFnZXMt PnNnbDsgc2c7IHNnID0gc2dfbmV4dChzZykpIHsKIAkJdW5zaWduZWQgbG9uZyBsZW4gPSBtaW5f dCh0eXBlb2YocmVtKSwgcmVtLCBCSVQoMzEpKTsKQEAgLTY3LDcgKzY3LDcgQEAgc3RhdGljIGlu dCBmYWtlX2dldF9wYWdlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCQlzZ19z ZXRfcGFnZShzZywgcGZuX3RvX3BhZ2UoUEZOX0JJQVMpLCBsZW4sIDApOwogCQlzZ19kbWFfYWRk cmVzcyhzZykgPSBwYWdlX3RvX3BoeXMoc2dfcGFnZShzZykpOwogCQlzZ19kbWFfbGVuKHNnKSA9 IGxlbjsKLQkJc2dfbWFzayB8PSBsZW47CisJCXNnX3BhZ2Vfc2l6ZXMgfD0gbGVuOwogCiAJCXJl bSAtPSBsZW47CiAJfQpAQCAtNzUsNyArNzUsNyBAQCBzdGF0aWMgaW50IGZha2VfZ2V0X3BhZ2Vz KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAKIAlvYmotPm1tLm1hZHYgPSBJOTE1 X01BRFZfRE9OVE5FRUQ7CiAKLQlfX2k5MTVfZ2VtX29iamVjdF9zZXRfcGFnZXMob2JqLCBwYWdl cywgc2dfbWFzayk7CisJX19pOTE1X2dlbV9vYmplY3Rfc2V0X3BhZ2VzKG9iaiwgcGFnZXMsIHNn X3BhZ2Vfc2l6ZXMpOwogCiAJcmV0dXJuIDA7CiAjdW5kZWYgR0ZQCi0tIAoyLjEzLjYKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=