From: Ander Conselvan de Oliveira Subject: [PATCH 2/4] drm/i915: Move pll new_config field into intel_atomic_state Date: Thu, 29 Jan 2015 16:55:09 +0200 Message-ID: <1422543311-5107-2-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1422543311-5107-1-git-send-email-ander.conselvan.de.oliveira@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 A5C146E799 for ; Thu, 29 Jan 2015 06:55:43 -0800 (PST) In-Reply-To: <1422543311-5107-1-git-send-email-ander.conselvan.de.oliveira@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: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org SW4gb3JkZXIgdG8gaW1wbGVtZW50IGF0b21pYyBtb2RlIHNldHMsIHdlJ2xsIG5lZWQgdG8gaG9s ZCBzdGF0ZSBzaGFyZWQKYnkgbXVsdGlwbGUgY3J0Y3MgaW4gdGhlIGRybV9hdG9taWNfc3RhdGUg c3RydWN0LiBUaGlzIHBhdGNoIG1vdmVzCnRvd2FyZHMgdGhhdCBnb2FsIGJ5IGludHJvZHVjaW5n IHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgZm9yIHRoYXQKcHVycG9zZSBhbmQgbW92aW5nIHRo ZSBzdGFnZWQgcGxsIGNvbmZpZ3VyYXRpb24gaW50byBpdC4gQ3VycmVudCBzdGF0ZQp3aWxsIGJl IG1vdmVkIGluIGEgZm9sbG93IHVwIHBhdGNoLgoKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29uc2Vs dmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICB8ICAgMyArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgICAgIHwgIDExICsrLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDEwNCArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgICA4ICsrLQog NCBmaWxlcyBjaGFuZ2VkLCA1OSBpbnNlcnRpb25zKCspLCA2NyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCBiMDkxNzNmLi44NjJlZGM0IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTI5Nyw3ICsyOTcsNiBAQCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29u ZmlnIHsKIAogc3RydWN0IGludGVsX3NoYXJlZF9kcGxsIHsKIAlzdHJ1Y3QgaW50ZWxfc2hhcmVk X2RwbGxfY29uZmlnIGNvbmZpZzsKLQlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnICpu ZXdfY29uZmlnOwogCiAJaW50IGFjdGl2ZTsgLyogY291bnQgb2YgbnVtYmVyIG9mIGFjdGl2ZSBD UlRDcyAoaS5lLiBEUE1TIG9uKSAqLwogCWJvb2wgb247IC8qIGlzIHRoZSBQTEwgYWN0dWFsbHkg YWN0aXZlPyBEaXNhYmxlZCBkdXJpbmcgbW9kZXNldCAqLwpAQCAtNTA0LDYgKzUwMyw3IEBAIHN0 cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSB7CiBzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yOwogc3Ry dWN0IGludGVsX2VuY29kZXI7CiBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZTsKK3N0cnVjdCBpbnRl bF9hdG9taWNfc3RhdGU7CiBzdHJ1Y3QgaW50ZWxfaW5pdGlhbF9wbGFuZV9jb25maWc7CiBzdHJ1 Y3QgaW50ZWxfY3J0YzsKIHN0cnVjdCBpbnRlbF9saW1pdDsKQEAgLTU0Niw2ICs1NDYsNyBAQCBz dHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJdm9pZCAoKmdldF9pbml0aWFsX3BsYW5l X2NvbmZpZykoc3RydWN0IGludGVsX2NydGMgKiwKIAkJCQkJIHN0cnVjdCBpbnRlbF9pbml0aWFs X3BsYW5lX2NvbmZpZyAqKTsKIAlpbnQgKCpjcnRjX2NvbXB1dGVfY2xvY2spKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAorCQkJCSAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJ CQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiAJdm9pZCAoKmNydGNf ZW5hYmxlKShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogCXZvaWQgKCpjcnRjX2Rpc2FibGUpKHN0 cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCmluZGV4IGFkOGI3 M2QuLjFjZDU0MWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCkBAIC05MDksNiArOTA5LDcg QEAgaHN3X2RkaV9jYWxjdWxhdGVfd3JwbGwoaW50IGNsb2NrIC8qIGluIEh6ICovLAogCiBzdGF0 aWMgYm9vbAogaHN3X2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj LAorCQkgICBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJICAgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCSAgIHN0cnVjdCBpbnRlbF9lbmNvZGVyICpp bnRlbF9lbmNvZGVyLAogCQkgICBpbnQgY2xvY2spCkBAIC05MjYsNyArOTI3LDcgQEAgaHN3X2Rk aV9wbGxfc2VsZWN0KHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCiAJCWNydGNfc3Rh dGUtPmRwbGxfaHdfc3RhdGUud3JwbGwgPSB2YWw7CiAKLQkJcGxsID0gaW50ZWxfZ2V0X3NoYXJl ZF9kcGxsKGludGVsX2NydGMsIGNydGNfc3RhdGUpOworCQlwbGwgPSBpbnRlbF9nZXRfc2hhcmVk X2RwbGwoaW50ZWxfY3J0Yywgc3RhdGUsIGNydGNfc3RhdGUpOwogCQlpZiAocGxsID09IE5VTEwp IHsKIAkJCURSTV9ERUJVR19EUklWRVIoImZhaWxlZCB0byBmaW5kIFBMTCBmb3IgcGlwZSAlY1xu IiwKIAkJCQkJIHBpcGVfbmFtZShpbnRlbF9jcnRjLT5waXBlKSk7CkBAIC0xMDk2LDYgKzEwOTcs NyBAQCBmb3VuZDoKIAogc3RhdGljIGJvb2wKIHNrbF9kZGlfcGxsX3NlbGVjdChzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YywKKwkJICAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3Rh dGUsCiAJCSAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkgICBzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKIAkJICAgaW50IGNsb2NrKQpAQCAtMTE1 MCw3ICsxMTUyLDcgQEAgc2tsX2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBpbnRlbF9jcnRjICppbnRl bF9jcnRjLAogCWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUuY2ZnY3IxID0gY2ZnY3IxOwogCWNy dGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUuY2ZnY3IyID0gY2ZnY3IyOwogCi0JcGxsID0gaW50ZWxf Z2V0X3NoYXJlZF9kcGxsKGludGVsX2NydGMsIGNydGNfc3RhdGUpOworCXBsbCA9IGludGVsX2dl dF9zaGFyZWRfZHBsbChpbnRlbF9jcnRjLCBzdGF0ZSwgY3J0Y19zdGF0ZSk7CiAJaWYgKHBsbCA9 PSBOVUxMKSB7CiAJCURSTV9ERUJVR19EUklWRVIoImZhaWxlZCB0byBmaW5kIFBMTCBmb3IgcGlw ZSAlY1xuIiwKIAkJCQkgcGlwZV9uYW1lKGludGVsX2NydGMtPnBpcGUpKTsKQEAgLTExNzEsNiAr MTE3Myw3IEBAIHNrbF9kZGlfcGxsX3NlbGVjdChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 YywKICAqIGZ1bmN0aW9uIHNob3VsZCBiZSBmb2xkZWQgaW50byBjb21wdXRlX2NvbmZpZygpIGV2 ZW50dWFsbHkuCiAgKi8KIGJvb2wgaW50ZWxfZGRpX3BsbF9zZWxlY3Qoc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMsCisJCQkgIHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAog CQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gaW50ZWxfY3J0Yy0+YmFzZS5kZXY7CkBAIC0xMTc5LDEwICsxMTgyLDEw IEBAIGJvb2wgaW50ZWxfZGRpX3BsbF9zZWxlY3Qoc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMsCiAJaW50IGNsb2NrID0gY3J0Y19zdGF0ZS0+cG9ydF9jbG9jazsKIAogCWlmIChJU19TS1lM QUtFKGRldikpCi0JCXJldHVybiBza2xfZGRpX3BsbF9zZWxlY3QoaW50ZWxfY3J0YywgY3J0Y19z dGF0ZSwKKwkJcmV0dXJuIHNrbF9kZGlfcGxsX3NlbGVjdChpbnRlbF9jcnRjLCBzdGF0ZSwgY3J0 Y19zdGF0ZSwKIAkJCQkJICBpbnRlbF9lbmNvZGVyLCBjbG9jayk7CiAJZWxzZQotCQlyZXR1cm4g aHN3X2RkaV9wbGxfc2VsZWN0KGludGVsX2NydGMsIGNydGNfc3RhdGUsCisJCXJldHVybiBoc3df ZGRpX3BsbF9zZWxlY3QoaW50ZWxfY3J0Yywgc3RhdGUsIGNydGNfc3RhdGUsCiAJCQkJCSAgaW50 ZWxfZW5jb2RlciwgY2xvY2spOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggM2QyMjBhNi4uMTU5ZTZjOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtMzg5MSw2ICszODkxLDcgQEAgdm9pZCBpbnRlbF9wdXRfc2hhcmVkX2RwbGwoc3RydWN0 IGludGVsX2NydGMgKmNydGMpCiB9CiAKIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxf Z2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkJCQkJc3RydWN0IGlu dGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCQkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBjcnRj LT5iYXNlLmRldi0+ZGV2X3ByaXZhdGU7CkBAIC0zOTA1LDcgKzM5MDYsNyBAQCBzdHJ1Y3QgaW50 ZWxfc2hhcmVkX2RwbGwgKmludGVsX2dldF9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YywKIAkJRFJNX0RFQlVHX0tNUygiQ1JUQzolZCB1c2luZyBwcmUtYWxsb2NhdGVkICVzXG4i LAogCQkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkLCBwbGwtPm5hbWUpOwogCi0JCVdBUk5fT04o cGxsLT5uZXdfY29uZmlnLT5jcnRjX21hc2spOworCQlXQVJOX09OKHN0YXRlLT5zaGFyZWRfZHBs bFtpXS5jcnRjX21hc2spOwogCiAJCWdvdG8gZm91bmQ7CiAJfQpAQCAtMzkxNCwxNSArMzkxNSwx NSBAQCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKmludGVsX2dldF9zaGFyZWRfZHBsbChzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJcGxsID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07 CiAKIAkJLyogT25seSB3YW50IHRvIGNoZWNrIGVuYWJsZWQgdGltaW5ncyBmaXJzdCAqLwotCQlp ZiAocGxsLT5uZXdfY29uZmlnLT5jcnRjX21hc2sgPT0gMCkKKwkJaWYgKHN0YXRlLT5zaGFyZWRf ZHBsbFtpXS5jcnRjX21hc2sgPT0gMCkKIAkJCWNvbnRpbnVlOwogCiAJCWlmIChtZW1jbXAoJmNy dGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUsCi0JCQkgICAmcGxsLT5uZXdfY29uZmlnLT5od19zdGF0 ZSwKLQkJCSAgIHNpemVvZihwbGwtPm5ld19jb25maWctPmh3X3N0YXRlKSkgPT0gMCkgeworCQkJ ICAgJnN0YXRlLT5zaGFyZWRfZHBsbFtpXS5od19zdGF0ZSwKKwkJCSAgIHNpemVvZihzdGF0ZS0+ c2hhcmVkX2RwbGxbaV0uaHdfc3RhdGUpKSA9PSAwKSB7CiAJCQlEUk1fREVCVUdfS01TKCJDUlRD OiVkIHNoYXJpbmcgZXhpc3RpbmcgJXMgKGNydGMgbWFzayAweCUwOHgsIGF0aXZlICVkKVxuIiwK IAkJCQkgICAgICBjcnRjLT5iYXNlLmJhc2UuaWQsIHBsbC0+bmFtZSwKLQkJCQkgICAgICBwbGwt Pm5ld19jb25maWctPmNydGNfbWFzaywKKwkJCQkgICAgICBzdGF0ZS0+c2hhcmVkX2RwbGxbaV0u Y3J0Y19tYXNrLAogCQkJCSAgICAgIHBsbC0+YWN0aXZlKTsKIAkJCWdvdG8gZm91bmQ7CiAJCX0K QEAgLTM5MzEsNyArMzkzMiw3IEBAIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0 X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCS8qIE9rIG5vIG1hdGNoaW5n IHRpbWluZ3MsIG1heWJlIHRoZXJlJ3MgYSBmcmVlIG9uZT8gKi8KIAlmb3IgKGkgPSAwOyBpIDwg ZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7CiAJCXBsbCA9ICZkZXZfcHJpdi0+c2hh cmVkX2RwbGxzW2ldOwotCQlpZiAocGxsLT5uZXdfY29uZmlnLT5jcnRjX21hc2sgPT0gMCkgewor CQlpZiAoc3RhdGUtPnNoYXJlZF9kcGxsW2ldLmNydGNfbWFzayA9PSAwKSB7CiAJCQlEUk1fREVC VUdfS01TKCJDUlRDOiVkIGFsbG9jYXRlZCAlc1xuIiwKIAkJCQkgICAgICBjcnRjLT5iYXNlLmJh c2UuaWQsIHBsbC0+bmFtZSk7CiAJCQlnb3RvIGZvdW5kOwpAQCAtMzk0MSwxNCArMzk0MiwxNCBA QCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKmludGVsX2dldF9zaGFyZWRfZHBsbChzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0YywKIAlyZXR1cm4gTlVMTDsKIAogZm91bmQ6Ci0JaWYgKHBsbC0+bmV3 X2NvbmZpZy0+Y3J0Y19tYXNrID09IDApCi0JCXBsbC0+bmV3X2NvbmZpZy0+aHdfc3RhdGUgPSBj cnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlOworCWlmIChzdGF0ZS0+c2hhcmVkX2RwbGxbaV0uY3J0 Y19tYXNrID09IDApCisJCXN0YXRlLT5zaGFyZWRfZHBsbFtpXS5od19zdGF0ZSA9IGNydGNfc3Rh dGUtPmRwbGxfaHdfc3RhdGU7CiAKIAljcnRjX3N0YXRlLT5zaGFyZWRfZHBsbCA9IGk7CiAJRFJN X0RFQlVHX0RSSVZFUigidXNpbmcgJXMgZm9yIHBpcGUgJWNcbiIsIHBsbC0+bmFtZSwKIAkJCSBw aXBlX25hbWUoY3J0Yy0+cGlwZSkpOwogCi0JcGxsLT5uZXdfY29uZmlnLT5jcnRjX21hc2sgfD0g MSA8PCBjcnRjLT5waXBlOworCXN0YXRlLT5zaGFyZWRfZHBsbFtpXS5jcnRjX21hc2sgfD0gMSA8 PCBjcnRjLT5waXBlOwogCiAJcmV0dXJuIHBsbDsKIH0KQEAgLTM5NjIsNiArMzk2Myw3IEBAIGZv dW5kOgogICogcmVsZWFzaW5nIHRoZSByZWZlcmVuY2VzIG9mIHBpcGVzIHNwZWNpZmllZCBpbiBj bGVhcl9waXBlcy4KICAqLwogc3RhdGljIGludCBpbnRlbF9zaGFyZWRfZHBsbF9zdGFydF9jb25m aWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCQkgIHN0cnVjdCBpbnRl bF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJCQkgIHVuc2lnbmVkIGNsZWFyX3BpcGVzKQogewog CXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsOwpAQCAtMzk3MCw1NCArMzk3MiwyMyBAQCBz dGF0aWMgaW50IGludGVsX3NoYXJlZF9kcGxsX3N0YXJ0X2NvbmZpZyhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCiAJZm9yIChpID0gMDsgaSA8IGRldl9wcml2LT5udW1fc2hhcmVk X2RwbGw7IGkrKykgewogCQlwbGwgPSAmZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tpXTsKIAotCQlw bGwtPm5ld19jb25maWcgPSBrbWVtZHVwKCZwbGwtPmNvbmZpZywgc2l6ZW9mIHBsbC0+Y29uZmln LAotCQkJCQkgIEdGUF9LRVJORUwpOwotCQlpZiAoIXBsbC0+bmV3X2NvbmZpZykKLQkJCWdvdG8g Y2xlYW51cDsKLQotCQlwbGwtPm5ld19jb25maWctPmNydGNfbWFzayAmPSB+Y2xlYXJfcGlwZXM7 CisJCW1lbWNweSgmc3RhdGUtPnNoYXJlZF9kcGxsW2ldLCAmcGxsLT5jb25maWcsCisJCSAgICAg ICBzaXplb2YgcGxsLT5jb25maWcpOworCQlzdGF0ZS0+c2hhcmVkX2RwbGxbaV0uY3J0Y19tYXNr ICY9IH5jbGVhcl9waXBlczsKIAl9CiAKIAlyZXR1cm4gMDsKLQotY2xlYW51cDoKLQl3aGlsZSAo LS1pID49IDApIHsKLQkJcGxsID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07Ci0JCWtmcmVl KHBsbC0+bmV3X2NvbmZpZyk7Ci0JCXBsbC0+bmV3X2NvbmZpZyA9IE5VTEw7Ci0JfQotCi0JcmV0 dXJuIC1FTk9NRU07CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX3NoYXJlZF9kcGxsX2NvbW1pdChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCBpbnRlbF9zaGFy ZWRfZHBsbF9jb21taXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSAg ICAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUpCiB7CiAJc3RydWN0IGludGVsX3No YXJlZF9kcGxsICpwbGw7CiAJZW51bSBpbnRlbF9kcGxsX2lkIGk7CiAKIAlmb3IgKGkgPSAwOyBp IDwgZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7CiAJCXBsbCA9ICZkZXZfcHJpdi0+ c2hhcmVkX2RwbGxzW2ldOwotCi0JCVdBUk5fT04ocGxsLT5uZXdfY29uZmlnID09ICZwbGwtPmNv bmZpZyk7Ci0KLQkJcGxsLT5jb25maWcgPSAqcGxsLT5uZXdfY29uZmlnOwotCQlrZnJlZShwbGwt Pm5ld19jb25maWcpOwotCQlwbGwtPm5ld19jb25maWcgPSBOVUxMOwotCX0KLX0KLQotc3RhdGlj IHZvaWQgaW50ZWxfc2hhcmVkX2RwbGxfYWJvcnRfY29uZmlnKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKLXsKLQlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbDsKLQllbnVt IGludGVsX2RwbGxfaWQgaTsKLQotCWZvciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+bnVtX3NoYXJl ZF9kcGxsOyBpKyspIHsKLQkJcGxsID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07Ci0KLQkJ V0FSTl9PTihwbGwtPm5ld19jb25maWcgPT0gJnBsbC0+Y29uZmlnKTsKLQotCQlrZnJlZShwbGwt Pm5ld19jb25maWcpOwotCQlwbGwtPm5ld19jb25maWcgPSBOVUxMOworCQlwbGwtPmNvbmZpZyA9 IHN0YXRlLT5zaGFyZWRfZHBsbFtpXTsKIAl9CiB9CiAKQEAgLTY0MjYsNiArNjM5Nyw3IEBAIHN0 YXRpYyB2b2lkIGk5eHhfc2V0X3BpcGVjb25mKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj KQogfQogCiBzdGF0aWMgaW50IGk5eHhfY3J0Y19jb21wdXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9j cnRjICpjcnRjLAorCQkJCSAgIHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJ CSAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKQEAgLTc0NTIsNiArNzQyNCw3IEBAIHN0YXRp YyB1aW50MzJfdCBpcm9ubGFrZV9jb21wdXRlX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGMsCiB9CiAKIHN0YXRpYyBpbnQgaXJvbmxha2VfY3J0Y19jb21wdXRlX2Nsb2NrKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjLAorCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRl ICpzdGF0ZSwKIAkJCQkgICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUp CiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwpAQCAtNzQ5OCw3 ICs3NDcxLDcgQEAgc3RhdGljIGludCBpcm9ubGFrZV9jcnRjX2NvbXB1dGVfY2xvY2soc3RydWN0 IGludGVsX2NydGMgKmNydGMsCiAJCWVsc2UKIAkJCWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUu ZnAxID0gZnA7CiAKLQkJcGxsID0gaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKGNydGMsIGNydGNfc3Rh dGUpOworCQlwbGwgPSBpbnRlbF9nZXRfc2hhcmVkX2RwbGwoY3J0Yywgc3RhdGUsIGNydGNfc3Rh dGUpOwogCQlpZiAocGxsID09IE5VTEwpIHsKIAkJCURSTV9ERUJVR19EUklWRVIoImZhaWxlZCB0 byBmaW5kIFBMTCBmb3IgcGlwZSAlY1xuIiwKIAkJCQkJIHBpcGVfbmFtZShjcnRjLT5waXBlKSk7 CkBAIC04MDcwLDkgKzgwNDMsMTAgQEAgdm9pZCBoc3dfZGlzYWJsZV9wYzgoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogfQogCiBzdGF0aWMgaW50IGhhc3dlbGxfY3J0Y19jb21w dXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkJCSAgICAgIHN0cnVjdCBpbnRl bF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlKQogewotCWlmICghaW50ZWxfZGRpX3BsbF9zZWxlY3QoY3J0YywgY3J0Y19z dGF0ZSkpCisJaWYgKCFpbnRlbF9kZGlfcGxsX3NlbGVjdChjcnRjLCBzdGF0ZSwgY3J0Y19zdGF0 ZSkpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJY3J0Yy0+bG93ZnJlcV9hdmFpbCA9IGZhbHNlOwpA QCAtMTA0MTcsMTQgKzEwMzkxLDE1IEBAIHN0YXRpYyBib29sIGludGVsX2NydGNfaW5fdXNlKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKIH0KIAogc3RhdGljIHZvaWQKLWludGVsX21vZGVzZXRfdXBk YXRlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIHByZXBhcmVfcGlwZXMp CitpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNp Z25lZCBwcmVwYXJlX3BpcGVzLAorCQkJICAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3Rh dGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcjsKIAlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YzsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwog Ci0JaW50ZWxfc2hhcmVkX2RwbGxfY29tbWl0KGRldl9wcml2KTsKKwlpbnRlbF9zaGFyZWRfZHBs bF9jb21taXQoZGV2X3ByaXYsIHN0YXRlKTsKIAogCWZvcl9lYWNoX2ludGVsX2VuY29kZXIoZGV2 LCBpbnRlbF9lbmNvZGVyKSB7CiAJCWlmICghaW50ZWxfZW5jb2Rlci0+YmFzZS5jcnRjKQpAQCAt MTEwMjIsNiArMTA5OTcsNyBAQCBvdXQ6CiB9CiAKIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9k ZV9zZXR1cF9wbGxzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkJICAgICAgIHN0cnVjdCBp bnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJCSAgICAgICB1bnNpZ25lZCBtb2Rlc2V0X3Bp cGVzLAogCQkJCSAgICAgICB1bnNpZ25lZCBkaXNhYmxlX3BpcGVzKQogewpAQCAtMTEwMzMsMjEg KzExMDA5LDE4IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZV9zZXR1cF9wbGxzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKCFkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2NvbXB1dGVf Y2xvY2spCiAJCXJldHVybiAwOwogCi0JcmV0ID0gaW50ZWxfc2hhcmVkX2RwbGxfc3RhcnRfY29u ZmlnKGRldl9wcml2LCBjbGVhcl9waXBlcyk7CisJcmV0ID0gaW50ZWxfc2hhcmVkX2RwbGxfc3Rh cnRfY29uZmlnKGRldl9wcml2LCBzdGF0ZSwgY2xlYXJfcGlwZXMpOwogCWlmIChyZXQpCi0JCWdv dG8gZG9uZTsKKwkJcmV0dXJuIHJldDsKIAogCWZvcl9lYWNoX2ludGVsX2NydGNfbWFza2VkKGRl diwgbW9kZXNldF9waXBlcywgaW50ZWxfY3J0YykgewotCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqc3RhdGUgPSBpbnRlbF9jcnRjLT5uZXdfY29uZmlnOworCQlzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSA9IGludGVsX2NydGMtPm5ld19jb25maWc7CiAJCXJldCA9IGRldl9w cml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jayhpbnRlbF9jcnRjLAotCQkJCQkJCSAgIHN0 YXRlKTsKLQkJaWYgKHJldCkgewotCQkJaW50ZWxfc2hhcmVkX2RwbGxfYWJvcnRfY29uZmlnKGRl dl9wcml2KTsKLQkJCWdvdG8gZG9uZTsKLQkJfQorCQkJCQkJCSAgIHN0YXRlLCBjcnRjX3N0YXRl KTsKKwkJaWYgKHJldCkKKwkJCWJyZWFrOwogCX0KIAotZG9uZToKIAlyZXR1cm4gcmV0OwogfQog CkBAIC0xMTA2Myw2ICsxMTAzNiw3IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqc2F2ZWRfbW9kZTsK IAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0 YXRlICpzdGF0ZSA9IE5VTEw7CiAJaW50IHJldCA9IDA7CiAKIAlzYXZlZF9tb2RlID0ga21hbGxv YyhzaXplb2YoKnNhdmVkX21vZGUpLCBHRlBfS0VSTkVMKTsKQEAgLTExMDg4LDcgKzExMDYyLDE0 IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJ CXByZXBhcmVfcGlwZXMgJj0gfmRpc2FibGVfcGlwZXM7CiAJfQogCi0JcmV0ID0gX19pbnRlbF9z ZXRfbW9kZV9zZXR1cF9wbGxzKGRldiwgbW9kZXNldF9waXBlcywgZGlzYWJsZV9waXBlcyk7CisJ c3RhdGUgPSBremFsbG9jKHNpemVvZiAqc3RhdGUsIEdGUF9LRVJORUwpOworCWlmICghc3RhdGUp IHsKKwkJcmV0ID0gLUVOT01FTTsKKwkJZ290byBkb25lOworCX0KKworCXJldCA9IF9faW50ZWxf c2V0X21vZGVfc2V0dXBfcGxscyhkZXYsIHN0YXRlLAorCQkJCQkgIG1vZGVzZXRfcGlwZXMsIGRp c2FibGVfcGlwZXMpOwogCWlmIChyZXQpCiAJCWdvdG8gZG9uZTsKIApAQCAtMTExMjQsNyArMTEx MDUsNyBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRj LAogCiAJLyogT25seSBhZnRlciBkaXNhYmxpbmcgYWxsIG91dHB1dCBwaXBlbGluZXMgdGhhdCB3 aWxsIGJlIGNoYW5nZWQgY2FuIHdlCiAJICogdXBkYXRlIHRoZSB0aGUgb3V0cHV0IGNvbmZpZ3Vy YXRpb24uICovCi0JaW50ZWxfbW9kZXNldF91cGRhdGVfc3RhdGUoZGV2LCBwcmVwYXJlX3BpcGVz KTsKKwlpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGF0ZShkZXYsIHByZXBhcmVfcGlwZXMsIHN0YXRl KTsKIAogCW1vZGVzZXRfdXBkYXRlX2NydGNfcG93ZXJfZG9tYWlucyhkZXYpOwogCkBAIC0xMTE1 NSw2ICsxMTEzNiw3IEBAIGRvbmU6CiAJaWYgKHJldCAmJiBjcnRjLT5lbmFibGVkKQogCQljcnRj LT5tb2RlID0gKnNhdmVkX21vZGU7CiAKKwlrZnJlZShzdGF0ZSk7CiAJa2ZyZWUoc2F2ZWRfbW9k ZSk7CiAJcmV0dXJuIHJldDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZWVmNzlj Yy4uZjJmNDIxMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTI0Myw2ICsyNDMsMTAg QEAgdHlwZWRlZiBzdHJ1Y3QgZHBsbCB7CiAJaW50CXA7CiB9IGludGVsX2Nsb2NrX3Q7CiAKK3N0 cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgeworCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbF9jb25m aWcgc2hhcmVkX2RwbGxbSTkxNV9OVU1fUExMU107Cit9OworCiBzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgewogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgYmFzZTsKIAlzdHJ1Y3QgZHJtX3JlY3Qg c3JjOwpAQCAtODM3LDYgKzg0MSw3IEBAIHZvaWQgaW50ZWxfZGRpX2Rpc2FibGVfdHJhbnNjb2Rl cl9mdW5jKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHZvaWQgaW50ZWxfZGRp X2VuYWJsZV9waXBlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjKTsKIHZvaWQg aW50ZWxfZGRpX2Rpc2FibGVfcGlwZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 Yyk7CiBib29sIGludGVsX2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAor CQkJICBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJCSAgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOwogdm9pZCBpbnRlbF9kZGlfc2V0X3BpcGVfc2V0dGlu Z3Moc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHZvaWQgaW50ZWxfZGRpX3ByZXBhcmVfbGlua19y ZXRyYWluKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2Rlcik7CkBAIC05NjIsNyArOTY3LDggQEAg dm9pZCBhc3NlcnRfc2hhcmVkX2RwbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogI2RlZmluZSBhc3NlcnRfc2hhcmVkX2RwbGxfZW5hYmxlZChkLCBwKSBhc3NlcnRfc2hhcmVk X2RwbGwoZCwgcCwgdHJ1ZSkKICNkZWZpbmUgYXNzZXJ0X3NoYXJlZF9kcGxsX2Rpc2FibGVkKGQs IHApIGFzc2VydF9zaGFyZWRfZHBsbChkLCBwLCBmYWxzZSkKIHN0cnVjdCBpbnRlbF9zaGFyZWRf ZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAotCQkJ CQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnN0YXRlKTsKKwkJCQkJCXN0cnVjdCBpbnRlbF9h dG9taWNfc3RhdGUgKnN0YXRlLAorCQkJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUpOwogdm9pZCBpbnRlbF9wdXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNy dGMpOwogCiB2b2lkIHZsdl9mb3JjZV9wbGxfb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51 bSBwaXBlIHBpcGUsCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK