From: Ville Syrjala Subject: [PATCH v2 03/13] drm/i915: Constify the state arguments to the color management stuff Date: Tue, 5 Feb 2019 18:08:38 +0200 Message-ID: <20190205160848.24662-4-ville.syrjala@linux.intel.com> References: <20190205160848.24662-1-ville.syrjala@linux.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 ESMTPS id 05F8089F5F for ; Tue, 5 Feb 2019 16:09:02 +0000 (UTC) In-Reply-To: <20190205160848.24662-1-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClBh c3MgdGhlIGNydGMgc3RhdGUgZXRjLiBhcyBjb25zdCB0byB0aGUgY29sb3IgbWFuYWdlbWVudCBj b21taXQKZnVuY3Rpb25zLiBBbmQgd2hpbGUgYXQgaXQgcG9saXNoIHNvbWUgb2YgdGhlIGxvY2Fs IHZhcmlhYmxlcy4KCnYyOiBSZWJhc2UKClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8 dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBNYXR0IFJvcGVyIDxt YXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVW1hIFNoYW5rYXIgPHVtYS5z aGFua2FyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAg IHwgICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jIHwgMTQwICsrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aCAgIHwgICA0ICstCiAzIGZpbGVzIGNoYW5nZWQsIDgwIGluc2VydGlvbnMoKyksIDY4IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDQ1YjgzN2JjOGY5ZS4uYjE4Yzdk MjIzMzU3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMyMyw4ICszMjMsOCBAQCBzdHJ1 Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJLyogZGlzcGxheSBjbG9jayBpbmNyZWFzZS9k ZWNyZWFzZSAqLwogCS8qIHBsbCBjbG9jayBpbmNyZWFzZS9kZWNyZWFzZSAqLwogCi0Jdm9pZCAo KmxvYWRfY3NjX21hdHJpeCkoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOwot CXZvaWQgKCpsb2FkX2x1dHMpKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsK Kwl2b2lkICgqbG9hZF9jc2NfbWF0cml4KShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSk7CisJdm9pZCAoKmxvYWRfbHV0cykoY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpOwogfTsKIAogI2RlZmluZSBDU1JfVkVSU0lPTihtYWpvciwgbWlu b3IpCSgobWFqb3IpIDw8IDE2IHwgKG1pbm9yKSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2NvbG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5j CmluZGV4IDNhNTMzMTQzYTllZi4uMzkwZWUyODc4ZjlkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2NvbG9yLmMKQEAgLTc0LDEyICs3NCwxMiBAQAogI2RlZmluZSBJTEtfQ1NDX0NPRUZGXzFfMAkJ XAogCSgoNyA8PCAxMikgfCBJTEtfQ1NDX0NPRUZGX0ZQKENUTV9DT0VGRl8xXzAsIDgpKQogCi1z dGF0aWMgYm9vbCBsdXRfaXNfbGVnYWN5KHN0cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqbHV0KQor c3RhdGljIGJvb2wgbHV0X2lzX2xlZ2FjeShjb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2Ig Kmx1dCkKIHsKIAlyZXR1cm4gZHJtX2NvbG9yX2x1dF9zaXplKGx1dCkgPT0gTEVHQUNZX0xVVF9M RU5HVEg7CiB9CiAKLXN0YXRpYyBib29sIGNydGNfc3RhdGVfaXNfbGVnYWN5X2dhbW1hKHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQorc3RhdGljIGJvb2wgY3J0Y19zdGF0ZV9p c19sZWdhY3lfZ2FtbWEoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUp CiB7CiAJcmV0dXJuICFjcnRjX3N0YXRlLT5iYXNlLmRlZ2FtbWFfbHV0ICYmCiAJCSFjcnRjX3N0 YXRlLT5iYXNlLmN0bSAmJgpAQCAtMTE1LDggKzExNSw4IEBAIHN0YXRpYyB1NjQgKmN0bV9tdWx0 X2J5X2xpbWl0ZWQodTY0ICpyZXN1bHQsIGNvbnN0IHU2NCAqaW5wdXQpCiAKIHN0YXRpYyB2b2lk IGlsa19sb2FkX3ljYmNyX2NvbnZlcnNpb25fbWF0cml4KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj KQogewotCWludCBwaXBlID0gY3J0Yy0+cGlwZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKKwllbnVtIHBpcGUgcGlwZSA9IGNy dGMtPnBpcGU7CiAKIAlJOTE1X1dSSVRFKFBJUEVfQ1NDX1BSRU9GRl9ISShwaXBlKSwgMCk7CiAJ STkxNV9XUklURShQSVBFX0NTQ19QUkVPRkZfTUUocGlwZSksIDApOwpAQCAtMTM3LDEzICsxMzcs MTQgQEAgc3RhdGljIHZvaWQgaWxrX2xvYWRfeWNiY3JfY29udmVyc2lvbl9tYXRyaXgoc3RydWN0 IGludGVsX2NydGMgKmNydGMpCiAJSTkxNV9XUklURShQSVBFX0NTQ19NT0RFKHBpcGUpLCAwKTsK IH0KIAotc3RhdGljIHZvaWQgaWxrX2xvYWRfY3NjX21hdHJpeChzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKK3N0YXRpYyB2b2lkIGlsa19sb2FkX2NzY19tYXRyaXgoY29uc3Qg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGludGVsX2Ny dGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7Ci0J aW50IGksIHBpcGUgPSBjcnRjLT5waXBlOwotCXUxNiBjb2VmZnNbOV0gPSB7IDAsIH07CiAJYm9v bCBsaW1pdGVkX2NvbG9yX3JhbmdlID0gZmFsc2U7CisJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5w aXBlOworCXUxNiBjb2VmZnNbOV0gPSB7fTsKKwlpbnQgaTsKIAogCS8qCiAJICogRklYTUUgaWYg dGhlcmUncyBhIGdhbW1hIExVVCBhZnRlciB0aGUgQ1NDLCB3ZSBzaG91bGQKQEAgLTI1NiwxNiAr MjU3LDE2IEBAIHN0YXRpYyB2b2lkIGlsa19sb2FkX2NzY19tYXRyaXgoc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUpCiAvKgogICogU2V0IHVwIHRoZSBwaXBlIENTQyB1bml0IG9u IENoZXJyeVZpZXcuCiAgKi8KLXN0YXRpYyB2b2lkIGNoZXJyeXZpZXdfbG9hZF9jc2NfbWF0cml4 KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQorc3RhdGljIHZvaWQgY2hlcnJ5 dmlld19sb2FkX2NzY19tYXRyaXgoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGNfc3RhdGUtPmJhc2UuY3J0 Yy0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2 KTsKLQlpbnQgcGlwZSA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKS0+cGlw ZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+ YmFzZS5jcnRjKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGNydGMtPmJhc2UuZGV2KTsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CiAJdTMyIG1v ZGU7CiAKIAlpZiAoY3J0Y19zdGF0ZS0+YmFzZS5jdG0pIHsKLQkJc3RydWN0IGRybV9jb2xvcl9j dG0gKmN0bSA9IGNydGNfc3RhdGUtPmJhc2UuY3RtLT5kYXRhOwotCQl1MTYgY29lZmZzWzldID0g eyAwLCB9OworCQljb25zdCBzdHJ1Y3QgZHJtX2NvbG9yX2N0bSAqY3RtID0gY3J0Y19zdGF0ZS0+ YmFzZS5jdG0tPmRhdGE7CisJCXUxNiBjb2VmZnNbOV0gPSB7fTsKIAkJaW50IGk7CiAKIAkJZm9y IChpID0gMDsgaSA8IEFSUkFZX1NJWkUoY29lZmZzKTsgaSsrKSB7CkBAIC0zMDMsMTggKzMwNCwx NyBAQCBzdGF0aWMgdm9pZCBjaGVycnl2aWV3X2xvYWRfY3NjX21hdHJpeChzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlJOTE1X1dSSVRFKENHTV9QSVBFX01PREUocGlwZSks IG1vZGUpOwogfQogCi12b2lkIGludGVsX2NvbG9yX3NldF9jc2Moc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpCit2b2lkIGludGVsX2NvbG9yX3NldF9jc2MoY29uc3Qgc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNydGNfc3RhdGUtPmJhc2UuY3J0Yy0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGNydGNfc3RhdGUtPmJhc2UuY3J0Yy0+ZGV2KTsKIAogCWlmIChkZXZf cHJpdi0+ZGlzcGxheS5sb2FkX2NzY19tYXRyaXgpCiAJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRf Y3NjX21hdHJpeChjcnRjX3N0YXRlKTsKIH0KIAogLyogTG9hZHMgdGhlIGxlZ2FjeSBwYWxldHRl L2dhbW1hIHVuaXQgZm9yIHRoZSBDUlRDLiAqLwotc3RhdGljIHZvaWQgaTl4eF9sb2FkX2x1dHNf aW50ZXJuYWwoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCi0JCQkJICAgIHN0 cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqYmxvYikKK3N0YXRpYyB2b2lkIGk5eHhfbG9hZF9sdXRz X2ludGVybmFsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJ CSAgICBjb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmJsb2IpCiB7CiAJc3RydWN0IGlu dGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRl dik7CkBAIC0zMjksNyArMzI5LDggQEAgc3RhdGljIHZvaWQgaTl4eF9sb2FkX2x1dHNfaW50ZXJu YWwoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJfQogCiAJaWYgKGJsb2Ip IHsKLQkJc3RydWN0IGRybV9jb2xvcl9sdXQgKmx1dCA9IGJsb2ItPmRhdGE7CisJCWNvbnN0IHN0 cnVjdCBkcm1fY29sb3JfbHV0ICpsdXQgPSBibG9iLT5kYXRhOworCiAJCWZvciAoaSA9IDA7IGkg PCAyNTY7IGkrKykgewogCQkJdTMyIHdvcmQgPQogCQkJCShkcm1fY29sb3JfbHV0X2V4dHJhY3Qo bHV0W2ldLnJlZCwgOCkgPDwgMTYpIHwKQEAgLTM1MywxMyArMzU0LDEzIEBAIHN0YXRpYyB2b2lk IGk5eHhfbG9hZF9sdXRzX2ludGVybmFsKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlLAogCX0KIH0KIAotc3RhdGljIHZvaWQgaTl4eF9sb2FkX2x1dHMoc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUpCitzdGF0aWMgdm9pZCBpOXh4X2xvYWRfbHV0cyhjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKIAlpOXh4X2xvYWRfbHV0c19p bnRlcm5hbChjcnRjX3N0YXRlLCBjcnRjX3N0YXRlLT5iYXNlLmdhbW1hX2x1dCk7CiB9CiAKIC8q IExvYWRzIHRoZSBsZWdhY3kgcGFsZXR0ZS9nYW1tYSB1bml0IGZvciB0aGUgQ1JUQyBvbiBIYXN3 ZWxsLiAqLwotc3RhdGljIHZvaWQgaGFzd2VsbF9sb2FkX2x1dHMoc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpCitzdGF0aWMgdm9pZCBoYXN3ZWxsX2xvYWRfbHV0cyhjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKQEAg LTM4MywxNyArMzg0LDE5IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfbG9hZF9sdXRzKHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCQloc3dfZW5hYmxlX2lwcyhjcnRjX3N0YXRl KTsKIH0KIAotc3RhdGljIHZvaWQgYmR3X2xvYWRfZGVnYW1tYV9sdXQoc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUpCitzdGF0aWMgdm9pZCBiZHdfbG9hZF9kZWdhbW1hX2x1dChj b25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGNfc3RhdGUtPmJhc2UuY3J0Yy0+ ZGV2KTsKLQllbnVtIHBpcGUgcGlwZSA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5j cnRjKS0+cGlwZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Y19zdGF0ZS0+YmFzZS5jcnRjKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKKwljb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Js b2IgKmRlZ2FtbWFfbHV0ID0gY3J0Y19zdGF0ZS0+YmFzZS5kZWdhbW1hX2x1dDsKIAl1MzIgaSwg bHV0X3NpemUgPSBJTlRFTF9JTkZPKGRldl9wcml2KS0+Y29sb3IuZGVnYW1tYV9sdXRfc2l6ZTsK KwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CiAKIAlJOTE1X1dSSVRFKFBSRUNfUEFMX0lO REVYKHBpcGUpLAogCQkgICBQQUxfUFJFQ19TUExJVF9NT0RFIHwgUEFMX1BSRUNfQVVUT19JTkNS RU1FTlQpOwogCi0JaWYgKGNydGNfc3RhdGUtPmJhc2UuZGVnYW1tYV9sdXQpIHsKLQkJc3RydWN0 IGRybV9jb2xvcl9sdXQgKmx1dCA9IGNydGNfc3RhdGUtPmJhc2UuZGVnYW1tYV9sdXQtPmRhdGE7 CisJaWYgKGRlZ2FtbWFfbHV0KSB7CisJCWNvbnN0IHN0cnVjdCBkcm1fY29sb3JfbHV0ICpsdXQg PSBkZWdhbW1hX2x1dC0+ZGF0YTsKIAogCQlmb3IgKGkgPSAwOyBpIDwgbHV0X3NpemU7IGkrKykg ewogCQkJdTMyIHdvcmQgPQpAQCAtNDEzLDExICs0MTYsMTMgQEAgc3RhdGljIHZvaWQgYmR3X2xv YWRfZGVnYW1tYV9sdXQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJfQog fQogCi1zdGF0aWMgdm9pZCBiZHdfbG9hZF9nYW1tYV9sdXQoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUsIHUzMiBvZmZzZXQpCitzdGF0aWMgdm9pZCBiZHdfbG9hZF9nYW1tYV9s dXQoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsIHUzMiBvZmZzZXQp CiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjX3N0 YXRlLT5iYXNlLmNydGMtPmRldik7Ci0JZW51bSBwaXBlIHBpcGUgPSB0b19pbnRlbF9jcnRjKGNy dGNfc3RhdGUtPmJhc2UuY3J0YyktPnBpcGU7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0 b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CisJY29uc3Qgc3RydWN0 IGRybV9wcm9wZXJ0eV9ibG9iICpnYW1tYV9sdXQgPSBjcnRjX3N0YXRlLT5iYXNlLmdhbW1hX2x1 dDsKIAl1MzIgaSwgbHV0X3NpemUgPSBJTlRFTF9JTkZPKGRldl9wcml2KS0+Y29sb3IuZ2FtbWFf bHV0X3NpemU7CisJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOwogCiAJV0FSTl9PTihvZmZz ZXQgJiB+UEFMX1BSRUNfSU5ERVhfVkFMVUVfTUFTSyk7CiAKQEAgLTQyNiw4ICs0MzEsOCBAQCBz dGF0aWMgdm9pZCBiZHdfbG9hZF9nYW1tYV9sdXQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUsIHUzMiBvZmZzZXQpCiAJCSAgIFBBTF9QUkVDX0FVVE9fSU5DUkVNRU5UIHwKIAkJ ICAgb2Zmc2V0KTsKIAotCWlmIChjcnRjX3N0YXRlLT5iYXNlLmdhbW1hX2x1dCkgewotCQlzdHJ1 Y3QgZHJtX2NvbG9yX2x1dCAqbHV0ID0gY3J0Y19zdGF0ZS0+YmFzZS5nYW1tYV9sdXQtPmRhdGE7 CisJaWYgKGdhbW1hX2x1dCkgeworCQljb25zdCBzdHJ1Y3QgZHJtX2NvbG9yX2x1dCAqbHV0ID0g Z2FtbWFfbHV0LT5kYXRhOwogCiAJCWZvciAoaSA9IDA7IGkgPCBsdXRfc2l6ZTsgaSsrKSB7CiAJ CQl1MzIgd29yZCA9CkBAIC00NjEsMTAgKzQ2NiwxMSBAQCBzdGF0aWMgdm9pZCBiZHdfbG9hZF9n YW1tYV9sdXQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsIHUzMiBvZmZzZXQp CiB9CiAKIC8qIExvYWRzIHRoZSBwYWxldHRlL2dhbW1hIHVuaXQgZm9yIHRoZSBDUlRDIG9uIEJy b2Fkd2VsbCsuICovCi1zdGF0aWMgdm9pZCBicm9hZHdlbGxfbG9hZF9sdXRzKHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQorc3RhdGljIHZvaWQgYnJvYWR3ZWxsX2xvYWRfbHV0 cyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGNfc3RhdGUtPmJhc2UuY3J0 Yy0+ZGV2KTsKLQllbnVtIHBpcGUgcGlwZSA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFz ZS5jcnRjKS0+cGlwZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBp cGU7CiAKIAlpZiAoY3J0Y19zdGF0ZV9pc19sZWdhY3lfZ2FtbWEoY3J0Y19zdGF0ZSkpIHsKIAkJ aGFzd2VsbF9sb2FkX2x1dHMoY3J0Y19zdGF0ZSk7CkBAIC00ODQsMTAgKzQ5MCwxMSBAQCBzdGF0 aWMgdm9pZCBicm9hZHdlbGxfbG9hZF9sdXRzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlKQogCUk5MTVfV1JJVEUoUFJFQ19QQUxfSU5ERVgocGlwZSksIDApOwogfQogCi1zdGF0 aWMgdm9pZCBnbGtfbG9hZF9kZWdhbW1hX2x1dChzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSkKK3N0YXRpYyB2b2lkIGdsa19sb2FkX2RlZ2FtbWFfbHV0KGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjLT5kZXYpOwotCWVudW0g cGlwZSBwaXBlID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpLT5waXBlOwor CXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNl LmNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0 Yy0+YmFzZS5kZXYpOworCWVudW0gcGlwZSBwaXBlID0gY3J0Yy0+cGlwZTsKIAljb25zdCB1MzIg bHV0X3NpemUgPSAzMzsKIAl1MzIgaTsKIApAQCAtNTE0LDExICs1MjEsMTEgQEAgc3RhdGljIHZv aWQgZ2xrX2xvYWRfZGVnYW1tYV9sdXQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUpCiAJCUk5MTVfV1JJVEUoUFJFX0NTQ19HQU1DX0RBVEEocGlwZSksICgxIDw8IDE2KSk7CiB9 CiAKLXN0YXRpYyB2b2lkIGdsa19sb2FkX2x1dHMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUpCitzdGF0aWMgdm9pZCBnbGtfbG9hZF9sdXRzKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRj X3N0YXRlLT5iYXNlLmNydGMtPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7Ci0JZW51bSBwaXBlIHBpcGUgPSB0b19pbnRlbF9jcnRjKGNydGNf c3RhdGUtPmJhc2UuY3J0YyktPnBpcGU7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19p bnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CisJZW51bSBwaXBlIHBpcGUg PSBjcnRjLT5waXBlOwogCiAJZ2xrX2xvYWRfZGVnYW1tYV9sdXQoY3J0Y19zdGF0ZSk7CiAKQEAg LTUzMiwyOCArNTM5LDI5IEBAIHN0YXRpYyB2b2lkIGdsa19sb2FkX2x1dHMoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJSTkxNV9XUklURShHQU1NQV9NT0RFKHBpcGUpLCBj cnRjX3N0YXRlLT5nYW1tYV9tb2RlKTsKIH0KIAotLyogTG9hZHMgdGhlIHBhbGV0dGUvZ2FtbWEg dW5pdCBmb3IgdGhlIENSVEMgb24gQ2hlcnJ5Vmlldy4gKi8KLXN0YXRpYyB2b2lkIGNoZXJyeXZp ZXdfbG9hZF9sdXRzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQorc3RhdGlj IHZvaWQgY2hlcnJ5dmlld19sb2FkX2x1dHMoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRjID0gY3J0Y19zdGF0ZS0+YmFz ZS5jcnRjOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0 Yy0+ZGV2KTsKLQllbnVtIHBpcGUgcGlwZSA9IHRvX2ludGVsX2NydGMoY3J0YyktPnBpcGU7Ci0J c3RydWN0IGRybV9jb2xvcl9sdXQgKmx1dDsKLQl1MzIgaSwgbHV0X3NpemU7Ci0JdTMyIHdvcmQw LCB3b3JkMTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19z dGF0ZS0+YmFzZS5jcnRjKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0 b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKKwljb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2Ig KmdhbW1hX2x1dCA9IGNydGNfc3RhdGUtPmJhc2UuZ2FtbWFfbHV0OworCWNvbnN0IHN0cnVjdCBk cm1fcHJvcGVydHlfYmxvYiAqZGVnYW1tYV9sdXQgPSBjcnRjX3N0YXRlLT5iYXNlLmRlZ2FtbWFf bHV0OworCWVudW0gcGlwZSBwaXBlID0gY3J0Yy0+cGlwZTsKIAogCWlmIChjcnRjX3N0YXRlX2lz X2xlZ2FjeV9nYW1tYShjcnRjX3N0YXRlKSkgewogCQkvKiBUdXJuIG9mZiBkZWdhbW1hL2dhbW1h IG9uIENHTSBibG9jay4gKi8KIAkJSTkxNV9XUklURShDR01fUElQRV9NT0RFKHBpcGUpLAogCQkJ ICAgKGNydGNfc3RhdGUtPmJhc2UuY3RtID8gQ0dNX1BJUEVfTU9ERV9DU0MgOiAwKSk7Ci0JCWk5 eHhfbG9hZF9sdXRzX2ludGVybmFsKGNydGNfc3RhdGUsIGNydGNfc3RhdGUtPmJhc2UuZ2FtbWFf bHV0KTsKKwkJaTl4eF9sb2FkX2x1dHNfaW50ZXJuYWwoY3J0Y19zdGF0ZSwgZ2FtbWFfbHV0KTsK IAkJcmV0dXJuOwogCX0KIAotCWlmIChjcnRjX3N0YXRlLT5iYXNlLmRlZ2FtbWFfbHV0KSB7Ci0J CWx1dCA9IGNydGNfc3RhdGUtPmJhc2UuZGVnYW1tYV9sdXQtPmRhdGE7Ci0JCWx1dF9zaXplID0g SU5URUxfSU5GTyhkZXZfcHJpdiktPmNvbG9yLmRlZ2FtbWFfbHV0X3NpemU7CisJaWYgKGRlZ2Ft bWFfbHV0KSB7CisJCWNvbnN0IHN0cnVjdCBkcm1fY29sb3JfbHV0ICpsdXQgPSBkZWdhbW1hX2x1 dC0+ZGF0YTsKKwkJaW50IGksIGx1dF9zaXplID0gSU5URUxfSU5GTyhkZXZfcHJpdiktPmNvbG9y LmRlZ2FtbWFfbHV0X3NpemU7CisKIAkJZm9yIChpID0gMDsgaSA8IGx1dF9zaXplOyBpKyspIHsK KwkJCXUzMiB3b3JkMCwgd29yZDE7CisKIAkJCS8qIFdyaXRlIExVVCBpbiBVMC4xNCBmb3JtYXQu ICovCiAJCQl3b3JkMCA9CiAJCQkoZHJtX2NvbG9yX2x1dF9leHRyYWN0KGx1dFtpXS5ncmVlbiwg MTQpIDw8IDE2KSB8CkBAIC01NjUsMTAgKzU3MywxMyBAQCBzdGF0aWMgdm9pZCBjaGVycnl2aWV3 X2xvYWRfbHV0cyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAkJfQogCX0K IAotCWlmIChjcnRjX3N0YXRlLT5iYXNlLmdhbW1hX2x1dCkgewotCQlsdXQgPSBjcnRjX3N0YXRl LT5iYXNlLmdhbW1hX2x1dC0+ZGF0YTsKLQkJbHV0X3NpemUgPSBJTlRFTF9JTkZPKGRldl9wcml2 KS0+Y29sb3IuZ2FtbWFfbHV0X3NpemU7CisJaWYgKGdhbW1hX2x1dCkgeworCQljb25zdCBzdHJ1 Y3QgZHJtX2NvbG9yX2x1dCAqbHV0ID0gZ2FtbWFfbHV0LT5kYXRhOworCQlpbnQgaSwgbHV0X3Np emUgPSBJTlRFTF9JTkZPKGRldl9wcml2KS0+Y29sb3IuZ2FtbWFfbHV0X3NpemU7CisKIAkJZm9y IChpID0gMDsgaSA8IGx1dF9zaXplOyBpKyspIHsKKwkJCXUzMiB3b3JkMCwgd29yZDE7CisKIAkJ CS8qIFdyaXRlIExVVCBpbiBVMC4xMCBmb3JtYXQuICovCiAJCQl3b3JkMCA9CiAJCQkoZHJtX2Nv bG9yX2x1dF9leHRyYWN0KGx1dFtpXS5ncmVlbiwgMTApIDw8IDE2KSB8CkBAIC01ODIsOCArNTkz LDggQEAgc3RhdGljIHZvaWQgY2hlcnJ5dmlld19sb2FkX2x1dHMoc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpCiAKIAlJOTE1X1dSSVRFKENHTV9QSVBFX01PREUocGlwZSksCiAJ CSAgIChjcnRjX3N0YXRlLT5iYXNlLmN0bSA/IENHTV9QSVBFX01PREVfQ1NDIDogMCkgfAotCQkg ICAoY3J0Y19zdGF0ZS0+YmFzZS5kZWdhbW1hX2x1dCA/IENHTV9QSVBFX01PREVfREVHQU1NQSA6 IDApIHwKLQkJICAgKGNydGNfc3RhdGUtPmJhc2UuZ2FtbWFfbHV0ID8gQ0dNX1BJUEVfTU9ERV9H QU1NQSA6IDApKTsKKwkJICAgKGRlZ2FtbWFfbHV0ID8gQ0dNX1BJUEVfTU9ERV9ERUdBTU1BIDog MCkgfAorCQkgICAoZ2FtbWFfbHV0ID8gQ0dNX1BJUEVfTU9ERV9HQU1NQSA6IDApKTsKIAogCS8q CiAJICogQWxzbyBwcm9ncmFtIGEgbGluZWFyIExVVCBpbiB0aGUgbGVnYWN5IGJsb2NrIChiZWhp bmQgdGhlCkBAIC01OTIsMTAgKzYwMyw5IEBAIHN0YXRpYyB2b2lkIGNoZXJyeXZpZXdfbG9hZF9s dXRzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCWk5eHhfbG9hZF9sdXRz X2ludGVybmFsKGNydGNfc3RhdGUsIE5VTEwpOwogfQogCi12b2lkIGludGVsX2NvbG9yX2xvYWRf bHV0cyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3ZvaWQgaW50ZWxfY29s b3JfbG9hZF9sdXRzKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQog ewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjX3N0YXRlLT5iYXNlLmNydGMtPmRldjsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjX3N0YXRlLT5iYXNl LmNydGMtPmRldik7CiAKIAlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1dHMoY3J0Y19zdGF0ZSk7 CiB9CkBAIC02MjAsNiArNjMwLDggQEAgc3RhdGljIGludCBjaGVja19sdXRfc2l6ZShjb25zdCBz dHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmx1dCwgaW50IGV4cGVjdGVkKQogaW50IGludGVsX2Nv bG9yX2NoZWNrKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Y19zdGF0ZS0+YmFzZS5j cnRjLT5kZXYpOworCWNvbnN0IHN0cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqZ2FtbWFfbHV0ID0g Y3J0Y19zdGF0ZS0+YmFzZS5nYW1tYV9sdXQ7CisJY29uc3Qgc3RydWN0IGRybV9wcm9wZXJ0eV9i bG9iICpkZWdhbW1hX2x1dCA9IGNydGNfc3RhdGUtPmJhc2UuZGVnYW1tYV9sdXQ7CiAJaW50IGdh bW1hX2xlbmd0aCwgZGVnYW1tYV9sZW5ndGg7CiAJdTMyIGdhbW1hX3Rlc3RzLCBkZWdhbW1hX3Rl c3RzOwogCkBAIC02MzQsMTIgKzY0NiwxMiBAQCBpbnQgaW50ZWxfY29sb3JfY2hlY2soc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCXJldHVybiAwOwogCX0KIAotCWlmIChj aGVja19sdXRfc2l6ZShjcnRjX3N0YXRlLT5iYXNlLmRlZ2FtbWFfbHV0LCBkZWdhbW1hX2xlbmd0 aCkgfHwKLQkgICAgY2hlY2tfbHV0X3NpemUoY3J0Y19zdGF0ZS0+YmFzZS5nYW1tYV9sdXQsIGdh bW1hX2xlbmd0aCkpCisJaWYgKGNoZWNrX2x1dF9zaXplKGRlZ2FtbWFfbHV0LCBkZWdhbW1hX2xl bmd0aCkgfHwKKwkgICAgY2hlY2tfbHV0X3NpemUoZ2FtbWFfbHV0LCBnYW1tYV9sZW5ndGgpKQog CQlyZXR1cm4gLUVJTlZBTDsKIAotCWlmIChkcm1fY29sb3JfbHV0X2NoZWNrKGNydGNfc3RhdGUt PmJhc2UuZGVnYW1tYV9sdXQsIGRlZ2FtbWFfdGVzdHMpIHx8Ci0JICAgIGRybV9jb2xvcl9sdXRf Y2hlY2soY3J0Y19zdGF0ZS0+YmFzZS5nYW1tYV9sdXQsIGdhbW1hX3Rlc3RzKSkKKwlpZiAoZHJt X2NvbG9yX2x1dF9jaGVjayhkZWdhbW1hX2x1dCwgZGVnYW1tYV90ZXN0cykgfHwKKwkgICAgZHJt X2NvbG9yX2x1dF9jaGVjayhnYW1tYV9sdXQsIGdhbW1hX3Rlc3RzKSkKIAkJcmV0dXJuIC1FSU5W QUw7CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMCB8fCBJU19HRU1JTklMQUtFKGRl dl9wcml2KSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZDQ5NmVmZjZmZGQwLi41NTg2 ODcwZmEwMDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0yMzgwLDggKzIzODAsOCBA QCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrX3dpdGhfc3RhdGUoY29uc3Qgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjXwogLyogaW50ZWxfY29sb3IuYyAqLwogdm9pZCBpbnRl bF9jb2xvcl9pbml0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKIGludCBpbnRlbF9jb2xvcl9j aGVjayhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7Ci12b2lkIGludGVsX2Nv bG9yX3NldF9jc2Moc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOwotdm9pZCBp bnRlbF9jb2xvcl9sb2FkX2x1dHMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUp Owordm9pZCBpbnRlbF9jb2xvcl9zZXRfY3NjKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlKTsKK3ZvaWQgaW50ZWxfY29sb3JfbG9hZF9sdXRzKGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKIAogLyogaW50ZWxfbHNwY29uLmMgKi8KIGJv b2wgbHNwY29uX2luaXQoc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQp OwotLSAKMi4xOS4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK