From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 04/13] drm/i915: Rename the plane_state->main/aux to plane_state->color_plane[] Date: Fri, 7 Sep 2018 18:24:04 +0300 Message-ID: <20180907152413.15761-5-ville.syrjala@linux.intel.com> References: <20180907152413.15761-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 mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1E2976E979 for ; Fri, 7 Sep 2018 15:24:28 +0000 (UTC) In-Reply-To: <20180907152413.15761-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1h a2UgdGhlIG1haW4vYXV4IHN1cmZhY2Ugc3R1ZmYgYSBiaXQgbW9yZSBnZW5lcmljIGJ5IHVzaW5n IGFuIGFycmF5Cm9mIHN0cnVjdHVyZXMuIFRoaXMgd2lsbCBhbGxvdyB1cyB0byBkZWFsIHdpdGgg Ym90aCB0aGUgbWFpbiBhbmQgYXV4CnN1cmZhY2VzIHdpdGggY29tbW9uIGNvZGUuCgpSZXZpZXdl ZC1ieTogSm9zw6kgUm9iZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTYgKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCAgICAgfCAgNiArLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYyAgICAg fCAgNCArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDI5ICsrKysr KysrKystLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKSwgNDkgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDQxN2Q1ZDI0 Y2M4ZC4uOThjMzBhNDAwNzhlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC0yOTUxLDkgKzI5NTEsOSBAQCBzdGF0aWMgYm9vbCBza2xfY2hlY2tfbWFpbl9jY3NfY29vcmRp bmF0ZXMoc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZQogCWNvbnN0IHN0cnVj dCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7CiAJaW50IGhzdWIg PSBmYi0+Zm9ybWF0LT5oc3ViOwogCWludCB2c3ViID0gZmItPmZvcm1hdC0+dnN1YjsKLQlpbnQg YXV4X3ggPSBwbGFuZV9zdGF0ZS0+YXV4Lng7Ci0JaW50IGF1eF95ID0gcGxhbmVfc3RhdGUtPmF1 eC55OwotCXUzMiBhdXhfb2Zmc2V0ID0gcGxhbmVfc3RhdGUtPmF1eC5vZmZzZXQ7CisJaW50IGF1 eF94ID0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzFdLng7CisJaW50IGF1eF95ID0gcGxhbmVf c3RhdGUtPmNvbG9yX3BsYW5lWzFdLnk7CisJdTMyIGF1eF9vZmZzZXQgPSBwbGFuZV9zdGF0ZS0+ Y29sb3JfcGxhbmVbMV0ub2Zmc2V0OwogCXUzMiBhbGlnbm1lbnQgPSBpbnRlbF9zdXJmX2FsaWdu bWVudChmYiwgMSk7CiAKIAl3aGlsZSAoYXV4X29mZnNldCA+PSBtYWluX29mZnNldCAmJiBhdXhf eSA8PSBtYWluX3kpIHsKQEAgLTI5NzYsOSArMjk3Niw5IEBAIHN0YXRpYyBib29sIHNrbF9jaGVj a19tYWluX2Njc19jb29yZGluYXRlcyhzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0 YXRlCiAJaWYgKGF1eF94ICE9IG1haW5feCB8fCBhdXhfeSAhPSBtYWluX3kpCiAJCXJldHVybiBm YWxzZTsKIAotCXBsYW5lX3N0YXRlLT5hdXgub2Zmc2V0ID0gYXV4X29mZnNldDsKLQlwbGFuZV9z dGF0ZS0+YXV4LnggPSBhdXhfeDsKLQlwbGFuZV9zdGF0ZS0+YXV4LnkgPSBhdXhfeTsKKwlwbGFu ZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMV0ub2Zmc2V0ID0gYXV4X29mZnNldDsKKwlwbGFuZV9zdGF0 ZS0+Y29sb3JfcGxhbmVbMV0ueCA9IGF1eF94OworCXBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVsx XS55ID0gYXV4X3k7CiAKIAlyZXR1cm4gdHJ1ZTsKIH0KQEAgLTI5OTksNyArMjk5OSw3IEBAIHN0 YXRpYyBpbnQgc2tsX2NoZWNrX21haW5fc3VyZmFjZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSwKIAlpbnQgcGlwZV9zcmNfdyA9IGNydGNfc3RhdGUtPnBpcGVfc3Jj X3c7CiAJaW50IG1heF93aWR0aCA9IHNrbF9tYXhfcGxhbmVfd2lkdGgoZmIsIDAsIHJvdGF0aW9u KTsKIAlpbnQgbWF4X2hlaWdodCA9IDQwOTY7Ci0JdTMyIGFsaWdubWVudCwgb2Zmc2V0LCBhdXhf b2Zmc2V0ID0gcGxhbmVfc3RhdGUtPmF1eC5vZmZzZXQ7CisJdTMyIGFsaWdubWVudCwgb2Zmc2V0 LCBhdXhfb2Zmc2V0ID0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzFdLm9mZnNldDsKIAogCWlm ICh3ID4gbWF4X3dpZHRoIHx8IGggPiBtYXhfaGVpZ2h0KSB7CiAJCURSTV9ERUJVR19LTVMoInJl cXVlc3RlZCBZL1JHQiBzb3VyY2Ugc2l6ZSAlZHglZCB0b28gYmlnIChsaW1pdCAlZHglZClcbiIs CkBAIC0zMDcxLDE1ICszMDcxLDE1IEBAIHN0YXRpYyBpbnQgc2tsX2NoZWNrX21haW5fc3VyZmFj ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkJCQkJICAg b2Zmc2V0LCBvZmZzZXQgLSBhbGlnbm1lbnQpOwogCQl9CiAKLQkJaWYgKHggIT0gcGxhbmVfc3Rh dGUtPmF1eC54IHx8IHkgIT0gcGxhbmVfc3RhdGUtPmF1eC55KSB7CisJCWlmICh4ICE9IHBsYW5l X3N0YXRlLT5jb2xvcl9wbGFuZVsxXS54IHx8IHkgIT0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5l WzFdLnkpIHsKIAkJCURSTV9ERUJVR19LTVMoIlVuYWJsZSB0byBmaW5kIHN1aXRhYmxlIGRpc3Bs YXkgc3VyZmFjZSBvZmZzZXQgZHVlIHRvIENDU1xuIik7CiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJ fQogCX0KIAotCXBsYW5lX3N0YXRlLT5tYWluLm9mZnNldCA9IG9mZnNldDsKLQlwbGFuZV9zdGF0 ZS0+bWFpbi54ID0geDsKLQlwbGFuZV9zdGF0ZS0+bWFpbi55ID0geTsKKwlwbGFuZV9zdGF0ZS0+ Y29sb3JfcGxhbmVbMF0ub2Zmc2V0ID0gb2Zmc2V0OworCXBsYW5lX3N0YXRlLT5jb2xvcl9wbGFu ZVswXS54ID0geDsKKwlwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMF0ueSA9IHk7CiAKIAlyZXR1 cm4gMDsKIH0KQEAgLTMxMjksOSArMzEyOSw5IEBAIHN0YXRpYyBpbnQgc2tsX2NoZWNrX252MTJf YXV4X3N1cmZhY2Uoc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIAkJcmV0 dXJuIC1FSU5WQUw7CiAJfQogCi0JcGxhbmVfc3RhdGUtPmF1eC5vZmZzZXQgPSBvZmZzZXQ7Ci0J cGxhbmVfc3RhdGUtPmF1eC54ID0geDsKLQlwbGFuZV9zdGF0ZS0+YXV4LnkgPSB5OworCXBsYW5l X3N0YXRlLT5jb2xvcl9wbGFuZVsxXS5vZmZzZXQgPSBvZmZzZXQ7CisJcGxhbmVfc3RhdGUtPmNv bG9yX3BsYW5lWzFdLnggPSB4OworCXBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVsxXS55ID0geTsK IAogCXJldHVybiAwOwogfQpAQCAtMzE1Niw5ICszMTU2LDkgQEAgc3RhdGljIGludCBza2xfY2hl Y2tfY2NzX2F1eF9zdXJmYWNlKHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUp CiAJaW50ZWxfYWRkX2ZiX29mZnNldHMoJngsICZ5LCBwbGFuZV9zdGF0ZSwgMSk7CiAJb2Zmc2V0 ID0gaW50ZWxfcGxhbmVfY29tcHV0ZV9hbGlnbmVkX29mZnNldCgmeCwgJnksIHBsYW5lX3N0YXRl LCAxKTsKIAotCXBsYW5lX3N0YXRlLT5hdXgub2Zmc2V0ID0gb2Zmc2V0OwotCXBsYW5lX3N0YXRl LT5hdXgueCA9IHggKiBoc3ViICsgc3JjX3ggJSBoc3ViOwotCXBsYW5lX3N0YXRlLT5hdXgueSA9 IHkgKiB2c3ViICsgc3JjX3kgJSB2c3ViOworCXBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVsxXS5v ZmZzZXQgPSBvZmZzZXQ7CisJcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzFdLnggPSB4ICogaHN1 YiArIHNyY194ICUgaHN1YjsKKwlwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMV0ueSA9IHkgKiB2 c3ViICsgc3JjX3kgJSB2c3ViOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0zMjAxLDkgKzMyMDEsOSBA QCBpbnQgc2tsX2NoZWNrX3BsYW5lX3N1cmZhY2UoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUsCiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0gZWxzZSB7Ci0J CXBsYW5lX3N0YXRlLT5hdXgub2Zmc2V0ID0gfjB4ZmZmOwotCQlwbGFuZV9zdGF0ZS0+YXV4Lngg PSAwOwotCQlwbGFuZV9zdGF0ZS0+YXV4LnkgPSAwOworCQlwbGFuZV9zdGF0ZS0+Y29sb3JfcGxh bmVbMV0ub2Zmc2V0ID0gfjB4ZmZmOworCQlwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMV0ueCA9 IDA7CisJCXBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVsxXS55ID0gMDsKIAl9CiAKIAlyZXQgPSBz a2xfY2hlY2tfbWFpbl9zdXJmYWNlKGNydGNfc3RhdGUsIHBsYW5lX3N0YXRlKTsKQEAgLTMzMzIs OSArMzMzMiw5IEBAIGludCBpOXh4X2NoZWNrX3BsYW5lX3N1cmZhY2Uoc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIAkJfQogCX0KIAotCXBsYW5lX3N0YXRlLT5tYWluLm9m ZnNldCA9IG9mZnNldDsKLQlwbGFuZV9zdGF0ZS0+bWFpbi54ID0gc3JjX3g7Ci0JcGxhbmVfc3Rh dGUtPm1haW4ueSA9IHNyY195OworCXBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVswXS5vZmZzZXQg PSBvZmZzZXQ7CisJcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzBdLnggPSBzcmNfeDsKKwlwbGFu ZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMF0ueSA9IHNyY195OwogCiAJcmV0dXJuIDA7CiB9CkBAIC0z MzQ5LDE1ICszMzQ5LDE1IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3BsYW5lKHN0cnVjdCBp bnRlbF9wbGFuZSAqcGxhbmUsCiAJdTMyIGxpbmVhcl9vZmZzZXQ7CiAJdTMyIGRzcGNudHIgPSBw bGFuZV9zdGF0ZS0+Y3RsOwogCWk5MTVfcmVnX3QgcmVnID0gRFNQQ05UUihpOXh4X3BsYW5lKTsK LQlpbnQgeCA9IHBsYW5lX3N0YXRlLT5tYWluLng7Ci0JaW50IHkgPSBwbGFuZV9zdGF0ZS0+bWFp bi55OworCWludCB4ID0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzBdLng7CisJaW50IHkgPSBw bGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMF0ueTsKIAl1bnNpZ25lZCBsb25nIGlycWZsYWdzOwog CXUzMiBkc3BhZGRyX29mZnNldDsKIAogCWxpbmVhcl9vZmZzZXQgPSBpbnRlbF9mYl94eV90b19s aW5lYXIoeCwgeSwgcGxhbmVfc3RhdGUsIDApOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gNCkKLQkJZHNwYWRkcl9vZmZzZXQgPSBwbGFuZV9zdGF0ZS0+bWFpbi5vZmZzZXQ7CisJCWRz cGFkZHJfb2Zmc2V0ID0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzBdLm9mZnNldDsKIAllbHNl CiAJCWRzcGFkZHJfb2Zmc2V0ID0gbGluZWFyX29mZnNldDsKIApAQCAtOTYyMiw3ICs5NjIyLDcg QEAgc3RhdGljIHUzMiBpbnRlbF9jdXJzb3JfYmFzZShjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKnBsYW5lX3N0YXRlKQogCWVsc2UKIAkJYmFzZSA9IGludGVsX3BsYW5lX2dndHRfb2Zm c2V0KHBsYW5lX3N0YXRlKTsKIAotCWJhc2UgKz0gcGxhbmVfc3RhdGUtPm1haW4ub2Zmc2V0Owor CWJhc2UgKz0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzBdLm9mZnNldDsKIAogCS8qIElMSysg ZG8gdGhpcyBhdXRvbWFnaWNhbGx5ICovCiAJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYp ICYmCkBAIC05NzAxLDcgKzk3MDEsNyBAQCBzdGF0aWMgaW50IGludGVsX2NoZWNrX2N1cnNvcihz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJ fQogCi0JcGxhbmVfc3RhdGUtPm1haW4ub2Zmc2V0ID0gb2Zmc2V0OworCXBsYW5lX3N0YXRlLT5j b2xvcl9wbGFuZVswXS5vZmZzZXQgPSBvZmZzZXQ7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKaW5kZXggODE2MjAyNTExNGY1Li45ZTE2YmRjZmZjODQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oCkBAIC01MDQsMTEgKzUwNCw3IEBAIHN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSB7CiAJc3RydWN0IHsKIAkJdTMyIG9mZnNldDsKIAkJaW50IHgsIHk7Ci0JfSBtYWlu OwotCXN0cnVjdCB7Ci0JCXUzMiBvZmZzZXQ7Ci0JCWludCB4LCB5OwotCX0gYXV4OworCX0gY29s b3JfcGxhbmVbMl07CiAKIAkvKiBwbGFuZSBjb250cm9sIHJlZ2lzdGVyICovCiAJdTMyIGN0bDsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKaW5kZXggMDFkMWQyMDg4ZjA0Li43NGQ0MjVjNzAwZWYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCkBAIC02NzAsOCArNjcwLDggQEAgc3RhdGljIHZv aWQgaW50ZWxfZmJjX3VwZGF0ZV9zdGF0ZV9jYWNoZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywK IAljYWNoZS0+cGxhbmUuc3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmcGxhbmVfc3RhdGUtPmJhc2Uu c3JjKSA+PiAxNjsKIAljYWNoZS0+cGxhbmUuc3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5l X3N0YXRlLT5iYXNlLnNyYykgPj4gMTY7CiAJY2FjaGUtPnBsYW5lLnZpc2libGUgPSBwbGFuZV9z dGF0ZS0+YmFzZS52aXNpYmxlOwotCWNhY2hlLT5wbGFuZS5hZGp1c3RlZF94ID0gcGxhbmVfc3Rh dGUtPm1haW4ueDsKLQljYWNoZS0+cGxhbmUuYWRqdXN0ZWRfeSA9IHBsYW5lX3N0YXRlLT5tYWlu Lnk7CisJY2FjaGUtPnBsYW5lLmFkanVzdGVkX3ggPSBwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVb MF0ueDsKKwljYWNoZS0+cGxhbmUuYWRqdXN0ZWRfeSA9IHBsYW5lX3N0YXRlLT5jb2xvcl9wbGFu ZVswXS55OwogCWNhY2hlLT5wbGFuZS55ID0gcGxhbmVfc3RhdGUtPmJhc2Uuc3JjLnkxID4+IDE2 OwogCiAJaWYgKCFjYWNoZS0+cGxhbmUudmlzaWJsZSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3By aXRlLmMKaW5kZXggOWM2Mjc4NzkyNzU1Li5kZjBjZjNkMmVhOTggMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCkBAIC0yNTgsNyArMjU4LDcgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1 Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCWVudW0gcGlwZSBwaXBlID0gcGxhbmUtPnBpcGU7CiAJ dTMyIHBsYW5lX2N0bCA9IHBsYW5lX3N0YXRlLT5jdGw7CiAJY29uc3Qgc3RydWN0IGRybV9pbnRl bF9zcHJpdGVfY29sb3JrZXkgKmtleSA9ICZwbGFuZV9zdGF0ZS0+Y2tleTsKLQl1MzIgc3VyZl9h ZGRyID0gcGxhbmVfc3RhdGUtPm1haW4ub2Zmc2V0OworCXUzMiBzdXJmX2FkZHIgPSBwbGFuZV9z dGF0ZS0+Y29sb3JfcGxhbmVbMF0ub2Zmc2V0OwogCXVuc2lnbmVkIGludCByb3RhdGlvbiA9IHBs YW5lX3N0YXRlLT5iYXNlLnJvdGF0aW9uOwogCXUzMiBzdHJpZGUgPSBza2xfcGxhbmVfc3RyaWRl KGZiLCAwLCByb3RhdGlvbik7CiAJdTMyIGF1eF9zdHJpZGUgPSBza2xfcGxhbmVfc3RyaWRlKGZi LCAxLCByb3RhdGlvbik7CkBAIC0yNjYsOCArMjY2LDggQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1 Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCWludCBjcnRjX3kgPSBwbGFuZV9zdGF0ZS0+YmFzZS5k c3QueTE7CiAJdWludDMyX3QgY3J0Y193ID0gZHJtX3JlY3Rfd2lkdGgoJnBsYW5lX3N0YXRlLT5i YXNlLmRzdCk7CiAJdWludDMyX3QgY3J0Y19oID0gZHJtX3JlY3RfaGVpZ2h0KCZwbGFuZV9zdGF0 ZS0+YmFzZS5kc3QpOwotCXVpbnQzMl90IHggPSBwbGFuZV9zdGF0ZS0+bWFpbi54OwotCXVpbnQz Ml90IHkgPSBwbGFuZV9zdGF0ZS0+bWFpbi55OworCXVpbnQzMl90IHggPSBwbGFuZV9zdGF0ZS0+ Y29sb3JfcGxhbmVbMF0ueDsKKwl1aW50MzJfdCB5ID0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5l WzBdLnk7CiAJdWludDMyX3Qgc3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmcGxhbmVfc3RhdGUtPmJh c2Uuc3JjKSA+PiAxNjsKIAl1aW50MzJfdCBzcmNfaCA9IGRybV9yZWN0X2hlaWdodCgmcGxhbmVf c3RhdGUtPmJhc2Uuc3JjKSA+PiAxNjsKIAl1bnNpZ25lZCBsb25nIGlycWZsYWdzOwpAQCAtMjk0 LDkgKzI5NCwxMCBAQCBza2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUs CiAJSTkxNV9XUklURV9GVyhQTEFORV9TVFJJREUocGlwZSwgcGxhbmVfaWQpLCBzdHJpZGUpOwog CUk5MTVfV1JJVEVfRlcoUExBTkVfU0laRShwaXBlLCBwbGFuZV9pZCksIChzcmNfaCA8PCAxNikg fCBzcmNfdyk7CiAJSTkxNV9XUklURV9GVyhQTEFORV9BVVhfRElTVChwaXBlLCBwbGFuZV9pZCks Ci0JCSAgICAgIChwbGFuZV9zdGF0ZS0+YXV4Lm9mZnNldCAtIHN1cmZfYWRkcikgfCBhdXhfc3Ry aWRlKTsKKwkJICAgICAgKHBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVsxXS5vZmZzZXQgLSBzdXJm X2FkZHIpIHwgYXV4X3N0cmlkZSk7CiAJSTkxNV9XUklURV9GVyhQTEFORV9BVVhfT0ZGU0VUKHBp cGUsIHBsYW5lX2lkKSwKLQkJICAgICAgKHBsYW5lX3N0YXRlLT5hdXgueSA8PCAxNikgfCBwbGFu ZV9zdGF0ZS0+YXV4LngpOworCQkgICAgICAocGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzFdLnkg PDwgMTYpIHwKKwkJICAgICAgcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzFdLngpOwogCiAJLyog cHJvZ3JhbSBwbGFuZSBzY2FsZXIgKi8KIAlpZiAocGxhbmVfc3RhdGUtPnNjYWxlcl9pZCA+PSAw KSB7CkBAIC01NjIsMTUgKzU2MywxNSBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9w bGFuZSAqcGxhbmUsCiAJZW51bSBwaXBlIHBpcGUgPSBwbGFuZS0+cGlwZTsKIAllbnVtIHBsYW5l X2lkIHBsYW5lX2lkID0gcGxhbmUtPmlkOwogCXUzMiBzcHJjdGwgPSBwbGFuZV9zdGF0ZS0+Y3Rs OwotCXUzMiBzcHJzdXJmX29mZnNldCA9IHBsYW5lX3N0YXRlLT5tYWluLm9mZnNldDsKKwl1MzIg c3Byc3VyZl9vZmZzZXQgPSBwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMF0ub2Zmc2V0OwogCXUz MiBsaW5lYXJfb2Zmc2V0OwogCWNvbnN0IHN0cnVjdCBkcm1faW50ZWxfc3ByaXRlX2NvbG9ya2V5 ICprZXkgPSAmcGxhbmVfc3RhdGUtPmNrZXk7CiAJaW50IGNydGNfeCA9IHBsYW5lX3N0YXRlLT5i YXNlLmRzdC54MTsKIAlpbnQgY3J0Y195ID0gcGxhbmVfc3RhdGUtPmJhc2UuZHN0LnkxOwogCXVp bnQzMl90IGNydGNfdyA9IGRybV9yZWN0X3dpZHRoKCZwbGFuZV9zdGF0ZS0+YmFzZS5kc3QpOwog CXVpbnQzMl90IGNydGNfaCA9IGRybV9yZWN0X2hlaWdodCgmcGxhbmVfc3RhdGUtPmJhc2UuZHN0 KTsKLQl1aW50MzJfdCB4ID0gcGxhbmVfc3RhdGUtPm1haW4ueDsKLQl1aW50MzJfdCB5ID0gcGxh bmVfc3RhdGUtPm1haW4ueTsKKwl1aW50MzJfdCB4ID0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5l WzBdLng7CisJdWludDMyX3QgeSA9IHBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVswXS55OwogCXVu c2lnbmVkIGxvbmcgaXJxZmxhZ3M7CiAKIAkvKiBTaXplcyBhcmUgMCBiYXNlZCAqLwpAQCAtNzIx LDE1ICs3MjIsMTUgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5l LAogCWNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2Uu ZmI7CiAJZW51bSBwaXBlIHBpcGUgPSBwbGFuZS0+cGlwZTsKIAl1MzIgc3ByY3RsID0gcGxhbmVf c3RhdGUtPmN0bCwgc3Byc2NhbGUgPSAwOwotCXUzMiBzcHJzdXJmX29mZnNldCA9IHBsYW5lX3N0 YXRlLT5tYWluLm9mZnNldDsKKwl1MzIgc3Byc3VyZl9vZmZzZXQgPSBwbGFuZV9zdGF0ZS0+Y29s b3JfcGxhbmVbMF0ub2Zmc2V0OwogCXUzMiBsaW5lYXJfb2Zmc2V0OwogCWNvbnN0IHN0cnVjdCBk cm1faW50ZWxfc3ByaXRlX2NvbG9ya2V5ICprZXkgPSAmcGxhbmVfc3RhdGUtPmNrZXk7CiAJaW50 IGNydGNfeCA9IHBsYW5lX3N0YXRlLT5iYXNlLmRzdC54MTsKIAlpbnQgY3J0Y195ID0gcGxhbmVf c3RhdGUtPmJhc2UuZHN0LnkxOwogCXVpbnQzMl90IGNydGNfdyA9IGRybV9yZWN0X3dpZHRoKCZw bGFuZV9zdGF0ZS0+YmFzZS5kc3QpOwogCXVpbnQzMl90IGNydGNfaCA9IGRybV9yZWN0X2hlaWdo dCgmcGxhbmVfc3RhdGUtPmJhc2UuZHN0KTsKLQl1aW50MzJfdCB4ID0gcGxhbmVfc3RhdGUtPm1h aW4ueDsKLQl1aW50MzJfdCB5ID0gcGxhbmVfc3RhdGUtPm1haW4ueTsKKwl1aW50MzJfdCB4ID0g cGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzBdLng7CisJdWludDMyX3QgeSA9IHBsYW5lX3N0YXRl LT5jb2xvcl9wbGFuZVswXS55OwogCXVpbnQzMl90IHNyY193ID0gZHJtX3JlY3Rfd2lkdGgoJnBs YW5lX3N0YXRlLT5iYXNlLnNyYykgPj4gMTY7CiAJdWludDMyX3Qgc3JjX2ggPSBkcm1fcmVjdF9o ZWlnaHQoJnBsYW5lX3N0YXRlLT5iYXNlLnNyYykgPj4gMTY7CiAJdW5zaWduZWQgbG9uZyBpcnFm bGFnczsKQEAgLTg5MywxNSArODk0LDE1IEBAIGc0eF91cGRhdGVfcGxhbmUoc3RydWN0IGludGVs X3BsYW5lICpwbGFuZSwKIAljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5l X3N0YXRlLT5iYXNlLmZiOwogCWVudW0gcGlwZSBwaXBlID0gcGxhbmUtPnBpcGU7CiAJdTMyIGR2 c2NudHIgPSBwbGFuZV9zdGF0ZS0+Y3RsLCBkdnNzY2FsZSA9IDA7Ci0JdTMyIGR2c3N1cmZfb2Zm c2V0ID0gcGxhbmVfc3RhdGUtPm1haW4ub2Zmc2V0OworCXUzMiBkdnNzdXJmX29mZnNldCA9IHBs YW5lX3N0YXRlLT5jb2xvcl9wbGFuZVswXS5vZmZzZXQ7CiAJdTMyIGxpbmVhcl9vZmZzZXQ7CiAJ Y29uc3Qgc3RydWN0IGRybV9pbnRlbF9zcHJpdGVfY29sb3JrZXkgKmtleSA9ICZwbGFuZV9zdGF0 ZS0+Y2tleTsKIAlpbnQgY3J0Y194ID0gcGxhbmVfc3RhdGUtPmJhc2UuZHN0LngxOwogCWludCBj cnRjX3kgPSBwbGFuZV9zdGF0ZS0+YmFzZS5kc3QueTE7CiAJdWludDMyX3QgY3J0Y193ID0gZHJt X3JlY3Rfd2lkdGgoJnBsYW5lX3N0YXRlLT5iYXNlLmRzdCk7CiAJdWludDMyX3QgY3J0Y19oID0g ZHJtX3JlY3RfaGVpZ2h0KCZwbGFuZV9zdGF0ZS0+YmFzZS5kc3QpOwotCXVpbnQzMl90IHggPSBw bGFuZV9zdGF0ZS0+bWFpbi54OwotCXVpbnQzMl90IHkgPSBwbGFuZV9zdGF0ZS0+bWFpbi55Owor CXVpbnQzMl90IHggPSBwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMF0ueDsKKwl1aW50MzJfdCB5 ID0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzBdLnk7CiAJdWludDMyX3Qgc3JjX3cgPSBkcm1f cmVjdF93aWR0aCgmcGxhbmVfc3RhdGUtPmJhc2Uuc3JjKSA+PiAxNjsKIAl1aW50MzJfdCBzcmNf aCA9IGRybV9yZWN0X2hlaWdodCgmcGxhbmVfc3RhdGUtPmJhc2Uuc3JjKSA+PiAxNjsKIAl1bnNp Z25lZCBsb25nIGlycWZsYWdzOwotLSAKMi4xNi40CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK