From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 01/13] drm/i915: s/tile_offset/aligned_offset/ etc. Date: Fri, 7 Sep 2018 18:24:01 +0300 Message-ID: <20180907152413.15761-2-ville.syrjala@linux.intel.com> References: <20180907152413.15761-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 697C76E973 for ; Fri, 7 Sep 2018 15:24:22 +0000 (UTC) In-Reply-To: <20180907152413.15761-1-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl bmFtZSBzb21lIG9mIHRoZSB0aWxlX29mZnNldCgpIGZ1bmN0aW9ucyB0byBhbGlnbmVkX29mZnNl dCgpIHNpbmNlCnRoZXkgb3BlcmF0ZSBvbiBib3RoIGxpbmVhciBhbmQgdGlsZWQgZnVuY3Rpb25z LiBBbmQgd2UnbGwgaW5jbHVkZQpfcGxhbmVfIGluIHRoZSBuYW1lIG9mIGFsbCB0aGUgdmFyaWFu dHMgdGhhdCB0YWtlIGEgcGxhbmUgc3RhdGUuClNob3VsZCBtYWtlIGl0IG1vcmUgY2xlYXIgd2hp Y2ggZnVuY3Rpb24gdG8gdXNlIHdoZXJlLgoKdjI6IFBpbXAgdGhlIHBhdGNoIHN1YmplY3QgYSBi aXQgKEpvc8OpKQoKUmV2aWV3ZWQtYnk6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpvc2Uuc291 emFAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyB8IDEyMyArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgICAyIC0KIDIgZmlsZXMgY2hhbmdlZCwgNjMg aW5zZXJ0aW9ucygrKSwgNjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IDFiZDE0YzYxZGFiNS4uN2FjZGMxOWE1OGQ0IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yMjI5LDEzICsyMjI5LDEzIEBAIHZvaWQgaW50ZWxfYWRk X2ZiX29mZnNldHMoaW50ICp4LCBpbnQgKnksCiAJfQogfQogCi1zdGF0aWMgdTMyIF9faW50ZWxf YWRqdXN0X3RpbGVfb2Zmc2V0KGludCAqeCwgaW50ICp5LAotCQkJCSAgICAgIHVuc2lnbmVkIGlu dCB0aWxlX3dpZHRoLAotCQkJCSAgICAgIHVuc2lnbmVkIGludCB0aWxlX2hlaWdodCwKLQkJCQkg ICAgICB1bnNpZ25lZCBpbnQgdGlsZV9zaXplLAotCQkJCSAgICAgIHVuc2lnbmVkIGludCBwaXRj aF90aWxlcywKLQkJCQkgICAgICB1MzIgb2xkX29mZnNldCwKLQkJCQkgICAgICB1MzIgbmV3X29m ZnNldCkKK3N0YXRpYyB1MzIgaW50ZWxfYWRqdXN0X3RpbGVfb2Zmc2V0KGludCAqeCwgaW50ICp5 LAorCQkJCSAgICB1bnNpZ25lZCBpbnQgdGlsZV93aWR0aCwKKwkJCQkgICAgdW5zaWduZWQgaW50 IHRpbGVfaGVpZ2h0LAorCQkJCSAgICB1bnNpZ25lZCBpbnQgdGlsZV9zaXplLAorCQkJCSAgICB1 bnNpZ25lZCBpbnQgcGl0Y2hfdGlsZXMsCisJCQkJICAgIHUzMiBvbGRfb2Zmc2V0LAorCQkJCSAg ICB1MzIgbmV3X29mZnNldCkKIHsKIAl1bnNpZ25lZCBpbnQgcGl0Y2hfcGl4ZWxzID0gcGl0Y2hf dGlsZXMgKiB0aWxlX3dpZHRoOwogCXVuc2lnbmVkIGludCB0aWxlczsKQEAgLTIyNTYsMTIgKzIy NTYsMTIgQEAgc3RhdGljIHUzMiBfX2ludGVsX2FkanVzdF90aWxlX29mZnNldChpbnQgKngsIGlu dCAqeSwKIAlyZXR1cm4gbmV3X29mZnNldDsKIH0KIAotc3RhdGljIHUzMiBfaW50ZWxfYWRqdXN0 X3RpbGVfb2Zmc2V0KGludCAqeCwgaW50ICp5LAotCQkJCSAgICAgY29uc3Qgc3RydWN0IGRybV9m cmFtZWJ1ZmZlciAqZmIsIGludCBwbGFuZSwKLQkJCQkgICAgIHVuc2lnbmVkIGludCByb3RhdGlv biwKLQkJCQkgICAgIHUzMiBvbGRfb2Zmc2V0LCB1MzIgbmV3X29mZnNldCkKK3N0YXRpYyB1MzIg aW50ZWxfYWRqdXN0X2FsaWduZWRfb2Zmc2V0KGludCAqeCwgaW50ICp5LAorCQkJCSAgICAgICBj b25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgaW50IHBsYW5lLAorCQkJCSAgICAgICB1 bnNpZ25lZCBpbnQgcm90YXRpb24sCisJCQkJICAgICAgIHUzMiBvbGRfb2Zmc2V0LCB1MzIgbmV3 X29mZnNldCkKIHsKLQljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGZiLT5kZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZmItPmRldik7CiAJdW5zaWduZWQgaW50IGNwcCA9IGZiLT5mb3JtYXQtPmNwcFtwbGFu ZV07CiAJdW5zaWduZWQgaW50IHBpdGNoID0gaW50ZWxfZmJfcGl0Y2goZmIsIHBsYW5lLCByb3Rh dGlvbik7CiAKQEAgLTIyODEsOSArMjI4MSw5IEBAIHN0YXRpYyB1MzIgX2ludGVsX2FkanVzdF90 aWxlX29mZnNldChpbnQgKngsIGludCAqeSwKIAkJCXBpdGNoX3RpbGVzID0gcGl0Y2ggLyAodGls ZV93aWR0aCAqIGNwcCk7CiAJCX0KIAotCQlfX2ludGVsX2FkanVzdF90aWxlX29mZnNldCh4LCB5 LCB0aWxlX3dpZHRoLCB0aWxlX2hlaWdodCwKLQkJCQkJICAgdGlsZV9zaXplLCBwaXRjaF90aWxl cywKLQkJCQkJICAgb2xkX29mZnNldCwgbmV3X29mZnNldCk7CisJCWludGVsX2FkanVzdF90aWxl X29mZnNldCh4LCB5LCB0aWxlX3dpZHRoLCB0aWxlX2hlaWdodCwKKwkJCQkJIHRpbGVfc2l6ZSwg cGl0Y2hfdGlsZXMsCisJCQkJCSBvbGRfb2Zmc2V0LCBuZXdfb2Zmc2V0KTsKIAl9IGVsc2Ugewog CQlvbGRfb2Zmc2V0ICs9ICp5ICogcGl0Y2ggKyAqeCAqIGNwcDsKIApAQCAtMjI5OCwxNyArMjI5 OCwxOCBAQCBzdGF0aWMgdTMyIF9pbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQoaW50ICp4LCBpbnQg KnksCiAgKiBBZGp1c3QgdGhlIHRpbGUgb2Zmc2V0IGJ5IG1vdmluZyB0aGUgZGlmZmVyZW5jZSBp bnRvCiAgKiB0aGUgeC95IG9mZnNldHMuCiAgKi8KLXN0YXRpYyB1MzIgaW50ZWxfYWRqdXN0X3Rp bGVfb2Zmc2V0KGludCAqeCwgaW50ICp5LAotCQkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgKnN0YXRlLCBpbnQgcGxhbmUsCi0JCQkJICAgIHUzMiBvbGRfb2Zmc2V0LCB1MzIg bmV3X29mZnNldCkKK3N0YXRpYyB1MzIgaW50ZWxfcGxhbmVfYWRqdXN0X2FsaWduZWRfb2Zmc2V0 KGludCAqeCwgaW50ICp5LAorCQkJCQkgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqc3RhdGUsCisJCQkJCSAgICAgaW50IHBsYW5lLAorCQkJCQkgICAgIHUzMiBvbGRfb2Zmc2V0 LCB1MzIgbmV3X29mZnNldCkKIHsKLQlyZXR1cm4gX2ludGVsX2FkanVzdF90aWxlX29mZnNldCh4 LCB5LCBzdGF0ZS0+YmFzZS5mYiwgcGxhbmUsCi0JCQkJCSBzdGF0ZS0+YmFzZS5yb3RhdGlvbiwK LQkJCQkJIG9sZF9vZmZzZXQsIG5ld19vZmZzZXQpOworCXJldHVybiBpbnRlbF9hZGp1c3RfYWxp Z25lZF9vZmZzZXQoeCwgeSwgc3RhdGUtPmJhc2UuZmIsIHBsYW5lLAorCQkJCQkgICBzdGF0ZS0+ YmFzZS5yb3RhdGlvbiwKKwkJCQkJICAgb2xkX29mZnNldCwgbmV3X29mZnNldCk7CiB9CiAKIC8q Ci0gKiBDb21wdXRlcyB0aGUgbGluZWFyIG9mZnNldCB0byB0aGUgYmFzZSB0aWxlIGFuZCBhZGp1 c3RzCisgKiBDb21wdXRlcyB0aGUgYWxpZ25lZCBvZmZzZXQgdG8gdGhlIGJhc2UgdGlsZSBhbmQg YWRqdXN0cwogICogeCwgeS4gYnl0ZXMgcGVyIHBpeGVsIGlzIGFzc3VtZWQgdG8gYmUgYSBwb3dl ci1vZi10d28uCiAgKgogICogSW4gdGhlIDkwLzI3MCByb3RhdGVkIGNhc2UsIHggYW5kIHkgYXJl IGFzc3VtZWQKQEAgLTIzMjEsMTIgKzIzMjIsMTIgQEAgc3RhdGljIHUzMiBpbnRlbF9hZGp1c3Rf dGlsZV9vZmZzZXQoaW50ICp4LCBpbnQgKnksCiAgKiB1c2VkLiBUaGlzIGlzIHdoeSB0aGUgdXNl ciBoYXMgdG8gcGFzcyBpbiB0aGUgcGl0Y2ggc2luY2UgaXQKICAqIGlzIHNwZWNpZmllZCBpbiB0 aGUgcm90YXRlZCBvcmllbnRhdGlvbi4KICAqLwotc3RhdGljIHUzMiBfaW50ZWxfY29tcHV0ZV90 aWxlX29mZnNldChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJ ICAgICAgaW50ICp4LCBpbnQgKnksCi0JCQkJICAgICAgY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1 ZmZlciAqZmIsIGludCBwbGFuZSwKLQkJCQkgICAgICB1bnNpZ25lZCBpbnQgcGl0Y2gsCi0JCQkJ ICAgICAgdW5zaWduZWQgaW50IHJvdGF0aW9uLAotCQkJCSAgICAgIHUzMiBhbGlnbm1lbnQpCitz dGF0aWMgdTMyIGludGVsX2NvbXB1dGVfYWxpZ25lZF9vZmZzZXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAorCQkJCQlpbnQgKngsIGludCAqeSwKKwkJCQkJY29uc3Qgc3RydWN0 IGRybV9mcmFtZWJ1ZmZlciAqZmIsIGludCBwbGFuZSwKKwkJCQkJdW5zaWduZWQgaW50IHBpdGNo LAorCQkJCQl1bnNpZ25lZCBpbnQgcm90YXRpb24sCisJCQkJCXUzMiBhbGlnbm1lbnQpCiB7CiAJ dWludDY0X3QgZmJfbW9kaWZpZXIgPSBmYi0+bW9kaWZpZXI7CiAJdW5zaWduZWQgaW50IGNwcCA9 IGZiLT5mb3JtYXQtPmNwcFtwbGFuZV07CkBAIC0yMzU4LDkgKzIzNTksOSBAQCBzdGF0aWMgdTMy IF9pbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJb2Zmc2V0ID0gKHRpbGVfcm93cyAqIHBpdGNoX3RpbGVzICsgdGlsZXMp ICogdGlsZV9zaXplOwogCQlvZmZzZXRfYWxpZ25lZCA9IG9mZnNldCAmIH5hbGlnbm1lbnQ7CiAK LQkJX19pbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQoeCwgeSwgdGlsZV93aWR0aCwgdGlsZV9oZWln aHQsCi0JCQkJCSAgIHRpbGVfc2l6ZSwgcGl0Y2hfdGlsZXMsCi0JCQkJCSAgIG9mZnNldCwgb2Zm c2V0X2FsaWduZWQpOworCQlpbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQoeCwgeSwgdGlsZV93aWR0 aCwgdGlsZV9oZWlnaHQsCisJCQkJCSB0aWxlX3NpemUsIHBpdGNoX3RpbGVzLAorCQkJCQkgb2Zm c2V0LCBvZmZzZXRfYWxpZ25lZCk7CiAJfSBlbHNlIHsKIAkJb2Zmc2V0ID0gKnkgKiBwaXRjaCAr ICp4ICogY3BwOwogCQlvZmZzZXRfYWxpZ25lZCA9IG9mZnNldCAmIH5hbGlnbm1lbnQ7CkBAIC0y MzcyLDkgKzIzNzMsOSBAQCBzdGF0aWMgdTMyIF9pbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KGNv bnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlyZXR1cm4gb2Zmc2V0X2Fs aWduZWQ7CiB9CiAKLXUzMiBpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KGludCAqeCwgaW50ICp5 LAotCQkJICAgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSwKLQkJCSAg ICAgIGludCBwbGFuZSkKK3N0YXRpYyB1MzIgaW50ZWxfcGxhbmVfY29tcHV0ZV9hbGlnbmVkX29m ZnNldChpbnQgKngsIGludCAqeSwKKwkJCQkJICAgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5l X3N0YXRlICpzdGF0ZSwKKwkJCQkJICAgICAgaW50IHBsYW5lKQogewogCXN0cnVjdCBpbnRlbF9w bGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShzdGF0ZS0+YmFzZS5wbGFuZSk7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9wbGFuZS0+ YmFzZS5kZXYpOwpAQCAtMjM4OCw4ICsyMzg5LDggQEAgdTMyIGludGVsX2NvbXB1dGVfdGlsZV9v ZmZzZXQoaW50ICp4LCBpbnQgKnksCiAJZWxzZQogCQlhbGlnbm1lbnQgPSBpbnRlbF9zdXJmX2Fs aWdubWVudChmYiwgcGxhbmUpOwogCi0JcmV0dXJuIF9pbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0 KGRldl9wcml2LCB4LCB5LCBmYiwgcGxhbmUsIHBpdGNoLAotCQkJCQkgIHJvdGF0aW9uLCBhbGln bm1lbnQpOworCXJldHVybiBpbnRlbF9jb21wdXRlX2FsaWduZWRfb2Zmc2V0KGRldl9wcml2LCB4 LCB5LCBmYiwgcGxhbmUsCisJCQkJCSAgICBwaXRjaCwgcm90YXRpb24sIGFsaWdubWVudCk7CiB9 CiAKIC8qIENvbnZlcnQgdGhlIGZiLT5vZmZzZXRbXSBpbnRvIHgveSBvZmZzZXRzICovCkBAIC0y NDA1LDkgKzI0MDYsOSBAQCBzdGF0aWMgaW50IGludGVsX2ZiX29mZnNldF90b194eShpbnQgKngs IGludCAqeSwKIAkqeCA9IDA7CiAJKnkgPSAwOwogCi0JX2ludGVsX2FkanVzdF90aWxlX29mZnNl dCh4LCB5LAotCQkJCSAgZmIsIHBsYW5lLCBEUk1fTU9ERV9ST1RBVEVfMCwKLQkJCQkgIGZiLT5v ZmZzZXRzW3BsYW5lXSwgMCk7CisJaW50ZWxfYWRqdXN0X2FsaWduZWRfb2Zmc2V0KHgsIHksCisJ CQkJICAgIGZiLCBwbGFuZSwgRFJNX01PREVfUk9UQVRFXzAsCisJCQkJICAgIGZiLT5vZmZzZXRz W3BsYW5lXSwgMCk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTI1NjQsOSArMjU2NSwxMCBAQCBpbnRl bF9maWxsX2ZiX2luZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQlpbnRl bF9mYi0+bm9ybWFsW2ldLnggPSB4OwogCQlpbnRlbF9mYi0+bm9ybWFsW2ldLnkgPSB5OwogCi0J CW9mZnNldCA9IF9pbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KGRldl9wcml2LCAmeCwgJnksCi0J CQkJCQkgICAgZmIsIGksIGZiLT5waXRjaGVzW2ldLAotCQkJCQkJICAgIERSTV9NT0RFX1JPVEFU RV8wLCB0aWxlX3NpemUpOworCQlvZmZzZXQgPSBpbnRlbF9jb21wdXRlX2FsaWduZWRfb2Zmc2V0 KGRldl9wcml2LCAmeCwgJnksIGZiLCBpLAorCQkJCQkJICAgICAgZmItPnBpdGNoZXNbaV0sCisJ CQkJCQkgICAgICBEUk1fTU9ERV9ST1RBVEVfMCwKKwkJCQkJCSAgICAgIHRpbGVfc2l6ZSk7CiAJ CW9mZnNldCAvPSB0aWxlX3NpemU7CiAKIAkJaWYgKGZiLT5tb2RpZmllciAhPSBEUk1fRk9STUFU X01PRF9MSU5FQVIpIHsKQEAgLTI2MTMsMTAgKzI2MTUsMTAgQEAgaW50ZWxfZmlsbF9mYl9pbmZv KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAqIFdlIG9ubHkga2VlcCB0 aGUgeC95IG9mZnNldHMsIHNvIHB1c2ggYWxsIG9mIHRoZQogCQkJICogZ3R0IG9mZnNldCBpbnRv IHRoZSB4L3kgb2Zmc2V0cy4KIAkJCSAqLwotCQkJX19pbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQo JngsICZ5LAotCQkJCQkJICAgdGlsZV93aWR0aCwgdGlsZV9oZWlnaHQsCi0JCQkJCQkgICB0aWxl X3NpemUsIHBpdGNoX3RpbGVzLAotCQkJCQkJICAgZ3R0X29mZnNldF9yb3RhdGVkICogdGlsZV9z aXplLCAwKTsKKwkJCWludGVsX2FkanVzdF90aWxlX29mZnNldCgmeCwgJnksCisJCQkJCQkgdGls ZV93aWR0aCwgdGlsZV9oZWlnaHQsCisJCQkJCQkgdGlsZV9zaXplLCBwaXRjaF90aWxlcywKKwkJ CQkJCSBndHRfb2Zmc2V0X3JvdGF0ZWQgKiB0aWxlX3NpemUsIDApOwogCiAJCQlndHRfb2Zmc2V0 X3JvdGF0ZWQgKz0gcm90X2luZm8tPnBsYW5lW2ldLndpZHRoICogcm90X2luZm8tPnBsYW5lW2ld LmhlaWdodDsKIApAQCAtMjk2NSw4ICsyOTY3LDggQEAgc3RhdGljIGJvb2wgc2tsX2NoZWNrX21h aW5fY2NzX2Nvb3JkaW5hdGVzKHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUK IAogCQl4ID0gYXV4X3ggLyBoc3ViOwogCQl5ID0gYXV4X3kgLyB2c3ViOwotCQlhdXhfb2Zmc2V0 ID0gaW50ZWxfYWRqdXN0X3RpbGVfb2Zmc2V0KCZ4LCAmeSwgcGxhbmVfc3RhdGUsIDEsCi0JCQkJ CQkgICAgICBhdXhfb2Zmc2V0LCBhdXhfb2Zmc2V0IC0gYWxpZ25tZW50KTsKKwkJYXV4X29mZnNl dCA9IGludGVsX3BsYW5lX2FkanVzdF9hbGlnbmVkX29mZnNldCgmeCwgJnksIHBsYW5lX3N0YXRl LCAxLAorCQkJCQkJCSAgICAgICBhdXhfb2Zmc2V0LCBhdXhfb2Zmc2V0IC0gYWxpZ25tZW50KTsK IAkJYXV4X3ggPSB4ICogaHN1YiArIGF1eF94ICUgaHN1YjsKIAkJYXV4X3kgPSB5ICogdnN1YiAr IGF1eF95ICUgdnN1YjsKIAl9CkBAIC0zMDI0LDcgKzMwMjYsNyBAQCBzdGF0aWMgaW50IHNrbF9j aGVja19tYWluX3N1cmZhY2UoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUsCiAJfQogCiAJaW50ZWxfYWRkX2ZiX29mZnNldHMoJngsICZ5LCBwbGFuZV9zdGF0ZSwgMCk7 Ci0Jb2Zmc2V0ID0gaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldCgmeCwgJnksIHBsYW5lX3N0YXRl LCAwKTsKKwlvZmZzZXQgPSBpbnRlbF9wbGFuZV9jb21wdXRlX2FsaWduZWRfb2Zmc2V0KCZ4LCAm eSwgcGxhbmVfc3RhdGUsIDApOwogCWFsaWdubWVudCA9IGludGVsX3N1cmZfYWxpZ25tZW50KGZi LCAwKTsKIAogCS8qCkBAIC0zMDMzLDggKzMwMzUsOCBAQCBzdGF0aWMgaW50IHNrbF9jaGVja19t YWluX3N1cmZhY2UoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJ ICogc3VyZSB0aGF0IGlzIHdoYXQgd2Ugd2lsbCBnZXQuCiAJICovCiAJaWYgKG9mZnNldCA+IGF1 eF9vZmZzZXQpCi0JCW9mZnNldCA9IGludGVsX2FkanVzdF90aWxlX29mZnNldCgmeCwgJnksIHBs YW5lX3N0YXRlLCAwLAotCQkJCQkJICBvZmZzZXQsIGF1eF9vZmZzZXQgJiB+KGFsaWdubWVudCAt IDEpKTsKKwkJb2Zmc2V0ID0gaW50ZWxfcGxhbmVfYWRqdXN0X2FsaWduZWRfb2Zmc2V0KCZ4LCAm eSwgcGxhbmVfc3RhdGUsIDAsCisJCQkJCQkJICAgb2Zmc2V0LCBhdXhfb2Zmc2V0ICYgfihhbGln bm1lbnQgLSAxKSk7CiAKIAkvKgogCSAqIFdoZW4gdXNpbmcgYW4gWC10aWxlZCBzdXJmYWNlLCB0 aGUgcGxhbmUgYmxvd3MgdXAKQEAgLTMwNTEsOCArMzA1Myw4IEBAIHN0YXRpYyBpbnQgc2tsX2No ZWNrX21haW5fc3VyZmFjZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSwKIAkJCQlyZXR1cm4gLUVJTlZBTDsKIAkJCX0KIAotCQkJb2Zmc2V0ID0gaW50ZWxfYWRqdXN0 X3RpbGVfb2Zmc2V0KCZ4LCAmeSwgcGxhbmVfc3RhdGUsIDAsCi0JCQkJCQkJICBvZmZzZXQsIG9m ZnNldCAtIGFsaWdubWVudCk7CisJCQlvZmZzZXQgPSBpbnRlbF9wbGFuZV9hZGp1c3RfYWxpZ25l ZF9vZmZzZXQoJngsICZ5LCBwbGFuZV9zdGF0ZSwgMCwKKwkJCQkJCQkJICAgb2Zmc2V0LCBvZmZz ZXQgLSBhbGlnbm1lbnQpOwogCQl9CiAJfQogCkBAIC0zMDY1LDggKzMwNjcsOCBAQCBzdGF0aWMg aW50IHNrbF9jaGVja19tYWluX3N1cmZhY2UoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUsCiAJCQlpZiAob2Zmc2V0ID09IDApCiAJCQkJYnJlYWs7CiAKLQkJCW9mZnNl dCA9IGludGVsX2FkanVzdF90aWxlX29mZnNldCgmeCwgJnksIHBsYW5lX3N0YXRlLCAwLAotCQkJ CQkJCSAgb2Zmc2V0LCBvZmZzZXQgLSBhbGlnbm1lbnQpOworCQkJb2Zmc2V0ID0gaW50ZWxfcGxh bmVfYWRqdXN0X2FsaWduZWRfb2Zmc2V0KCZ4LCAmeSwgcGxhbmVfc3RhdGUsIDAsCisJCQkJCQkJ CSAgIG9mZnNldCwgb2Zmc2V0IC0gYWxpZ25tZW50KTsKIAkJfQogCiAJCWlmICh4ICE9IHBsYW5l X3N0YXRlLT5hdXgueCB8fCB5ICE9IHBsYW5lX3N0YXRlLT5hdXgueSkgewpAQCAtMzExOCw3ICsz MTIwLDcgQEAgc3RhdGljIGludCBza2xfY2hlY2tfbnYxMl9hdXhfc3VyZmFjZShzdHJ1Y3QgaW50 ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKQogCXUzMiBvZmZzZXQ7CiAKIAlpbnRlbF9hZGRf ZmJfb2Zmc2V0cygmeCwgJnksIHBsYW5lX3N0YXRlLCAxKTsKLQlvZmZzZXQgPSBpbnRlbF9jb21w dXRlX3RpbGVfb2Zmc2V0KCZ4LCAmeSwgcGxhbmVfc3RhdGUsIDEpOworCW9mZnNldCA9IGludGVs X3BsYW5lX2NvbXB1dGVfYWxpZ25lZF9vZmZzZXQoJngsICZ5LCBwbGFuZV9zdGF0ZSwgMSk7CiAK IAkvKiBGSVhNRSBub3QgcXVpdGUgc3VyZSBob3cvaWYgdGhlc2UgYXBwbHkgdG8gdGhlIGNocm9t YSBwbGFuZSAqLwogCWlmICh3ID4gbWF4X3dpZHRoIHx8IGggPiBtYXhfaGVpZ2h0KSB7CkBAIC0z MTUyLDcgKzMxNTQsNyBAQCBzdGF0aWMgaW50IHNrbF9jaGVja19jY3NfYXV4X3N1cmZhY2Uoc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIAl9CiAKIAlpbnRlbF9hZGRfZmJf b2Zmc2V0cygmeCwgJnksIHBsYW5lX3N0YXRlLCAxKTsKLQlvZmZzZXQgPSBpbnRlbF9jb21wdXRl X3RpbGVfb2Zmc2V0KCZ4LCAmeSwgcGxhbmVfc3RhdGUsIDEpOworCW9mZnNldCA9IGludGVsX3Bs YW5lX2NvbXB1dGVfYWxpZ25lZF9vZmZzZXQoJngsICZ5LCBwbGFuZV9zdGF0ZSwgMSk7CiAKIAlw bGFuZV9zdGF0ZS0+YXV4Lm9mZnNldCA9IG9mZnNldDsKIAlwbGFuZV9zdGF0ZS0+YXV4LnggPSB4 ICogaHN1YiArIHNyY194ICUgaHN1YjsKQEAgLTMyODQsOCArMzI4Niw4IEBAIGludCBpOXh4X2No ZWNrX3BsYW5lX3N1cmZhY2Uoc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkK IAlpbnRlbF9hZGRfZmJfb2Zmc2V0cygmc3JjX3gsICZzcmNfeSwgcGxhbmVfc3RhdGUsIDApOwog CiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCkKLQkJb2Zmc2V0ID0gaW50ZWxfY29tcHV0 ZV90aWxlX29mZnNldCgmc3JjX3gsICZzcmNfeSwKLQkJCQkJCSAgIHBsYW5lX3N0YXRlLCAwKTsK KwkJb2Zmc2V0ID0gaW50ZWxfcGxhbmVfY29tcHV0ZV9hbGlnbmVkX29mZnNldCgmc3JjX3gsICZz cmNfeSwKKwkJCQkJCQkgICAgcGxhbmVfc3RhdGUsIDApOwogCWVsc2UKIAkJb2Zmc2V0ID0gMDsK IApAQCAtOTY2NCw3ICs5NjY2LDggQEAgc3RhdGljIGludCBpbnRlbF9jaGVja19jdXJzb3Ioc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJc3JjX3kgPSBwbGFuZV9zdGF0ZS0+ YmFzZS5zcmNfeSA+PiAxNjsKIAogCWludGVsX2FkZF9mYl9vZmZzZXRzKCZzcmNfeCwgJnNyY195 LCBwbGFuZV9zdGF0ZSwgMCk7Ci0Jb2Zmc2V0ID0gaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldCgm c3JjX3gsICZzcmNfeSwgcGxhbmVfc3RhdGUsIDApOworCW9mZnNldCA9IGludGVsX3BsYW5lX2Nv bXB1dGVfYWxpZ25lZF9vZmZzZXQoJnNyY194LCAmc3JjX3ksCisJCQkJCQkgICAgcGxhbmVfc3Rh dGUsIDApOwogCiAJaWYgKHNyY194ICE9IDAgfHwgc3JjX3kgIT0gMCkgewogCQlEUk1fREVCVUdf S01TKCJBcmJpdHJhcnkgY3Vyc29yIHBhbm5pbmcgbm90IHN1cHBvcnRlZFxuIik7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCmluZGV4IGY1NzMxMjE1MjEwYS4uMTlhMjE0ODMyM2ExIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTYxNCw4ICsxNjE0LDYgQEAgdm9pZCBhc3NlcnRfZmRp X3J4X3BsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB2b2lkIGFzc2VydF9w aXBlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUsIGJv b2wgc3RhdGUpOwogI2RlZmluZSBhc3NlcnRfcGlwZV9lbmFibGVkKGQsIHApIGFzc2VydF9waXBl KGQsIHAsIHRydWUpCiAjZGVmaW5lIGFzc2VydF9waXBlX2Rpc2FibGVkKGQsIHApIGFzc2VydF9w aXBlKGQsIHAsIGZhbHNlKQotdTMyIGludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoaW50ICp4LCBp bnQgKnksCi0JCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlLCBp bnQgcGxhbmUpOwogdm9pZCBpbnRlbF9wcmVwYXJlX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX2ZpbmlzaF9yZXNldChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBoc3dfZW5hYmxlX3BjOChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwotLSAKMi4xNi40CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK