From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 6/6] drm/i915: prefer resource_size_t for stolen sizes Date: Wed, 22 Nov 2017 21:19:20 +0000 Message-ID: <20171122211920.20993-7-matthew.auld@intel.com> References: <20171122211920.20993-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F4E36E6DF for ; Wed, 22 Nov 2017 21:19:32 +0000 (UTC) In-Reply-To: <20171122211920.20993-1-matthew.auld@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: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org S2VlcHMgdGhpbmdzIGNvbnNpc3RlbnQgbm93IHRoYXQgd2UgbWFrZSB1c2Ugb2Ygc3RydWN0IHJl c291cmNlLiBUaGlzCnNob3VsZCBrZWVwIHVzIGNvdmVyZWQgaW4gY2FzZSB3ZSBldmVyIGdldCBo dWdlIGFtb3VudHMgb2Ygc3RvbGVuCm1lbW9yeS4KClNpZ25lZC1vZmYtYnk6IE1hdHRoZXcgQXVs ZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxh aHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls c29uLmNvLnVrPgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9jaGFyL2FncC9pbnRlbC1ndHQuYyAgICAgICAgICAgfCAxNCArKysrKysrLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICAgfCAgMiArLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgfCAxMCArKysrKy0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCAgICB8ICA2ICsrKy0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMgfCAyMiArKysrKysrKysrKy0tLS0tLS0tLS0t CiBpbmNsdWRlL2RybS9pbnRlbC1ndHQuaCAgICAgICAgICAgICAgICB8ICA0ICsrLS0KIDYgZmls ZXMgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9jaGFyL2FncC9pbnRlbC1ndHQuYyBiL2RyaXZlcnMvY2hhci9hZ3AvaW50ZWwt Z3R0LmMKaW5kZXggMmEzMjFlZTI5NDNhLi4zMTJjNGNjNDQwYmMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvY2hhci9hZ3AvaW50ZWwtZ3R0LmMKKysrIGIvZHJpdmVycy9jaGFyL2FncC9pbnRlbC1ndHQu YwpAQCAtODAsNyArODAsNyBAQCBzdGF0aWMgc3RydWN0IF9pbnRlbF9wcml2YXRlIHsKIAl1bnNp Z25lZCBpbnQgbmVlZHNfZG1hciA6IDE7CiAJcGh5c19hZGRyX3QgZ21hX2J1c19hZGRyOwogCS8q ICBTaXplIG9mIG1lbW9yeSByZXNlcnZlZCBmb3IgZ3JhcGhpY3MgYnkgdGhlIEJJT1MgKi8KLQl1 bnNpZ25lZCBpbnQgc3RvbGVuX3NpemU7CisJcmVzb3VyY2Vfc2l6ZV90IHN0b2xlbl9zaXplOwog CS8qIFRvdGFsIG51bWJlciBvZiBndHQgZW50cmllcy4gKi8KIAl1bnNpZ25lZCBpbnQgZ3R0X3Rv dGFsX2VudHJpZXM7CiAJLyogUGFydCBvZiB0aGUgZ3R0IHRoYXQgaXMgbWFwcGFibGUgYnkgdGhl IGNwdSwgZm9yIHRob3NlIGNoaXBzIHdoZXJlCkBAIC0zMzMsMTMgKzMzMywxMyBAQCBzdGF0aWMg dm9pZCBpODEwX3dyaXRlX2VudHJ5KGRtYV9hZGRyX3QgYWRkciwgdW5zaWduZWQgaW50IGVudHJ5 LAogCXdyaXRlbF9yZWxheGVkKGFkZHIgfCBwdGVfZmxhZ3MsIGludGVsX3ByaXZhdGUuZ3R0ICsg ZW50cnkpOwogfQogCi1zdGF0aWMgdW5zaWduZWQgaW50IGludGVsX2d0dF9zdG9sZW5fc2l6ZSh2 b2lkKQorc3RhdGljIHJlc291cmNlX3NpemVfdCBpbnRlbF9ndHRfc3RvbGVuX3NpemUodm9pZCkK IHsKIAl1MTYgZ21jaF9jdHJsOwogCXU4IHJkY3Q7CiAJaW50IGxvY2FsID0gMDsKIAlzdGF0aWMg Y29uc3QgaW50IGRkdFs0XSA9IHsgMCwgMTYsIDMyLCA2NCB9OwotCXVuc2lnbmVkIGludCBzdG9s ZW5fc2l6ZSA9IDA7CisJcmVzb3VyY2Vfc2l6ZV90IHN0b2xlbl9zaXplID0gMDsKIAogCWlmIChJ TlRFTF9HVFRfR0VOID09IDEpCiAJCXJldHVybiAwOyAvKiBubyBzdG9sZW4gbWVtIG9uIGk4MXgg Ki8KQEAgLTQxNyw4ICs0MTcsOCBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGludGVsX2d0dF9zdG9s ZW5fc2l6ZSh2b2lkKQogCX0KIAogCWlmIChzdG9sZW5fc2l6ZSA+IDApIHsKLQkJZGV2X2luZm8o JmludGVsX3ByaXZhdGUuYnJpZGdlX2Rldi0+ZGV2LCAiZGV0ZWN0ZWQgJWRLICVzIG1lbW9yeVxu IiwKLQkJICAgICAgIHN0b2xlbl9zaXplIC8gS0IoMSksIGxvY2FsID8gImxvY2FsIiA6ICJzdG9s ZW4iKTsKKwkJZGV2X2luZm8oJmludGVsX3ByaXZhdGUuYnJpZGdlX2Rldi0+ZGV2LCAiZGV0ZWN0 ZWQgJWxsdUsgJXMgbWVtb3J5XG4iLAorCQkgICAgICAgKHU2NClzdG9sZW5fc2l6ZSAvIEtCKDEp LCBsb2NhbCA/ICJsb2NhbCIgOiAic3RvbGVuIik7CiAJfSBlbHNlIHsKIAkJZGV2X2luZm8oJmlu dGVsX3ByaXZhdGUuYnJpZGdlX2Rldi0+ZGV2LAogCQkgICAgICAgIm5vIHByZS1hbGxvY2F0ZWQg dmlkZW8gbWVtb3J5IGRldGVjdGVkXG4iKTsKQEAgLTE0MjIsOSArMTQyMiw5IEBAIGludCBpbnRl bF9nbWNoX3Byb2JlKHN0cnVjdCBwY2lfZGV2ICpicmlkZ2VfcGRldiwgc3RydWN0IHBjaV9kZXYg KmdwdV9wZGV2LAogRVhQT1JUX1NZTUJPTChpbnRlbF9nbWNoX3Byb2JlKTsKIAogdm9pZCBpbnRl bF9ndHRfZ2V0KHU2NCAqZ3R0X3RvdGFsLAotCQkgICB1MzIgKnN0b2xlbl9zaXplLAorCQkgICBy ZXNvdXJjZV9zaXplX3QgKnN0b2xlbl9zaXplLAogCQkgICBwaHlzX2FkZHJfdCAqbWFwcGFibGVf YmFzZSwKLQkJICAgdTY0ICptYXBwYWJsZV9zaXplKQorCQkgICByZXNvdXJjZV9zaXplX3QgKm1h cHBhYmxlX3NpemUpCiB7CiAJKmd0dF90b3RhbCA9IGludGVsX3ByaXZhdGUuZ3R0X3RvdGFsX2Vu dHJpZXMgPDwgUEFHRV9TSElGVDsKIAkqc3RvbGVuX3NpemUgPSBpbnRlbF9wcml2YXRlLnN0b2xl bl9zaXplOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCBhMDVlMmI5MmMwMmMu LjI0OGQxOGEyNTVkOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTUyMyw3 ICs1MjMsNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9pbmZvKHN0cnVjdCBzZXFfZmls ZSAqbSwgdm9pZCAqZGF0YSkKIAkJICAgZHB5X2NvdW50LCBkcHlfc2l6ZSk7CiAKIAlzZXFfcHJp bnRmKG0sICIlbGx1IFslbGx1XSBndHQgdG90YWxcbiIsCi0JCSAgIGdndHQtPmJhc2UudG90YWws IGdndHQtPm1hcHBhYmxlX3NpemUpOworCQkgICBnZ3R0LT5iYXNlLnRvdGFsLCAodTY0KWdndHQt Pm1hcHBhYmxlX3NpemUpOwogCXNlcV9wcmludGYobSwgIlN1cHBvcnRlZCBwYWdlIHNpemVzOiAl c1xuIiwKIAkJICAgc3RyaW5naWZ5X3BhZ2Vfc2l6ZXMoSU5URUxfSU5GTyhkZXZfcHJpdiktPnBh Z2Vfc2l6ZXMsCiAJCQkJCWJ1Ziwgc2l6ZW9mKGJ1ZikpKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMKaW5kZXggODMxM2IzZjQ5NGVjLi44N2NkNTU1YmIzNjMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0zMzU0LDcgKzMzNTQsNyBAQCBzdGF0aWMgaW50IGdlbjZf Z21jaF9wcm9iZShzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0KQogCSAqIGEgY29hcnNlIHNhbml0eSBj aGVjay4KIAkgKi8KIAlpZiAoZ2d0dC0+bWFwcGFibGVfc2l6ZSA8ICg2NDw8MjApIHx8IGdndHQt Pm1hcHBhYmxlX3NpemUgPiAoNTEyPDwyMCkpIHsKLQkJRFJNX0VSUk9SKCJVbmtub3duIEdNQURS IHNpemUgKCVsbHgpXG4iLCBnZ3R0LT5tYXBwYWJsZV9zaXplKTsKKwkJRFJNX0VSUk9SKCJVbmtu b3duIEdNQURSIHNpemUgKCVwYSlcbiIsICZnZ3R0LT5tYXBwYWJsZV9zaXplKTsKIAkJcmV0dXJu IC1FTlhJTzsKIAl9CiAKQEAgLTM0NjYsNyArMzQ2Niw3IEBAIGludCBpOTE1X2dndHRfcHJvYmVf aHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCSAqLwogCWlmIChIQVNfR1VD KGRldl9wcml2KSAmJiBpOTE1X21vZHBhcmFtcy5lbmFibGVfZ3VjX2xvYWRpbmcpIHsKIAkJZ2d0 dC0+YmFzZS50b3RhbCA9IG1pbl90KHU2NCwgZ2d0dC0+YmFzZS50b3RhbCwgR1VDX0dHVFRfVE9Q KTsKLQkJZ2d0dC0+bWFwcGFibGVfc2l6ZSA9IG1pbihnZ3R0LT5tYXBwYWJsZV9zaXplLCBnZ3R0 LT5iYXNlLnRvdGFsKTsKKwkJZ2d0dC0+bWFwcGFibGVfc2l6ZSA9IG1pbl90KHU2NCwgZ2d0dC0+ bWFwcGFibGVfc2l6ZSwgZ2d0dC0+YmFzZS50b3RhbCk7CiAJfQogCiAJaWYgKChnZ3R0LT5iYXNl LnRvdGFsIC0gMSkgPj4gMzIpIHsKQEAgLTM0NzQsMTMgKzM0NzQsMTMgQEAgaW50IGk5MTVfZ2d0 dF9wcm9iZV9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQkgICIgb2Yg YWRkcmVzcyBzcGFjZSEgRm91bmQgJWxsZE0hXG4iLAogCQkJICBnZ3R0LT5iYXNlLnRvdGFsID4+ IDIwKTsKIAkJZ2d0dC0+YmFzZS50b3RhbCA9IDFVTEwgPDwgMzI7Ci0JCWdndHQtPm1hcHBhYmxl X3NpemUgPSBtaW4oZ2d0dC0+bWFwcGFibGVfc2l6ZSwgZ2d0dC0+YmFzZS50b3RhbCk7CisJCWdn dHQtPm1hcHBhYmxlX3NpemUgPSBtaW5fdCh1NjQsIGdndHQtPm1hcHBhYmxlX3NpemUsIGdndHQt PmJhc2UudG90YWwpOwogCX0KIAogCWlmIChnZ3R0LT5tYXBwYWJsZV9zaXplID4gZ2d0dC0+YmFz ZS50b3RhbCkgewogCQlEUk1fRVJST1IoIm1hcHBhYmxlIGFwZXJ0dXJlIGV4dGVuZHMgcGFzdCBl bmQgb2YgR0dUVCwiCi0JCQkgICIgYXBlcnR1cmU9JWxseCwgdG90YWw9JWxseFxuIiwKLQkJCSAg Z2d0dC0+bWFwcGFibGVfc2l6ZSwgZ2d0dC0+YmFzZS50b3RhbCk7CisJCQkgICIgYXBlcnR1cmU9 JXBhLCB0b3RhbD0lbGx4XG4iLAorCQkJICAmZ2d0dC0+bWFwcGFibGVfc2l6ZSwgZ2d0dC0+YmFz ZS50b3RhbCk7CiAJCWdndHQtPm1hcHBhYmxlX3NpemUgPSBnZ3R0LT5iYXNlLnRvdGFsOwogCX0K IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCBhOTEyODFhNTViOTEuLjZmN2M2 NDA4ODVlZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTM3MSw3ICszNzEs NyBAQCBzdHJ1Y3QgaTkxNV9nZ3R0IHsKIAogCXN0cnVjdCBpb19tYXBwaW5nIG1hcHBhYmxlX2lv OwkvKiBNYXBwaW5nIHRvIG91ciBDUFUgbWFwcGFibGUgcmVnaW9uICovCiAJc3RydWN0IHJlc291 cmNlIG1hcHBhYmxlOyAgICAgICAvKiBHTUFEUiByZXNvdXJjZSAqLwotCXU2NCBtYXBwYWJsZV9z aXplOwkJLyogVG90YWwgbWFwcGFibGUgc2l6ZSB0aGF0IHdlIGNhbiBDUFUgbWFwICovCisJcmVz b3VyY2Vfc2l6ZV90IG1hcHBhYmxlX3NpemU7CS8qIFRvdGFsIG1hcHBhYmxlIHNpemUgdGhhdCB3 ZSBjYW4gQ1BVIG1hcCAqLwogCiAJLyogU3RvbGVuIG1lbW9yeSBpcyBzZWdtZW50ZWQgaW4gaGFy ZHdhcmUgd2l0aCBkaWZmZXJlbnQgcG9ydGlvbnMKIAkgKiBvZmZsaW1pdHMgdG8gY2VydGFpbiBm dW5jdGlvbnMuCkBAIC0zODEsOCArMzgxLDggQEAgc3RydWN0IGk5MTVfZ2d0dCB7CiAJICogYXZv aWQgdGhlIGZpcnN0IHBhZ2UhIFRoZSB1cHBlciBlbmQgb2Ygc3RvbGVuIG1lbW9yeSBpcyByZXNl cnZlZCBmb3IKIAkgKiBoYXJkd2FyZSBmdW5jdGlvbnMgYW5kIHNpbWlsYXJseSByZW1vdmVkIGZy b20gdGhlIGFjY2Vzc2libGUgcmFuZ2UuCiAJICovCi0JdTMyIHN0b2xlbl9zaXplOwkJLyogVG90 YWwgc2l6ZSBvZiBzdG9sZW4gbWVtb3J5ICovCi0JdTMyIHN0b2xlbl91c2FibGVfc2l6ZTsJLyog VG90YWwgc2l6ZSBtaW51cyByZXNlcnZlZCByYW5nZXMgKi8KKwlyZXNvdXJjZV9zaXplX3Qgc3Rv bGVuX3NpemU7CQkvKiBUb3RhbCBzaXplIG9mIHN0b2xlbiBtZW1vcnkgKi8KKwlyZXNvdXJjZV9z aXplX3Qgc3RvbGVuX3VzYWJsZV9zaXplOwkvKiBUb3RhbCBzaXplIG1pbnVzIHJlc2VydmVkIHJh bmdlcyAqLwogCiAJLyoqICJHcmFwaGljcyBTdG9sZW4gTWVtb3J5IiBob2xkcyB0aGUgZ2xvYmFs IFBURXMgKi8KIAl2b2lkIF9faW9tZW0gKmdzbTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f c3RvbGVuLmMKaW5kZXggMmI3YWY2MGRmY2UwLi5kYzdjYzk3N2JmZTggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCkBAIC0xNzksNyArMTc5LDcgQEAgdm9pZCBpOTE1X2dl bV9jbGVhbnVwX3N0b2xlbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogfQogCiBzdGF0aWMgdm9p ZCBnNHhfZ2V0X3N0b2xlbl9yZXNlcnZlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCi0JCQkJICAgIGRtYV9hZGRyX3QgKmJhc2UsIHUzMiAqc2l6ZSkKKwkJCQkgICAgZG1hX2Fk ZHJfdCAqYmFzZSwgcmVzb3VyY2Vfc2l6ZV90ICpzaXplKQogewogCXN0cnVjdCBpOTE1X2dndHQg KmdndHQgPSAmZGV2X3ByaXYtPmdndHQ7CiAJdWludDMyX3QgcmVnX3ZhbCA9IEk5MTVfUkVBRChJ U19HTTQ1KGRldl9wcml2KSA/CkBAIC0yMTQsNyArMjE0LDcgQEAgc3RhdGljIHZvaWQgZzR4X2dl dF9zdG9sZW5fcmVzZXJ2ZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogfQog CiBzdGF0aWMgdm9pZCBnZW42X2dldF9zdG9sZW5fcmVzZXJ2ZWQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAotCQkJCSAgICAgZG1hX2FkZHJfdCAqYmFzZSwgdTMyICpzaXplKQor CQkJCSAgICAgZG1hX2FkZHJfdCAqYmFzZSwgcmVzb3VyY2Vfc2l6ZV90ICpzaXplKQogewogCXVp bnQzMl90IHJlZ192YWwgPSBJOTE1X1JFQUQoR0VONl9TVE9MRU5fUkVTRVJWRUQpOwogCkBAIC0y NDYsNyArMjQ2LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9nZXRfc3RvbGVuX3Jlc2VydmVkKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIH0KIAogc3RhdGljIHZvaWQgZ2VuN19nZXRf c3RvbGVuX3Jlc2VydmVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCQkg ICAgIGRtYV9hZGRyX3QgKmJhc2UsIHUzMiAqc2l6ZSkKKwkJCQkgICAgIGRtYV9hZGRyX3QgKmJh c2UsIHJlc291cmNlX3NpemVfdCAqc2l6ZSkKIHsKIAl1aW50MzJfdCByZWdfdmFsID0gSTkxNV9S RUFEKEdFTjZfU1RPTEVOX1JFU0VSVkVEKTsKIApAQCAtMjcyLDcgKzI3Miw3IEBAIHN0YXRpYyB2 b2lkIGdlbjdfZ2V0X3N0b2xlbl9yZXNlcnZlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiB9CiAKIHN0YXRpYyB2b2lkIGNodl9nZXRfc3RvbGVuX3Jlc2VydmVkKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCQkgICAgZG1hX2FkZHJfdCAqYmFzZSwgdTMy ICpzaXplKQorCQkJCSAgICBkbWFfYWRkcl90ICpiYXNlLCByZXNvdXJjZV9zaXplX3QgKnNpemUp CiB7CiAJdWludDMyX3QgcmVnX3ZhbCA9IEk5MTVfUkVBRChHRU42X1NUT0xFTl9SRVNFUlZFRCk7 CiAKQEAgLTMwNCw3ICszMDQsNyBAQCBzdGF0aWMgdm9pZCBjaHZfZ2V0X3N0b2xlbl9yZXNlcnZl ZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB9CiAKIHN0YXRpYyB2b2lkIGJk d19nZXRfc3RvbGVuX3Jlc2VydmVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK LQkJCQkgICAgZG1hX2FkZHJfdCAqYmFzZSwgdTMyICpzaXplKQorCQkJCSAgICBkbWFfYWRkcl90 ICpiYXNlLCByZXNvdXJjZV9zaXplX3QgKnNpemUpCiB7CiAJc3RydWN0IGk5MTVfZ2d0dCAqZ2d0 dCA9ICZkZXZfcHJpdi0+Z2d0dDsKIAl1aW50MzJfdCByZWdfdmFsID0gSTkxNV9SRUFEKEdFTjZf U1RPTEVOX1JFU0VSVkVEKTsKQEAgLTMzNSw4ICszMzUsOCBAQCBpbnQgaTkxNV9nZW1faW5pdF9z dG9sZW4oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXN0cnVjdCBpOTE1X2dn dHQgKmdndHQgPSAmZGV2X3ByaXYtPmdndHQ7CiAJc3RydWN0IHJlc291cmNlIHJlc2VydmVkID0g REVGSU5FX1JFU19NRU0oMCwgMCk7CiAJZG1hX2FkZHJfdCByZXNlcnZlZF9iYXNlLCBzdG9sZW5f dG9wOwotCXUzMiByZXNlcnZlZF90b3RhbCwgcmVzZXJ2ZWRfc2l6ZTsKLQl1MzIgc3RvbGVuX3Vz YWJsZV9zdGFydDsKKwlyZXNvdXJjZV9zaXplX3QgcmVzZXJ2ZWRfdG90YWwsIHJlc2VydmVkX3Np emU7CisJcmVzb3VyY2Vfc2l6ZV90IHN0b2xlbl91c2FibGVfc3RhcnQ7CiAKIAltdXRleF9pbml0 KCZkZXZfcHJpdi0+bW0uc3RvbGVuX2xvY2spOwogCkBAIC00MTYsOSArNDE2LDkgQEAgaW50IGk5 MTVfZ2VtX2luaXRfc3RvbGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkg KiBtZW1vcnksIHNvIGp1c3QgY29uc2lkZXIgdGhlIHN0YXJ0LiAqLwogCXJlc2VydmVkX3RvdGFs ID0gc3RvbGVuX3RvcCAtIHJlc2VydmVkX2Jhc2U7CiAKLQlEUk1fREVCVUdfS01TKCJNZW1vcnkg cmVzZXJ2ZWQgZm9yIGdyYXBoaWNzIGRldmljZTogJXVLLCB1c2FibGU6ICV1S1xuIiwKLQkJICAg ICAgZ2d0dC0+c3RvbGVuX3NpemUgPj4gMTAsCi0JCSAgICAgIChnZ3R0LT5zdG9sZW5fc2l6ZSAt IHJlc2VydmVkX3RvdGFsKSA+PiAxMCk7CisJRFJNX0RFQlVHX0tNUygiTWVtb3J5IHJlc2VydmVk IGZvciBncmFwaGljcyBkZXZpY2U6ICVsbHVLLCB1c2FibGU6ICVsbHVLXG4iLAorCQkgICAgICAo dTY0KWdndHQtPnN0b2xlbl9zaXplID4+IDEwLAorCQkgICAgICAodTY0KShnZ3R0LT5zdG9sZW5f c2l6ZSAtIHJlc2VydmVkX3RvdGFsKSA+PiAxMCk7CiAKIAlzdG9sZW5fdXNhYmxlX3N0YXJ0ID0g MDsKIAkvKiBXYVNraXBTdG9sZW5NZW1vcnlGaXJzdFBhZ2U6YmR3KyAqLwpAQCAtNDM3LDcgKzQz Nyw3IEBAIGludCBpOTE1X2dlbV9pbml0X3N0b2xlbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAKIHN0YXRpYyBzdHJ1Y3Qgc2dfdGFibGUgKgogaTkxNV9wYWdlc19jcmVhdGVf Zm9yX3N0b2xlbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJICAgICB1MzIgb2Zmc2V0LCB1 MzIgc2l6ZSkKKwkJCSAgICAgcmVzb3VyY2Vfc2l6ZV90IG9mZnNldCwgcmVzb3VyY2Vfc2l6ZV90 IHNpemUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShk ZXYpOwogCXN0cnVjdCBzZ190YWJsZSAqc3Q7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9pbnRl bC1ndHQuaCBiL2luY2x1ZGUvZHJtL2ludGVsLWd0dC5oCmluZGV4IGU5MDFkZTBiNmRkOC4uNzE1 MDVhNWUzNzZkIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9pbnRlbC1ndHQuaAorKysgYi9pbmNs dWRlL2RybS9pbnRlbC1ndHQuaApAQCAtNSw5ICs1LDkgQEAKICNkZWZpbmUJX0RSTV9JTlRFTF9H VFRfSAogCiB2b2lkIGludGVsX2d0dF9nZXQodTY0ICpndHRfdG90YWwsCi0JCSAgIHUzMiAqc3Rv bGVuX3NpemUsCisJCSAgIHJlc291cmNlX3NpemVfdCAqc3RvbGVuX3NpemUsCiAJCSAgIHBoeXNf YWRkcl90ICptYXBwYWJsZV9iYXNlLAotCQkgICB1NjQgKm1hcHBhYmxlX3NpemUpOworCQkgICBy ZXNvdXJjZV9zaXplX3QgKm1hcHBhYmxlX3NpemUpOwogCiBpbnQgaW50ZWxfZ21jaF9wcm9iZShz dHJ1Y3QgcGNpX2RldiAqYnJpZGdlX3BkZXYsIHN0cnVjdCBwY2lfZGV2ICpncHVfcGRldiwKIAkJ ICAgICBzdHJ1Y3QgYWdwX2JyaWRnZV9kYXRhICpicmlkZ2UpOwotLSAKMi4xNC4zCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK