From: Matt Roper Subject: [RFC 07/15] drm/i915: Eliminate usage of pipe_wm_parameters from ILK-style WM Date: Wed, 20 May 2015 19:12:19 -0700 Message-ID: <1432174347-19138-8-git-send-email-matthew.d.roper@intel.com> References: <1432174347-19138-1-git-send-email-matthew.d.roper@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 5DB1E6E806 for ; Wed, 20 May 2015 19:12:29 -0700 (PDT) In-Reply-To: <1432174347-19138-1-git-send-email-matthew.d.roper@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 SnVzdCBwdWxsIHRoZSBpbmZvIG91dCBvZiB0aGUgQ1JUQyBzdGF0ZSBzdHJ1Y3R1cmUgcmF0aGVy IHRoYW4gc3RhZ2luZwppdCBpbiBhbiBhZGRpdGlvbmFsIHN0cnVjdHVyZS4KClNpZ25lZC1vZmYt Ynk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDk4ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgNjQgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZTQyNDJmZi4uMTNiMWNkMyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0xNDM0LDIzICsxNDM0LDIxIEBAIHN0YXRpYyB2b2lk IGk4NDVfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqdW51c2VkX2NydGMpCiAJSTkxNV9XUklU RShGV19CTEMsIGZ3YXRlcl9sbyk7CiB9CiAKLXN0YXRpYyB1aW50MzJfdCBpbGtfcGlwZV9waXhl bF9yYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJICAgIHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKK3N0YXRpYyB1aW50MzJfdCBpbGtfcGlwZV9waXhlbF9yYXRlKGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCiB7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXVpbnQzMl90IHBpeGVsX3JhdGU7CiAKLQlwaXhl bF9yYXRlID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19jbG9j azsKKwlwaXhlbF9yYXRlID0gY3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19jbG9jazsK IAogCS8qIFdlIG9ubHkgdXNlIElGLUlEIGludGVybGFjaW5nLiBJZiB3ZSBldmVyIHVzZSBQRi1J RCB3ZSdsbCBuZWVkIHRvCiAJICogYWRqdXN0IHRoZSBwaXhlbF9yYXRlIGhlcmUuICovCiAKLQlp ZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5lbmFibGVkKSB7CisJaWYgKGNzdGF0ZS0+ cGNoX3BmaXQuZW5hYmxlZCkgewogCQl1aW50NjRfdCBwaXBlX3csIHBpcGVfaCwgcGZpdF93LCBw Zml0X2g7Ci0JCXVpbnQzMl90IHBmaXRfc2l6ZSA9IGludGVsX2NydGMtPmNvbmZpZy0+cGNoX3Bm aXQuc2l6ZTsKKwkJdWludDMyX3QgcGZpdF9zaXplID0gY3N0YXRlLT5wY2hfcGZpdC5zaXplOwog Ci0JCXBpcGVfdyA9IGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfdzsKLQkJcGlwZV9oID0g aW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY19oOworCQlwaXBlX3cgPSBjc3RhdGUtPnBpcGVf c3JjX3c7CisJCXBpcGVfaCA9IGNzdGF0ZS0+cGlwZV9zcmNfaDsKIAkJcGZpdF93ID0gKHBmaXRf c2l6ZSA+PiAxNikgJiAweEZGRkY7CiAJCXBmaXRfaCA9IHBmaXRfc2l6ZSAmIDB4RkZGRjsKIAkJ aWYgKHBpcGVfdyA8IHBmaXRfdykKQEAgLTE1MTAsMTIgKzE1MDgsNiBAQCBzdHJ1Y3Qgc2tsX3Bp cGVfd21fcGFyYW1ldGVycyB7CiAJc3RydWN0IGludGVsX3BsYW5lX3dtX3BhcmFtZXRlcnMgY3Vy c29yOwogfTsKIAotc3RydWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMgewotCWJvb2wgYWN0aXZl OwotCXVpbnQzMl90IHBpcGVfaHRvdGFsOwotCXVpbnQzMl90IHBpeGVsX3JhdGU7Ci19OwotCiBz dHJ1Y3QgaWxrX3dtX21heGltdW1zIHsKIAl1aW50MTZfdCBwcmk7CiAJdWludDE2X3Qgc3ByOwpA QCAtMTUzNCw3ICsxNTI2LDcgQEAgc3RydWN0IGludGVsX3dtX2NvbmZpZyB7CiAgKiBGb3IgYm90 aCBXTV9QSVBFIGFuZCBXTV9MUC4KICAqIG1lbV92YWx1ZSBtdXN0IGJlIGluIDAuMXVzIHVuaXRz LgogICovCi1zdGF0aWMgdWludDMyX3QgaWxrX2NvbXB1dGVfcHJpX3dtKGNvbnN0IHN0cnVjdCBp bGtfcGlwZV93bV9wYXJhbWV0ZXJzICpwYXJhbXMsCitzdGF0aWMgdWludDMyX3QgaWxrX2NvbXB1 dGVfcHJpX3dtKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCQkJICAg Y29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwc3RhdGUsCiAJCQkJICAgdWludDMyX3Qg bWVtX3ZhbHVlLAogCQkJCSAgIGJvb2wgaXNfbHApCkBAIC0xNTQyLDE2ICsxNTM0LDE2IEBAIHN0 YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9wcmlfd20oY29uc3Qgc3RydWN0IGlsa19waXBlX3dt X3BhcmFtZXRlcnMgKnBhcmFtcywKIAlpbnQgYnBwID0gcHN0YXRlLT5iYXNlLmZiID8gcHN0YXRl LT5iYXNlLmZiLT5iaXRzX3Blcl9waXhlbCAvIDggOiAwOwogCXVpbnQzMl90IG1ldGhvZDEsIG1l dGhvZDI7CiAKLQlpZiAoIXBhcmFtcy0+YWN0aXZlIHx8ICFwc3RhdGUtPnZpc2libGUpCisJaWYg KCFjc3RhdGUtPmJhc2UuYWN0aXZlIHx8ICFwc3RhdGUtPnZpc2libGUpCiAJCXJldHVybiAwOwog Ci0JbWV0aG9kMSA9IGlsa193bV9tZXRob2QxKHBhcmFtcy0+cGl4ZWxfcmF0ZSwgYnBwLCBtZW1f dmFsdWUpOworCW1ldGhvZDEgPSBpbGtfd21fbWV0aG9kMShpbGtfcGlwZV9waXhlbF9yYXRlKGNz dGF0ZSksIGJwcCwgbWVtX3ZhbHVlKTsKIAogCWlmICghaXNfbHApCiAJCXJldHVybiBtZXRob2Qx OwogCi0JbWV0aG9kMiA9IGlsa193bV9tZXRob2QyKHBhcmFtcy0+cGl4ZWxfcmF0ZSwKLQkJCQkg cGFyYW1zLT5waXBlX2h0b3RhbCwKKwltZXRob2QyID0gaWxrX3dtX21ldGhvZDIoaWxrX3BpcGVf cGl4ZWxfcmF0ZShjc3RhdGUpLAorCQkJCSBjc3RhdGUtPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRj X2h0b3RhbCwKIAkJCQkgZHJtX3JlY3Rfd2lkdGgoJnBzdGF0ZS0+ZHN0KSwKIAkJCQkgYnBwLAog CQkJCSBtZW1fdmFsdWUpOwpAQCAtMTU2MywxOSArMTU1NSwxOSBAQCBzdGF0aWMgdWludDMyX3Qg aWxrX2NvbXB1dGVfcHJpX3dtKGNvbnN0IHN0cnVjdCBpbGtfcGlwZV93bV9wYXJhbWV0ZXJzICpw YXJhbXMsCiAgKiBGb3IgYm90aCBXTV9QSVBFIGFuZCBXTV9MUC4KICAqIG1lbV92YWx1ZSBtdXN0 IGJlIGluIDAuMXVzIHVuaXRzLgogICovCi1zdGF0aWMgdWludDMyX3QgaWxrX2NvbXB1dGVfc3By X3dtKGNvbnN0IHN0cnVjdCBpbGtfcGlwZV93bV9wYXJhbWV0ZXJzICpwYXJhbXMsCitzdGF0aWMg dWludDMyX3QgaWxrX2NvbXB1dGVfc3ByX3dtKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjc3RhdGUsCiAJCQkJICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwc3RhdGUs CiAJCQkJICAgdWludDMyX3QgbWVtX3ZhbHVlKQogewogCWludCBicHAgPSBwc3RhdGUtPmJhc2Uu ZmIgPyBwc3RhdGUtPmJhc2UuZmItPmJpdHNfcGVyX3BpeGVsIC8gOCA6IDA7CiAJdWludDMyX3Qg bWV0aG9kMSwgbWV0aG9kMjsKIAotCWlmICghcGFyYW1zLT5hY3RpdmUgfHwgIXBzdGF0ZS0+dmlz aWJsZSkKKwlpZiAoIWNzdGF0ZS0+YmFzZS5hY3RpdmUgfHwgIXBzdGF0ZS0+dmlzaWJsZSkKIAkJ cmV0dXJuIDA7CiAKLQltZXRob2QxID0gaWxrX3dtX21ldGhvZDEocGFyYW1zLT5waXhlbF9yYXRl LCBicHAsIG1lbV92YWx1ZSk7Ci0JbWV0aG9kMiA9IGlsa193bV9tZXRob2QyKHBhcmFtcy0+cGl4 ZWxfcmF0ZSwKLQkJCQkgcGFyYW1zLT5waXBlX2h0b3RhbCwKKwltZXRob2QxID0gaWxrX3dtX21l dGhvZDEoaWxrX3BpcGVfcGl4ZWxfcmF0ZShjc3RhdGUpLCBicHAsIG1lbV92YWx1ZSk7CisJbWV0 aG9kMiA9IGlsa193bV9tZXRob2QyKGlsa19waXBlX3BpeGVsX3JhdGUoY3N0YXRlKSwKKwkJCQkg Y3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWwsCiAJCQkJIGRybV9yZWN0X3dp ZHRoKCZwc3RhdGUtPmRzdCksCiAJCQkJIGJwcCwKIAkJCQkgbWVtX3ZhbHVlKTsKQEAgLTE1ODYs MzAgKzE1NzgsMzAgQEAgc3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX3Nwcl93bShjb25zdCBz dHJ1Y3QgaWxrX3BpcGVfd21fcGFyYW1ldGVycyAqcGFyYW1zLAogICogRm9yIGJvdGggV01fUElQ RSBhbmQgV01fTFAuCiAgKiBtZW1fdmFsdWUgbXVzdCBiZSBpbiAwLjF1cyB1bml0cy4KICAqLwot c3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX2N1cl93bShjb25zdCBzdHJ1Y3QgaWxrX3BpcGVf d21fcGFyYW1ldGVycyAqcGFyYW1zLAorc3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX2N1cl93 bShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkJCSAgIGNvbnN0IHN0 cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHN0YXRlLAogCQkJCSAgIHVpbnQzMl90IG1lbV92YWx1 ZSkKIHsKIAlpbnQgYnBwID0gcHN0YXRlLT5iYXNlLmZiID8gcHN0YXRlLT5iYXNlLmZiLT5iaXRz X3Blcl9waXhlbCAvIDggOiAwOwogCi0JaWYgKCFwYXJhbXMtPmFjdGl2ZSB8fCAhcHN0YXRlLT52 aXNpYmxlKQorCWlmICghY3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCAhcHN0YXRlLT52aXNpYmxlKQog CQlyZXR1cm4gMDsKIAotCXJldHVybiBpbGtfd21fbWV0aG9kMihwYXJhbXMtPnBpeGVsX3JhdGUs Ci0JCQkgICAgICBwYXJhbXMtPnBpcGVfaHRvdGFsLAorCXJldHVybiBpbGtfd21fbWV0aG9kMihp bGtfcGlwZV9waXhlbF9yYXRlKGNzdGF0ZSksCisJCQkgICAgICBjc3RhdGUtPmJhc2UuYWRqdXN0 ZWRfbW9kZS5jcnRjX2h0b3RhbCwKIAkJCSAgICAgIGRybV9yZWN0X3dpZHRoKCZwc3RhdGUtPmRz dCksCiAJCQkgICAgICBicHAsCiAJCQkgICAgICBtZW1fdmFsdWUpOwogfQogCiAvKiBPbmx5IGZv ciBXTV9MUC4gKi8KLXN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9mYmNfd20oY29uc3Qgc3Ry dWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMgKnBhcmFtcywKK3N0YXRpYyB1aW50MzJfdCBpbGtf Y29tcHV0ZV9mYmNfd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJ CQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSwKIAkJCQkgICB1aW50 MzJfdCBwcmlfdmFsKQogewogCWludCBicHAgPSBwc3RhdGUtPmJhc2UuZmIgPyBwc3RhdGUtPmJh c2UuZmItPmJpdHNfcGVyX3BpeGVsIC8gOCA6IDA7CiAKLQlpZiAoIXBhcmFtcy0+YWN0aXZlIHx8 ICFwc3RhdGUtPnZpc2libGUpCisJaWYgKCFjc3RhdGUtPmJhc2UuYWN0aXZlIHx8ICFwc3RhdGUt PnZpc2libGUpCiAJCXJldHVybiAwOwogCiAJcmV0dXJuIGlsa193bV9mYmMocHJpX3ZhbCwgZHJt X3JlY3Rfd2lkdGgoJnBzdGF0ZS0+ZHN0KSwgYnBwKTsKQEAgLTE3NzksNyArMTc3MSw3IEBAIHN0 YXRpYyBib29sIGlsa192YWxpZGF0ZV93bV9sZXZlbChpbnQgbGV2ZWwsCiBzdGF0aWMgdm9pZCBp bGtfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCQkJCSBpbnQg bGV2ZWwsCi0JCQkJIGNvbnN0IHN0cnVjdCBpbGtfcGlwZV93bV9wYXJhbWV0ZXJzICpwLAorCQkJ CSBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkJCSBzdHJ1Y3QgaW50ZWxfd21f bGV2ZWwgKnJlc3VsdCkKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOwpAQCAt MTgwMCwxOCArMTc5MiwxOCBAQCBzdGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9sZXZlbChjb25z dCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAkJc3dpdGNoIChpbnRlbF9w bGFuZS0+YmFzZS50eXBlKSB7CiAJCWNhc2UgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWToKLQkJCXJl c3VsdC0+cHJpX3ZhbCA9IGlsa19jb21wdXRlX3ByaV93bShwLCBwc3RhdGUsCisJCQlyZXN1bHQt PnByaV92YWwgPSBpbGtfY29tcHV0ZV9wcmlfd20oY3N0YXRlLCBwc3RhdGUsCiAJCQkJCQkJICAg ICBwcmlfbGF0ZW5jeSwKIAkJCQkJCQkgICAgIGxldmVsKTsKLQkJCXJlc3VsdC0+ZmJjX3ZhbCA9 IGlsa19jb21wdXRlX2ZiY193bShwLCBwc3RhdGUsCisJCQlyZXN1bHQtPmZiY192YWwgPSBpbGtf Y29tcHV0ZV9mYmNfd20oY3N0YXRlLCBwc3RhdGUsCiAJCQkJCQkJICAgICByZXN1bHQtPnByaV92 YWwpOwogCQkJYnJlYWs7CiAJCWNhc2UgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWToKLQkJCXJlc3Vs dC0+c3ByX3ZhbCA9IGlsa19jb21wdXRlX3Nwcl93bShwLCBwc3RhdGUsCisJCQlyZXN1bHQtPnNw cl92YWwgPSBpbGtfY29tcHV0ZV9zcHJfd20oY3N0YXRlLCBwc3RhdGUsCiAJCQkJCQkJICAgICBz cHJfbGF0ZW5jeSk7CiAJCQlicmVhazsKIAkJY2FzZSBEUk1fUExBTkVfVFlQRV9DVVJTT1I6Ci0J CQlyZXN1bHQtPmN1cl92YWwgPSBpbGtfY29tcHV0ZV9jdXJfd20ocCwgcHN0YXRlLAorCQkJcmVz dWx0LT5jdXJfdmFsID0gaWxrX2NvbXB1dGVfY3VyX3dtKGNzdGF0ZSwgcHN0YXRlLAogCQkJCQkJ CSAgICAgY3VyX2xhdGVuY3kpOwogCQkJYnJlYWs7CiAJCX0KQEAgLTIwNzUsMTkgKzIwNjcsNiBA QCBzdGF0aWMgdm9pZCBza2xfc2V0dXBfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2LCAiR2VuOSBQbGFuZSIsIGRldl9wcml2LT53 bS5za2xfbGF0ZW5jeSk7CiB9CiAKLXN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX3BhcmFtZXRl cnMoc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkJCSAgICAgIHN0cnVjdCBpbGtfcGlwZV93bV9w YXJhbWV0ZXJzICpwKQotewotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjKTsKLQotCWlmICghaW50ZWxfY3J0Yy0+YWN0aXZlKQotCQlyZXR1cm47Ci0K LQlwLT5hY3RpdmUgPSB0cnVlOwotCXAtPnBpcGVfaHRvdGFsID0gaW50ZWxfY3J0Yy0+Y29uZmln LT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWw7Ci0JcC0+cGl4ZWxfcmF0ZSA9IGlsa19w aXBlX3BpeGVsX3JhdGUoY3J0Yy0+ZGV2LCBjcnRjKTsKLX0KLQogc3RhdGljIHZvaWQgaWxrX2Nv bXB1dGVfd21fY29uZmlnKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICBzdHJ1Y3QgaW50 ZWxfd21fY29uZmlnICpjb25maWcpCiB7CkBAIC0yMTA3LDEwICsyMDg2LDEwIEBAIHN0YXRpYyB2 b2lkIGlsa19jb21wdXRlX3dtX2NvbmZpZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogfQogCiAv KiBDb21wdXRlIG5ldyB3YXRlcm1hcmtzIGZvciB0aGUgcGlwZSAqLwotc3RhdGljIGJvb2wgaW50 ZWxfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJCQkgIGNvbnN0IHN0 cnVjdCBpbGtfcGlwZV93bV9wYXJhbWV0ZXJzICpwYXJhbXMsCitzdGF0aWMgYm9vbCBpbnRlbF9j b21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQkgIHN0 cnVjdCBpbnRlbF9waXBlX3dtICpwaXBlX3dtKQogeworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9 IGNzdGF0ZS0+YmFzZS5jcnRjOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7 CiAJY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Yyk7CkBAIC0yMTM1LDggKzIxMTQsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9jb21wdXRlX3BpcGVf d20oc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlkcm1fcmVjdF93aWR0aCgmc3Byc3RhdGUtPmRz dCkgIT0gZHJtX3JlY3Rfd2lkdGgoJnNwcnN0YXRlLT5zcmMpID4+IDE2IHx8CiAJCWRybV9yZWN0 X2hlaWdodCgmc3Byc3RhdGUtPmRzdCkgIT0gZHJtX3JlY3RfaGVpZ2h0KCZzcHJzdGF0ZS0+c3Jj KSA+PiAxNjsKIAotCi0JcGlwZV93bS0+cGlwZV9lbmFibGVkID0gcGFyYW1zLT5hY3RpdmU7CisJ cGlwZV93bS0+cGlwZV9lbmFibGVkID0gY3N0YXRlLT5iYXNlLmFjdGl2ZTsKIAlwaXBlX3dtLT5z cHJpdGVzX2VuYWJsZWQgPSBzcHJzdGF0ZS0+dmlzaWJsZTsKIAlwaXBlX3dtLT5zcHJpdGVzX3Nj YWxlZCA9IGNvbmZpZy5zcHJpdGVzX3NjYWxlZDsKIApAQCAtMjE0OCw3ICsyMTI2LDcgQEAgc3Rh dGljIGJvb2wgaW50ZWxfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlp ZiAoY29uZmlnLnNwcml0ZXNfc2NhbGVkKQogCQltYXhfbGV2ZWwgPSAwOwogCi0JaWxrX2NvbXB1 dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGludGVsX2NydGMsIDAsIHBhcmFtcywgJnBpcGVfd20tPndt WzBdKTsKKwlpbGtfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwgaW50ZWxfY3J0YywgMCwgY3N0 YXRlLCAmcGlwZV93bS0+d21bMF0pOwogCiAJaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9B RFdFTEwoZGV2KSkKIAkJcGlwZV93bS0+bGluZXRpbWUgPSBoc3dfY29tcHV0ZV9saW5ldGltZV93 bShkZXYsIGNydGMpOwpAQCAtMjE2NSw3ICsyMTQzLDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfY29t cHV0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlmb3IgKGxldmVsID0gMTsgbGV2 ZWwgPD0gbWF4X2xldmVsOyBsZXZlbCsrKSB7CiAJCXN0cnVjdCBpbnRlbF93bV9sZXZlbCB3bSA9 IHt9OwogCi0JCWlsa19jb21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBpbnRlbF9jcnRjLCBsZXZl bCwgcGFyYW1zLCAmd20pOworCQlpbGtfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwgaW50ZWxf Y3J0YywgbGV2ZWwsIGNzdGF0ZSwgJndtKTsKIAogCQkvKgogCQkgKiBEaXNhYmxlIGFueSB3YXRl cm1hcmsgbGV2ZWwgdGhhdCBleGNlZWRzIHRoZQpAQCAtMzQ2NywxOSArMzQ0NSwxNyBAQCBza2xf dXBkYXRlX3Nwcml0ZV93bShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRj ICpjcnRjLAogc3RhdGljIHZvaWQgaWxrX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMp CiB7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMp OworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRl KGNydGMtPnN0YXRlKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3Ry dWN0IGlsa193bV9tYXhpbXVtcyBtYXg7Ci0Jc3RydWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMg cGFyYW1zID0ge307CiAJc3RydWN0IGlsa193bV92YWx1ZXMgcmVzdWx0cyA9IHt9OwogCWVudW0g aW50ZWxfZGRiX3BhcnRpdGlvbmluZyBwYXJ0aXRpb25pbmc7CiAJc3RydWN0IGludGVsX3BpcGVf d20gcGlwZV93bSA9IHt9OwogCXN0cnVjdCBpbnRlbF9waXBlX3dtIGxwX3dtXzFfMiA9IHt9LCBs cF93bV81XzYgPSB7fSwgKmJlc3RfbHBfd207CiAJc3RydWN0IGludGVsX3dtX2NvbmZpZyBjb25m aWcgPSB7fTsKIAotCWlsa19jb21wdXRlX3dtX3BhcmFtZXRlcnMoY3J0YywgJnBhcmFtcyk7Ci0K LQlpbnRlbF9jb21wdXRlX3BpcGVfd20oY3J0YywgJnBhcmFtcywgJnBpcGVfd20pOworCWludGVs X2NvbXB1dGVfcGlwZV93bShjc3RhdGUsICZwaXBlX3dtKTsKIAogCWlmICghbWVtY21wKCZpbnRl bF9jcnRjLT53bS5hY3RpdmUsICZwaXBlX3dtLCBzaXplb2YocGlwZV93bSkpKQogCQlyZXR1cm47 CkBAIC0zNTE5LDEyICszNDk1LDYgQEAgaWxrX3VwZGF0ZV9zcHJpdGVfd20oc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJc3Ry dWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAot CWludGVsX3BsYW5lLT53bS5lbmFibGVkID0gZW5hYmxlZDsKLQlpbnRlbF9wbGFuZS0+d20uc2Nh bGVkID0gc2NhbGVkOwotCWludGVsX3BsYW5lLT53bS5ob3Jpel9waXhlbHMgPSBzcHJpdGVfd2lk dGg7Ci0JaW50ZWxfcGxhbmUtPndtLnZlcnRfcGl4ZWxzID0gc3ByaXRlX3dpZHRoOwotCWludGVs X3BsYW5lLT53bS5ieXRlc19wZXJfcGl4ZWwgPSBwaXhlbF9zaXplOwotCiAJLyoKIAkgKiBJVkIg d29ya2Fyb3VuZDogbXVzdCBkaXNhYmxlIGxvdyBwb3dlciB3YXRlcm1hcmtzIGZvciBhdCBsZWFz dAogCSAqIG9uZSBmcmFtZSBiZWZvcmUgZW5hYmxpbmcgc2NhbGluZy4gIExQIHdhdGVybWFya3Mg Y2FuIGJlIHJlLWVuYWJsZWQKLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==