From: Matt Roper Subject: [RFC 06/15] drm/i915: Eliminate usage of plane_wm_parameters from ILK-style WM code Date: Wed, 20 May 2015 19:12:18 -0700 Message-ID: <1432174347-19138-7-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 39C396E804 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 SnVzdCBwdWxsIHRoZSBpbmZvIG91dCBvZiB0aGUgcGxhbmUgc3RhdGUgc3RydWN0dXJlIHJhdGhl ciB0aGFuIHN0YWdpbmcKaXQgaW4gYW4gYWRkaXRpb25hbCBzdHJ1Y3R1cmUuCgpTaWduZWQtb2Zm LWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgIDQgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMgfCAxMzUgKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQog MiBmaWxlcyBjaGFuZ2VkLCA3NSBpbnNlcnRpb25zKCspLCA2NCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCA3MzFiNWNlLi5kZjU2NzNmIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTI0Myw2ICsyNDMsMTAgQEAgZW51bSBocGRfcGluIHsKIAkJCSAgICAmZGV2 LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0LAlcCiAJCQkgICAgYmFzZS5oZWFkKQogCisjZGVmaW5l IGZvcl9lYWNoX2ludGVsX3BsYW5lX29mX2NydGMoaW50ZWxfY3J0YywgaW50ZWxfcGxhbmUpIFwK Kwlmb3JfZWFjaF9pbnRlbF9wbGFuZShpbnRlbF9jcnRjLT5iYXNlLmRldiwgaW50ZWxfcGxhbmUp IFwKKwkJaWYgKGludGVsX3BsYW5lLT5waXBlID09IGludGVsX2NydGMtPnBpcGUpCisKICNkZWZp bmUgZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGludGVsX2NydGMpIFwKIAlsaXN0X2Zvcl9lYWNo X2VudHJ5KGludGVsX2NydGMsICZkZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgYmFzZS5oZWFk KQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAyMTcwY2M1Li5lNDI0MmZmIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMKQEAgLTE1MTQsOSArMTUxNCw2IEBAIHN0cnVjdCBpbGtfcGlwZV93 bV9wYXJhbWV0ZXJzIHsKIAlib29sIGFjdGl2ZTsKIAl1aW50MzJfdCBwaXBlX2h0b3RhbDsKIAl1 aW50MzJfdCBwaXhlbF9yYXRlOwotCXN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIHBy aTsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmVfd21fcGFyYW1ldGVycyBzcHI7Ci0Jc3RydWN0IGludGVs X3BsYW5lX3dtX3BhcmFtZXRlcnMgY3VyOwogfTsKIAogc3RydWN0IGlsa193bV9tYXhpbXVtcyB7 CkBAIC0xNTM4LDI1ICsxNTM1LDI1IEBAIHN0cnVjdCBpbnRlbF93bV9jb25maWcgewogICogbWVt X3ZhbHVlIG11c3QgYmUgaW4gMC4xdXMgdW5pdHMuCiAgKi8KIHN0YXRpYyB1aW50MzJfdCBpbGtf Y29tcHV0ZV9wcmlfd20oY29uc3Qgc3RydWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMgKnBhcmFt cywKKwkJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSwKIAkJCQkg ICB1aW50MzJfdCBtZW1fdmFsdWUsCiAJCQkJICAgYm9vbCBpc19scCkKIHsKKwlpbnQgYnBwID0g cHN0YXRlLT5iYXNlLmZiID8gcHN0YXRlLT5iYXNlLmZiLT5iaXRzX3Blcl9waXhlbCAvIDggOiAw OwogCXVpbnQzMl90IG1ldGhvZDEsIG1ldGhvZDI7CiAKLQlpZiAoIXBhcmFtcy0+YWN0aXZlIHx8 ICFwYXJhbXMtPnByaS5lbmFibGVkKQorCWlmICghcGFyYW1zLT5hY3RpdmUgfHwgIXBzdGF0ZS0+ dmlzaWJsZSkKIAkJcmV0dXJuIDA7CiAKLQltZXRob2QxID0gaWxrX3dtX21ldGhvZDEocGFyYW1z LT5waXhlbF9yYXRlLAotCQkJCSBwYXJhbXMtPnByaS5ieXRlc19wZXJfcGl4ZWwsCi0JCQkJIG1l bV92YWx1ZSk7CisJbWV0aG9kMSA9IGlsa193bV9tZXRob2QxKHBhcmFtcy0+cGl4ZWxfcmF0ZSwg YnBwLCBtZW1fdmFsdWUpOwogCiAJaWYgKCFpc19scCkKIAkJcmV0dXJuIG1ldGhvZDE7CiAKIAlt ZXRob2QyID0gaWxrX3dtX21ldGhvZDIocGFyYW1zLT5waXhlbF9yYXRlLAogCQkJCSBwYXJhbXMt PnBpcGVfaHRvdGFsLAotCQkJCSBwYXJhbXMtPnByaS5ob3Jpel9waXhlbHMsCi0JCQkJIHBhcmFt cy0+cHJpLmJ5dGVzX3Blcl9waXhlbCwKKwkJCQkgZHJtX3JlY3Rfd2lkdGgoJnBzdGF0ZS0+ZHN0 KSwKKwkJCQkgYnBwLAogCQkJCSBtZW1fdmFsdWUpOwogCiAJcmV0dXJuIG1pbihtZXRob2QxLCBt ZXRob2QyKTsKQEAgLTE1NjcsMjAgKzE1NjQsMjAgQEAgc3RhdGljIHVpbnQzMl90IGlsa19jb21w dXRlX3ByaV93bShjb25zdCBzdHJ1Y3QgaWxrX3BpcGVfd21fcGFyYW1ldGVycyAqcGFyYW1zLAog ICogbWVtX3ZhbHVlIG11c3QgYmUgaW4gMC4xdXMgdW5pdHMuCiAgKi8KIHN0YXRpYyB1aW50MzJf dCBpbGtfY29tcHV0ZV9zcHJfd20oY29uc3Qgc3RydWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMg KnBhcmFtcywKKwkJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSwK IAkJCQkgICB1aW50MzJfdCBtZW1fdmFsdWUpCiB7CisJaW50IGJwcCA9IHBzdGF0ZS0+YmFzZS5m YiA/IHBzdGF0ZS0+YmFzZS5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4IDogMDsKIAl1aW50MzJfdCBt ZXRob2QxLCBtZXRob2QyOwogCi0JaWYgKCFwYXJhbXMtPmFjdGl2ZSB8fCAhcGFyYW1zLT5zcHIu ZW5hYmxlZCkKKwlpZiAoIXBhcmFtcy0+YWN0aXZlIHx8ICFwc3RhdGUtPnZpc2libGUpCiAJCXJl dHVybiAwOwogCi0JbWV0aG9kMSA9IGlsa193bV9tZXRob2QxKHBhcmFtcy0+cGl4ZWxfcmF0ZSwK LQkJCQkgcGFyYW1zLT5zcHIuYnl0ZXNfcGVyX3BpeGVsLAotCQkJCSBtZW1fdmFsdWUpOworCW1l dGhvZDEgPSBpbGtfd21fbWV0aG9kMShwYXJhbXMtPnBpeGVsX3JhdGUsIGJwcCwgbWVtX3ZhbHVl KTsKIAltZXRob2QyID0gaWxrX3dtX21ldGhvZDIocGFyYW1zLT5waXhlbF9yYXRlLAogCQkJCSBw YXJhbXMtPnBpcGVfaHRvdGFsLAotCQkJCSBwYXJhbXMtPnNwci5ob3Jpel9waXhlbHMsCi0JCQkJ IHBhcmFtcy0+c3ByLmJ5dGVzX3Blcl9waXhlbCwKKwkJCQkgZHJtX3JlY3Rfd2lkdGgoJnBzdGF0 ZS0+ZHN0KSwKKwkJCQkgYnBwLAogCQkJCSBtZW1fdmFsdWUpOwogCXJldHVybiBtaW4obWV0aG9k MSwgbWV0aG9kMik7CiB9CkBAIC0xNTkwLDI4ICsxNTg3LDMyIEBAIHN0YXRpYyB1aW50MzJfdCBp bGtfY29tcHV0ZV9zcHJfd20oY29uc3Qgc3RydWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMgKnBh cmFtcywKICAqIG1lbV92YWx1ZSBtdXN0IGJlIGluIDAuMXVzIHVuaXRzLgogICovCiBzdGF0aWMg dWludDMyX3QgaWxrX2NvbXB1dGVfY3VyX3dtKGNvbnN0IHN0cnVjdCBpbGtfcGlwZV93bV9wYXJh bWV0ZXJzICpwYXJhbXMsCisJCQkJICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpw c3RhdGUsCiAJCQkJICAgdWludDMyX3QgbWVtX3ZhbHVlKQogewotCWlmICghcGFyYW1zLT5hY3Rp dmUgfHwgIXBhcmFtcy0+Y3VyLmVuYWJsZWQpCisJaW50IGJwcCA9IHBzdGF0ZS0+YmFzZS5mYiA/ IHBzdGF0ZS0+YmFzZS5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4IDogMDsKKworCWlmICghcGFyYW1z LT5hY3RpdmUgfHwgIXBzdGF0ZS0+dmlzaWJsZSkKIAkJcmV0dXJuIDA7CiAKIAlyZXR1cm4gaWxr X3dtX21ldGhvZDIocGFyYW1zLT5waXhlbF9yYXRlLAogCQkJICAgICAgcGFyYW1zLT5waXBlX2h0 b3RhbCwKLQkJCSAgICAgIHBhcmFtcy0+Y3VyLmhvcml6X3BpeGVscywKLQkJCSAgICAgIHBhcmFt cy0+Y3VyLmJ5dGVzX3Blcl9waXhlbCwKKwkJCSAgICAgIGRybV9yZWN0X3dpZHRoKCZwc3RhdGUt PmRzdCksCisJCQkgICAgICBicHAsCiAJCQkgICAgICBtZW1fdmFsdWUpOwogfQogCiAvKiBPbmx5 IGZvciBXTV9MUC4gKi8KIHN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9mYmNfd20oY29uc3Qg c3RydWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMgKnBhcmFtcywKKwkJCQkgICBjb25zdCBzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSwKIAkJCQkgICB1aW50MzJfdCBwcmlfdmFsKQog ewotCWlmICghcGFyYW1zLT5hY3RpdmUgfHwgIXBhcmFtcy0+cHJpLmVuYWJsZWQpCisJaW50IGJw cCA9IHBzdGF0ZS0+YmFzZS5mYiA/IHBzdGF0ZS0+YmFzZS5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4 IDogMDsKKworCWlmICghcGFyYW1zLT5hY3RpdmUgfHwgIXBzdGF0ZS0+dmlzaWJsZSkKIAkJcmV0 dXJuIDA7CiAKLQlyZXR1cm4gaWxrX3dtX2ZiYyhwcmlfdmFsLAotCQkJICBwYXJhbXMtPnByaS5o b3Jpel9waXhlbHMsCi0JCQkgIHBhcmFtcy0+cHJpLmJ5dGVzX3Blcl9waXhlbCk7CisJcmV0dXJu IGlsa193bV9mYmMocHJpX3ZhbCwgZHJtX3JlY3Rfd2lkdGgoJnBzdGF0ZS0+ZHN0KSwgYnBwKTsK IH0KIAogc3RhdGljIHVuc2lnbmVkIGludCBpbGtfZGlzcGxheV9maWZvX3NpemUoY29uc3Qgc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTE3NzYsMTAgKzE3NzcsMTIgQEAgc3RhdGljIGJvb2wg aWxrX3ZhbGlkYXRlX3dtX2xldmVsKGludCBsZXZlbCwKIH0KIAogc3RhdGljIHZvaWQgaWxrX2Nv bXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAor CQkJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkJCQkgaW50IGxldmVs LAogCQkJCSBjb25zdCBzdHJ1Y3QgaWxrX3BpcGVfd21fcGFyYW1ldGVycyAqcCwKIAkJCQkgc3Ry dWN0IGludGVsX3dtX2xldmVsICpyZXN1bHQpCiB7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRl bF9wbGFuZTsKIAl1aW50MTZfdCBwcmlfbGF0ZW5jeSA9IGRldl9wcml2LT53bS5wcmlfbGF0ZW5j eVtsZXZlbF07CiAJdWludDE2X3Qgc3ByX2xhdGVuY3kgPSBkZXZfcHJpdi0+d20uc3ByX2xhdGVu Y3lbbGV2ZWxdOwogCXVpbnQxNl90IGN1cl9sYXRlbmN5ID0gZGV2X3ByaXYtPndtLmN1cl9sYXRl bmN5W2xldmVsXTsKQEAgLTE3OTEsMTAgKzE3OTQsMjkgQEAgc3RhdGljIHZvaWQgaWxrX2NvbXB1 dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQlj dXJfbGF0ZW5jeSAqPSA1OwogCX0KIAotCXJlc3VsdC0+cHJpX3ZhbCA9IGlsa19jb21wdXRlX3By aV93bShwLCBwcmlfbGF0ZW5jeSwgbGV2ZWwpOwotCXJlc3VsdC0+c3ByX3ZhbCA9IGlsa19jb21w dXRlX3Nwcl93bShwLCBzcHJfbGF0ZW5jeSk7Ci0JcmVzdWx0LT5jdXJfdmFsID0gaWxrX2NvbXB1 dGVfY3VyX3dtKHAsIGN1cl9sYXRlbmN5KTsKLQlyZXN1bHQtPmZiY192YWwgPSBpbGtfY29tcHV0 ZV9mYmNfd20ocCwgcmVzdWx0LT5wcmlfdmFsKTsKKwlmb3JfZWFjaF9pbnRlbF9wbGFuZV9vZl9j cnRjKGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7CisJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqcHN0YXRlID0KKwkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKGludGVsX3BsYW5lLT5iYXNlLnN0 YXRlKTsKKworCQlzd2l0Y2ggKGludGVsX3BsYW5lLT5iYXNlLnR5cGUpIHsKKwkJY2FzZSBEUk1f UExBTkVfVFlQRV9QUklNQVJZOgorCQkJcmVzdWx0LT5wcmlfdmFsID0gaWxrX2NvbXB1dGVfcHJp X3dtKHAsIHBzdGF0ZSwKKwkJCQkJCQkgICAgIHByaV9sYXRlbmN5LAorCQkJCQkJCSAgICAgbGV2 ZWwpOworCQkJcmVzdWx0LT5mYmNfdmFsID0gaWxrX2NvbXB1dGVfZmJjX3dtKHAsIHBzdGF0ZSwK KwkJCQkJCQkgICAgIHJlc3VsdC0+cHJpX3ZhbCk7CisJCQlicmVhazsKKwkJY2FzZSBEUk1fUExB TkVfVFlQRV9PVkVSTEFZOgorCQkJcmVzdWx0LT5zcHJfdmFsID0gaWxrX2NvbXB1dGVfc3ByX3dt KHAsIHBzdGF0ZSwKKwkJCQkJCQkgICAgIHNwcl9sYXRlbmN5KTsKKwkJCWJyZWFrOworCQljYXNl IERSTV9QTEFORV9UWVBFX0NVUlNPUjoKKwkJCXJlc3VsdC0+Y3VyX3ZhbCA9IGlsa19jb21wdXRl X2N1cl93bShwLCBwc3RhdGUsCisJCQkJCQkJICAgICBjdXJfbGF0ZW5jeSk7CisJCQlicmVhazsK KwkJfQorCX0KKwogCXJlc3VsdC0+ZW5hYmxlID0gdHJ1ZTsKIH0KIApAQCAtMjA1Niw0MyArMjA3 OCwxNCBAQCBzdGF0aWMgdm9pZCBza2xfc2V0dXBfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogc3RhdGljIHZvaWQgaWxrX2NvbXB1dGVfd21fcGFyYW1ldGVycyhzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAJCQkJICAgICAgc3RydWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMgKnAp CiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0JZW51bSBwaXBlIHBpcGUg PSBpbnRlbF9jcnRjLT5waXBlOwotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwogCiAJaWYgKCFp bnRlbF9jcnRjLT5hY3RpdmUpCiAJCXJldHVybjsKIAogCXAtPmFjdGl2ZSA9IHRydWU7CiAJcC0+ cGlwZV9odG90YWwgPSBpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRj X2h0b3RhbDsKLQlwLT5waXhlbF9yYXRlID0gaWxrX3BpcGVfcGl4ZWxfcmF0ZShkZXYsIGNydGMp OwotCi0JaWYgKGNydGMtPnByaW1hcnktPnN0YXRlLT5mYikKLQkJcC0+cHJpLmJ5dGVzX3Blcl9w aXhlbCA9Ci0JCQljcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsK LQllbHNlCi0JCXAtPnByaS5ieXRlc19wZXJfcGl4ZWwgPSA0OwotCi0JcC0+Y3VyLmJ5dGVzX3Bl cl9waXhlbCA9IDQ7Ci0JLyoKLQkgKiBUT0RPOiBmb3Igbm93LCBhc3N1bWUgcHJpbWFyeSBhbmQg Y3Vyc29yIHBsYW5lcyBhcmUgYWx3YXlzIGVuYWJsZWQuCi0JICogU2V0dGluZyB0aGVtIHRvIGZh bHNlIG1ha2VzIHRoZSBzY3JlZW4gZmxpY2tlci4KLQkgKi8KLQlwLT5wcmkuZW5hYmxlZCA9IHRy dWU7Ci0JcC0+Y3VyLmVuYWJsZWQgPSB0cnVlOwotCi0JcC0+cHJpLmhvcml6X3BpeGVscyA9IGlu dGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfdzsKLQlwLT5jdXIuaG9yaXpfcGl4ZWxzID0gaW50 ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRjX3c7Ci0KLQlkcm1fZm9yX2VhY2hfbGVn YWN5X3BsYW5lKHBsYW5lLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0KSB7Ci0JCXN0cnVj dCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Ci0KLQkJ aWYgKGludGVsX3BsYW5lLT5waXBlID09IHBpcGUpIHsKLQkJCXAtPnNwciA9IGludGVsX3BsYW5l LT53bTsKLQkJCWJyZWFrOwotCQl9Ci0JfQorCXAtPnBpeGVsX3JhdGUgPSBpbGtfcGlwZV9waXhl bF9yYXRlKGNydGMtPmRldiwgY3J0Yyk7CiB9CiAKIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dt X2NvbmZpZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LApAQCAtMjEyMCwyOCArMjExMyw0MiBAQCBz dGF0aWMgYm9vbCBpbnRlbF9jb21wdXRlX3BpcGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjLAog ewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJY29uc3Qgc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGludGVs X3BsYW5lICppbnRlbF9wbGFuZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnNwcnN0YXRl ID0gTlVMTDsKIAlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2KTsK IAkvKiBMUDAgd2F0ZXJtYXJrIG1heGltdW1zIGRlcGVuZCBvbiB0aGlzIHBpcGUgYWxvbmUgKi8K IAlzdHJ1Y3QgaW50ZWxfd21fY29uZmlnIGNvbmZpZyA9IHsKIAkJLm51bV9waXBlc19hY3RpdmUg PSAxLAotCQkuc3ByaXRlc19lbmFibGVkID0gcGFyYW1zLT5zcHIuZW5hYmxlZCwKLQkJLnNwcml0 ZXNfc2NhbGVkID0gcGFyYW1zLT5zcHIuc2NhbGVkLAogCX07CiAJc3RydWN0IGlsa193bV9tYXhp bXVtcyBtYXg7CiAKKwlmb3JfZWFjaF9pbnRlbF9wbGFuZV9vZl9jcnRjKGludGVsX2NydGMsIGlu dGVsX3BsYW5lKSB7CisJCWlmIChpbnRlbF9wbGFuZS0+YmFzZS50eXBlID09IERSTV9QTEFORV9U WVBFX09WRVJMQVkpIHsKKwkJCXNwcnN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoaW50ZWxf cGxhbmUtPmJhc2Uuc3RhdGUpOworCQkJYnJlYWs7CisJCX0KKwl9CisKKwljb25maWcuc3ByaXRl c19lbmFibGVkID0gc3Byc3RhdGUtPnZpc2libGU7CisJY29uZmlnLnNwcml0ZXNfc2NhbGVkID0K KwkJZHJtX3JlY3Rfd2lkdGgoJnNwcnN0YXRlLT5kc3QpICE9IGRybV9yZWN0X3dpZHRoKCZzcHJz dGF0ZS0+c3JjKSA+PiAxNiB8fAorCQlkcm1fcmVjdF9oZWlnaHQoJnNwcnN0YXRlLT5kc3QpICE9 IGRybV9yZWN0X2hlaWdodCgmc3Byc3RhdGUtPnNyYykgPj4gMTY7CisKKwogCXBpcGVfd20tPnBp cGVfZW5hYmxlZCA9IHBhcmFtcy0+YWN0aXZlOwotCXBpcGVfd20tPnNwcml0ZXNfZW5hYmxlZCA9 IHBhcmFtcy0+c3ByLmVuYWJsZWQ7Ci0JcGlwZV93bS0+c3ByaXRlc19zY2FsZWQgPSBwYXJhbXMt PnNwci5zY2FsZWQ7CisJcGlwZV93bS0+c3ByaXRlc19lbmFibGVkID0gc3Byc3RhdGUtPnZpc2li bGU7CisJcGlwZV93bS0+c3ByaXRlc19zY2FsZWQgPSBjb25maWcuc3ByaXRlc19zY2FsZWQ7CiAK IAkvKiBJTEsvU05COiBMUDIrIHdhdGVybWFya3Mgb25seSB3L28gc3ByaXRlcyAqLwotCWlmIChJ TlRFTF9JTkZPKGRldiktPmdlbiA8PSA2ICYmIHBhcmFtcy0+c3ByLmVuYWJsZWQpCisJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuIDw9IDYgJiYgc3Byc3RhdGUtPnZpc2libGUpCiAJCW1heF9sZXZl bCA9IDE7CiAKIAkvKiBJTEsvU05CL0lWQjogTFAxKyB3YXRlcm1hcmtzIG9ubHkgdy9vIHNjYWxp bmcgKi8KLQlpZiAocGFyYW1zLT5zcHIuc2NhbGVkKQorCWlmIChjb25maWcuc3ByaXRlc19zY2Fs ZWQpCiAJCW1heF9sZXZlbCA9IDA7CiAKLQlpbGtfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwg MCwgcGFyYW1zLCAmcGlwZV93bS0+d21bMF0pOworCWlsa19jb21wdXRlX3dtX2xldmVsKGRldl9w cml2LCBpbnRlbF9jcnRjLCAwLCBwYXJhbXMsICZwaXBlX3dtLT53bVswXSk7CiAKIAlpZiAoSVNf SEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQogCQlwaXBlX3dtLT5saW5ldGltZSA9 IGhzd19jb21wdXRlX2xpbmV0aW1lX3dtKGRldiwgY3J0Yyk7CkBAIC0yMTU4LDcgKzIxNjUsNyBA QCBzdGF0aWMgYm9vbCBpbnRlbF9jb21wdXRlX3BpcGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRj LAogCWZvciAobGV2ZWwgPSAxOyBsZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVsKyspIHsKIAkJc3Ry dWN0IGludGVsX3dtX2xldmVsIHdtID0ge307CiAKLQkJaWxrX2NvbXB1dGVfd21fbGV2ZWwoZGV2 X3ByaXYsIGxldmVsLCBwYXJhbXMsICZ3bSk7CisJCWlsa19jb21wdXRlX3dtX2xldmVsKGRldl9w cml2LCBpbnRlbF9jcnRjLCBsZXZlbCwgcGFyYW1zLCAmd20pOwogCiAJCS8qCiAJCSAqIERpc2Fi bGUgYW55IHdhdGVybWFyayBsZXZlbCB0aGF0IGV4Y2VlZHMgdGhlCi0tIAoxLjguNS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=