From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [RFC 2/8] drm/i915: Eliminate usage of pipe_wm_parameters from ILK-style WM Date: Wed, 1 Jul 2015 19:25:55 -0700 Message-ID: <1435803961-30079-3-git-send-email-matthew.d.roper@intel.com> References: <1435803961-30079-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id C5ECC6E409 for ; Wed, 1 Jul 2015 19:26:44 -0700 (PDT) In-Reply-To: <1435803961-30079-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 cHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDg0ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgNTYgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggMmYzODA3MC4uYTYzOWNjOSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0xNzc0LDEyICsxNzc0LDYgQEAgc3RydWN0IHNrbF9w aXBlX3dtX3BhcmFtZXRlcnMgewogCXN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIGN1 cnNvcjsKIH07CiAKLXN0cnVjdCBpbGtfcGlwZV93bV9wYXJhbWV0ZXJzIHsKLQlib29sIGFjdGl2 ZTsKLQl1aW50MzJfdCBwaXBlX2h0b3RhbDsKLQl1aW50MzJfdCBwaXhlbF9yYXRlOwotfTsKLQog c3RydWN0IGlsa193bV9tYXhpbXVtcyB7CiAJdWludDE2X3QgcHJpOwogCXVpbnQxNl90IHNwcjsK QEAgLTE3OTgsNyArMTc5Miw3IEBAIHN0cnVjdCBpbnRlbF93bV9jb25maWcgewogICogRm9yIGJv dGggV01fUElQRSBhbmQgV01fTFAuCiAgKiBtZW1fdmFsdWUgbXVzdCBiZSBpbiAwLjF1cyB1bml0 cy4KICAqLwotc3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX3ByaV93bShjb25zdCBzdHJ1Y3Qg aWxrX3BpcGVfd21fcGFyYW1ldGVycyAqcGFyYW1zLAorc3RhdGljIHVpbnQzMl90IGlsa19jb21w dXRlX3ByaV93bShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkJCSAg IGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHN0YXRlLAogCQkJCSAgIHVpbnQzMl90 IG1lbV92YWx1ZSwKIAkJCQkgICBib29sIGlzX2xwKQpAQCAtMTgwNiwxNiArMTgwMCwxNiBAQCBz dGF0aWMgdWludDMyX3QgaWxrX2NvbXB1dGVfcHJpX3dtKGNvbnN0IHN0cnVjdCBpbGtfcGlwZV93 bV9wYXJhbWV0ZXJzICpwYXJhbXMsCiAJaW50IGJwcCA9IHBzdGF0ZS0+YmFzZS5mYiA/IHBzdGF0 ZS0+YmFzZS5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4IDogMDsKIAl1aW50MzJfdCBtZXRob2QxLCBt ZXRob2QyOwogCi0JaWYgKCFwYXJhbXMtPmFjdGl2ZSB8fCAhcHN0YXRlLT52aXNpYmxlKQorCWlm ICghY3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCAhcHN0YXRlLT52aXNpYmxlKQogCQlyZXR1cm4gMDsK IAotCW1ldGhvZDEgPSBpbGtfd21fbWV0aG9kMShwYXJhbXMtPnBpeGVsX3JhdGUsIGJwcCwgbWVt X3ZhbHVlKTsKKwltZXRob2QxID0gaWxrX3dtX21ldGhvZDEoaWxrX3BpcGVfcGl4ZWxfcmF0ZShj c3RhdGUpLCBicHAsIG1lbV92YWx1ZSk7CiAKIAlpZiAoIWlzX2xwKQogCQlyZXR1cm4gbWV0aG9k MTsKIAotCW1ldGhvZDIgPSBpbGtfd21fbWV0aG9kMihwYXJhbXMtPnBpeGVsX3JhdGUsCi0JCQkJ IHBhcmFtcy0+cGlwZV9odG90YWwsCisJbWV0aG9kMiA9IGlsa193bV9tZXRob2QyKGlsa19waXBl X3BpeGVsX3JhdGUoY3N0YXRlKSwKKwkJCQkgY3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0 Y19odG90YWwsCiAJCQkJIGRybV9yZWN0X3dpZHRoKCZwc3RhdGUtPmRzdCksCiAJCQkJIGJwcCwK IAkJCQkgbWVtX3ZhbHVlKTsKQEAgLTE4MjcsMTkgKzE4MjEsMTkgQEAgc3RhdGljIHVpbnQzMl90 IGlsa19jb21wdXRlX3ByaV93bShjb25zdCBzdHJ1Y3QgaWxrX3BpcGVfd21fcGFyYW1ldGVycyAq cGFyYW1zLAogICogRm9yIGJvdGggV01fUElQRSBhbmQgV01fTFAuCiAgKiBtZW1fdmFsdWUgbXVz dCBiZSBpbiAwLjF1cyB1bml0cy4KICAqLwotc3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX3Nw cl93bShjb25zdCBzdHJ1Y3QgaWxrX3BpcGVfd21fcGFyYW1ldGVycyAqcGFyYW1zLAorc3RhdGlj IHVpbnQzMl90IGlsa19jb21wdXRlX3Nwcl93bShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3N0YXRlLAogCQkJCSAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHN0YXRl LAogCQkJCSAgIHVpbnQzMl90IG1lbV92YWx1ZSkKIHsKIAlpbnQgYnBwID0gcHN0YXRlLT5iYXNl LmZiID8gcHN0YXRlLT5iYXNlLmZiLT5iaXRzX3Blcl9waXhlbCAvIDggOiAwOwogCXVpbnQzMl90 IG1ldGhvZDEsIG1ldGhvZDI7CiAKLQlpZiAoIXBhcmFtcy0+YWN0aXZlIHx8ICFwc3RhdGUtPnZp c2libGUpCisJaWYgKCFjc3RhdGUtPmJhc2UuYWN0aXZlIHx8ICFwc3RhdGUtPnZpc2libGUpCiAJ CXJldHVybiAwOwogCi0JbWV0aG9kMSA9IGlsa193bV9tZXRob2QxKHBhcmFtcy0+cGl4ZWxfcmF0 ZSwgYnBwLCBtZW1fdmFsdWUpOwotCW1ldGhvZDIgPSBpbGtfd21fbWV0aG9kMihwYXJhbXMtPnBp eGVsX3JhdGUsCi0JCQkJIHBhcmFtcy0+cGlwZV9odG90YWwsCisJbWV0aG9kMSA9IGlsa193bV9t ZXRob2QxKGlsa19waXBlX3BpeGVsX3JhdGUoY3N0YXRlKSwgYnBwLCBtZW1fdmFsdWUpOworCW1l dGhvZDIgPSBpbGtfd21fbWV0aG9kMihpbGtfcGlwZV9waXhlbF9yYXRlKGNzdGF0ZSksCisJCQkJ IGNzdGF0ZS0+YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFsLAogCQkJCSBkcm1fcmVjdF93 aWR0aCgmcHN0YXRlLT5kc3QpLAogCQkJCSBicHAsCiAJCQkJIG1lbV92YWx1ZSk7CkBAIC0xODUw LDMwICsxODQ0LDMwIEBAIHN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9zcHJfd20oY29uc3Qg c3RydWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMgKnBhcmFtcywKICAqIEZvciBib3RoIFdNX1BJ UEUgYW5kIFdNX0xQLgogICogbWVtX3ZhbHVlIG11c3QgYmUgaW4gMC4xdXMgdW5pdHMuCiAgKi8K LXN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9jdXJfd20oY29uc3Qgc3RydWN0IGlsa19waXBl X3dtX3BhcmFtZXRlcnMgKnBhcmFtcywKK3N0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9jdXJf d20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQkgICBjb25zdCBz dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSwKIAkJCQkgICB1aW50MzJfdCBtZW1fdmFs dWUpCiB7CiAJaW50IGJwcCA9IHBzdGF0ZS0+YmFzZS5mYiA/IHBzdGF0ZS0+YmFzZS5mYi0+Yml0 c19wZXJfcGl4ZWwgLyA4IDogMDsKIAotCWlmICghcGFyYW1zLT5hY3RpdmUgfHwgIXBzdGF0ZS0+ dmlzaWJsZSkKKwlpZiAoIWNzdGF0ZS0+YmFzZS5hY3RpdmUgfHwgIXBzdGF0ZS0+dmlzaWJsZSkK IAkJcmV0dXJuIDA7CiAKLQlyZXR1cm4gaWxrX3dtX21ldGhvZDIocGFyYW1zLT5waXhlbF9yYXRl LAotCQkJICAgICAgcGFyYW1zLT5waXBlX2h0b3RhbCwKKwlyZXR1cm4gaWxrX3dtX21ldGhvZDIo aWxrX3BpcGVfcGl4ZWxfcmF0ZShjc3RhdGUpLAorCQkJICAgICAgY3N0YXRlLT5iYXNlLmFkanVz dGVkX21vZGUuY3J0Y19odG90YWwsCiAJCQkgICAgICBkcm1fcmVjdF93aWR0aCgmcHN0YXRlLT5k c3QpLAogCQkJICAgICAgYnBwLAogCQkJICAgICAgbWVtX3ZhbHVlKTsKIH0KIAogLyogT25seSBm b3IgV01fTFAuICovCi1zdGF0aWMgdWludDMyX3QgaWxrX2NvbXB1dGVfZmJjX3dtKGNvbnN0IHN0 cnVjdCBpbGtfcGlwZV93bV9wYXJhbWV0ZXJzICpwYXJhbXMsCitzdGF0aWMgdWludDMyX3QgaWxr X2NvbXB1dGVfZmJjX3dtKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJ CQkJICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwc3RhdGUsCiAJCQkJICAgdWlu dDMyX3QgcHJpX3ZhbCkKIHsKIAlpbnQgYnBwID0gcHN0YXRlLT5iYXNlLmZiID8gcHN0YXRlLT5i YXNlLmZiLT5iaXRzX3Blcl9waXhlbCAvIDggOiAwOwogCi0JaWYgKCFwYXJhbXMtPmFjdGl2ZSB8 fCAhcHN0YXRlLT52aXNpYmxlKQorCWlmICghY3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCAhcHN0YXRl LT52aXNpYmxlKQogCQlyZXR1cm4gMDsKIAogCXJldHVybiBpbGtfd21fZmJjKHByaV92YWwsIGRy bV9yZWN0X3dpZHRoKCZwc3RhdGUtPmRzdCksIGJwcCk7CkBAIC0yMDQzLDcgKzIwMzcsNyBAQCBz dGF0aWMgYm9vbCBpbGtfdmFsaWRhdGVfd21fbGV2ZWwoaW50IGxldmVsLAogc3RhdGljIHZvaWQg aWxrX2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCQkJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkJCQkgaW50 IGxldmVsLAotCQkJCSBjb25zdCBzdHJ1Y3QgaWxrX3BpcGVfd21fcGFyYW1ldGVycyAqcCwKKwkJ CQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQkgc3RydWN0IGludGVsX3dt X2xldmVsICpyZXN1bHQpCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZTsKQEAg LTIwNjQsMTggKzIwNTgsMTggQEAgc3RhdGljIHZvaWQgaWxrX2NvbXB1dGVfd21fbGV2ZWwoY29u c3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJCXN3aXRjaCAoaW50ZWxf cGxhbmUtPmJhc2UudHlwZSkgewogCQljYXNlIERSTV9QTEFORV9UWVBFX1BSSU1BUlk6Ci0JCQly ZXN1bHQtPnByaV92YWwgPSBpbGtfY29tcHV0ZV9wcmlfd20ocCwgcHN0YXRlLAorCQkJcmVzdWx0 LT5wcmlfdmFsID0gaWxrX2NvbXB1dGVfcHJpX3dtKGNzdGF0ZSwgcHN0YXRlLAogCQkJCQkJCSAg ICAgcHJpX2xhdGVuY3ksCiAJCQkJCQkJICAgICBsZXZlbCk7Ci0JCQlyZXN1bHQtPmZiY192YWwg PSBpbGtfY29tcHV0ZV9mYmNfd20ocCwgcHN0YXRlLAorCQkJcmVzdWx0LT5mYmNfdmFsID0gaWxr X2NvbXB1dGVfZmJjX3dtKGNzdGF0ZSwgcHN0YXRlLAogCQkJCQkJCSAgICAgcmVzdWx0LT5wcmlf dmFsKTsKIAkJCWJyZWFrOwogCQljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6Ci0JCQlyZXN1 bHQtPnNwcl92YWwgPSBpbGtfY29tcHV0ZV9zcHJfd20ocCwgcHN0YXRlLAorCQkJcmVzdWx0LT5z cHJfdmFsID0gaWxrX2NvbXB1dGVfc3ByX3dtKGNzdGF0ZSwgcHN0YXRlLAogCQkJCQkJCSAgICAg c3ByX2xhdGVuY3kpOwogCQkJYnJlYWs7CiAJCWNhc2UgRFJNX1BMQU5FX1RZUEVfQ1VSU09SOgot CQkJcmVzdWx0LT5jdXJfdmFsID0gaWxrX2NvbXB1dGVfY3VyX3dtKHAsIHBzdGF0ZSwKKwkJCXJl c3VsdC0+Y3VyX3ZhbCA9IGlsa19jb21wdXRlX2N1cl93bShjc3RhdGUsIHBzdGF0ZSwKIAkJCQkJ CQkgICAgIGN1cl9sYXRlbmN5KTsKIAkJCWJyZWFrOwogCQl9CkBAIC0yMzM5LDE5ICsyMzMzLDYg QEAgc3RhdGljIHZvaWQgc2tsX3NldHVwX3dtX2xhdGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRldiwgIkdlbjkgUGxhbmUiLCBkZXZfcHJpdi0+ d20uc2tsX2xhdGVuY3kpOwogfQogCi1zdGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9wYXJhbWV0 ZXJzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJCQkgICAgICBzdHJ1Y3QgaWxrX3BpcGVfd21f cGFyYW1ldGVycyAqcCkKLXsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2lu dGVsX2NydGMoY3J0Yyk7Ci0KLQlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKLQkJcmV0dXJuOwot Ci0JcC0+YWN0aXZlID0gdHJ1ZTsKLQlwLT5waXBlX2h0b3RhbCA9IGludGVsX2NydGMtPmNvbmZp Zy0+YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFsOwotCXAtPnBpeGVsX3JhdGUgPSBpbGtf cGlwZV9waXhlbF9yYXRlKGludGVsX2NydGMtPmNvbmZpZyk7Ci19Ci0KIHN0YXRpYyB2b2lkIGls a19jb21wdXRlX3dtX2NvbmZpZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgc3RydWN0 IGludGVsX3dtX2NvbmZpZyAqY29uZmlnKQogewpAQCAtMjM3MSwxMCArMjM1MiwxMCBAQCBzdGF0 aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9jb25maWcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIH0K IAogLyogQ29tcHV0ZSBuZXcgd2F0ZXJtYXJrcyBmb3IgdGhlIHBpcGUgKi8KLXN0YXRpYyBib29s IGludGVsX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0JCQkJICBjb25z dCBzdHJ1Y3QgaWxrX3BpcGVfd21fcGFyYW1ldGVycyAqcGFyYW1zLAorc3RhdGljIGJvb2wgaW50 ZWxfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCQkJ ICBzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqcGlwZV93bSkKIHsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNy dGMgPSBjc3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ ZGV2OwogCWNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2 X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj KGNydGMpOwpAQCAtMjM5OSw4ICsyMzgwLDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfY29tcHV0ZV9w aXBlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJZHJtX3JlY3Rfd2lkdGgoJnNwcnN0YXRl LT5kc3QpICE9IGRybV9yZWN0X3dpZHRoKCZzcHJzdGF0ZS0+c3JjKSA+PiAxNiB8fAogCQlkcm1f cmVjdF9oZWlnaHQoJnNwcnN0YXRlLT5kc3QpICE9IGRybV9yZWN0X2hlaWdodCgmc3Byc3RhdGUt PnNyYykgPj4gMTY7CiAKLQotCXBpcGVfd20tPnBpcGVfZW5hYmxlZCA9IHBhcmFtcy0+YWN0aXZl OworCXBpcGVfd20tPnBpcGVfZW5hYmxlZCA9IGNzdGF0ZS0+YmFzZS5hY3RpdmU7CiAJcGlwZV93 bS0+c3ByaXRlc19lbmFibGVkID0gc3Byc3RhdGUtPnZpc2libGU7CiAJcGlwZV93bS0+c3ByaXRl c19zY2FsZWQgPSBjb25maWcuc3ByaXRlc19zY2FsZWQ7CiAKQEAgLTI0MTIsNyArMjM5Miw3IEBA IHN0YXRpYyBib29sIGludGVsX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMs CiAJaWYgKGNvbmZpZy5zcHJpdGVzX3NjYWxlZCkKIAkJbWF4X2xldmVsID0gMDsKIAotCWlsa19j b21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBpbnRlbF9jcnRjLCAwLCBwYXJhbXMsICZwaXBlX3dt LT53bVswXSk7CisJaWxrX2NvbXB1dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGludGVsX2NydGMsIDAs IGNzdGF0ZSwgJnBpcGVfd20tPndtWzBdKTsKIAogCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNf QlJPQURXRUxMKGRldikpCiAJCXBpcGVfd20tPmxpbmV0aW1lID0gaHN3X2NvbXB1dGVfbGluZXRp bWVfd20oZGV2LCBjcnRjKTsKQEAgLTI0MjksNyArMjQwOSw3IEBAIHN0YXRpYyBib29sIGludGVs X2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJZm9yIChsZXZlbCA9IDE7 IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykgewogCQlzdHJ1Y3QgaW50ZWxfd21fbGV2ZWwg d20gPSB7fTsKIAotCQlpbGtfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwgaW50ZWxfY3J0Yywg bGV2ZWwsIHBhcmFtcywgJndtKTsKKwkJaWxrX2NvbXB1dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGlu dGVsX2NydGMsIGxldmVsLCBjc3RhdGUsICZ3bSk7CiAKIAkJLyoKIAkJICogRGlzYWJsZSBhbnkg d2F0ZXJtYXJrIGxldmVsIHRoYXQgZXhjZWVkcyB0aGUKQEAgLTM3MzEsMTkgKzM3MTEsMTcgQEAg c2tsX3VwZGF0ZV9zcHJpdGVfd20oc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIHN0YXRpYyB2b2lkIGlsa191cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICpj cnRjKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhj cnRjKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0Y19z dGF0ZShjcnRjLT5zdGF0ZSk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBpbGtfd21fbWF4aW11bXMgbWF4OwotCXN0cnVjdCBpbGtfcGlwZV93bV9wYXJhbWV0 ZXJzIHBhcmFtcyA9IHt9OwogCXN0cnVjdCBpbGtfd21fdmFsdWVzIHJlc3VsdHMgPSB7fTsKIAll bnVtIGludGVsX2RkYl9wYXJ0aXRpb25pbmcgcGFydGl0aW9uaW5nOwogCXN0cnVjdCBpbnRlbF9w aXBlX3dtIHBpcGVfd20gPSB7fTsKIAlzdHJ1Y3QgaW50ZWxfcGlwZV93bSBscF93bV8xXzIgPSB7 fSwgbHBfd21fNV82ID0ge30sICpiZXN0X2xwX3dtOwogCXN0cnVjdCBpbnRlbF93bV9jb25maWcg Y29uZmlnID0ge307CiAKLQlpbGtfY29tcHV0ZV93bV9wYXJhbWV0ZXJzKGNydGMsICZwYXJhbXMp OwotCi0JaW50ZWxfY29tcHV0ZV9waXBlX3dtKGNydGMsICZwYXJhbXMsICZwaXBlX3dtKTsKKwlp bnRlbF9jb21wdXRlX3BpcGVfd20oY3N0YXRlLCAmcGlwZV93bSk7CiAKIAlpZiAoIW1lbWNtcCgm aW50ZWxfY3J0Yy0+d20uYWN0aXZlLCAmcGlwZV93bSwgc2l6ZW9mKHBpcGVfd20pKSkKIAkJcmV0 dXJuOwpAQCAtMzc4MywxMiArMzc2MSw2IEBAIGlsa191cGRhdGVfc3ByaXRlX3dtKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2Owog CXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7 CiAKLQlpbnRlbF9wbGFuZS0+d20uZW5hYmxlZCA9IGVuYWJsZWQ7Ci0JaW50ZWxfcGxhbmUtPndt LnNjYWxlZCA9IHNjYWxlZDsKLQlpbnRlbF9wbGFuZS0+d20uaG9yaXpfcGl4ZWxzID0gc3ByaXRl X3dpZHRoOwotCWludGVsX3BsYW5lLT53bS52ZXJ0X3BpeGVscyA9IHNwcml0ZV93aWR0aDsKLQlp bnRlbF9wbGFuZS0+d20uYnl0ZXNfcGVyX3BpeGVsID0gcGl4ZWxfc2l6ZTsKLQogCS8qCiAJICog SVZCIHdvcmthcm91bmQ6IG11c3QgZGlzYWJsZSBsb3cgcG93ZXIgd2F0ZXJtYXJrcyBmb3IgYXQg bGVhc3QKIAkgKiBvbmUgZnJhbWUgYmVmb3JlIGVuYWJsaW5nIHNjYWxpbmcuICBMUCB3YXRlcm1h cmtzIGNhbiBiZSByZS1lbmFibGVkCi0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK