From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liu Ying Subject: [PATCH v3 09/10] drm/imx: atomic phase 3 step 2: Legacy callback fixups Date: Mon, 4 Jul 2016 15:40:38 +0800 Message-ID: <1467618039-7457-10-git-send-email-gnuiyl@gmail.com> References: <1467618039-7457-1-git-send-email-gnuiyl@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0082.outbound.protection.outlook.com [104.47.36.82]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED9EE6E3C9 for ; Mon, 4 Jul 2016 08:14:40 +0000 (UTC) In-Reply-To: <1467618039-7457-1-git-send-email-gnuiyl@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Russell King , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org Tm93IHRoYXQgd2UgY2FuIHVzZSBhdG9taWMgY29uZmlndXJhdGlvbnMsIGFsbCB0aGUgbGVnYWN5 IGNhbGxiYWNrcwpvZiBDUlRDcywgZW5jb2RlcnMgYW5kIGNvbm5lY3RvcnMgY2FuIGJlIHN3aXRj aGVkIHRvIHRoZSBhdG9taWMgdmVyc2lvbi4KRm9yIHRoZSBpbXgtbGRiIGRyaXZlciwgdGhlcmUg aXMgYSBjbG9jayBwYXJlbnQgc2V0dGluZyBtaXNtYXRjaCBiZXd0ZWVuCi0+ZW5hYmxlIGFuZCAt PmRpc2FibGUgYWZ0ZXIgdGhlIHN3aXRjaCwgc28gYSBmaXh1cCBpcyBhZGRlZC4gIEZvciB0aGUK aW14LXR2ZSBkcml2ZXIsIHNpbmNlIHRoZSBlbmNvZGVyJ3MgY2FsbGJhY2sgLT5kcG1zIGlzIHJl cGxhY2VkIGJ5Ci0+ZGlzYWJsZSwgd2UgbmVlZCB0byBtb3ZlIHRoZSBzZXR0aW5nIGZvciB0aGUg SVBVX0NMS19FTiBiaXQoaW4gcmVnaXN0ZXIKVFZFX0NPTV9DT05GX1JFRykgZnJvbSAtPmVuYWJs ZS8tPmRpc2FibGUgdG8gLT5tb2RlX3NldCwgb3RoZXJ3aXNlLCB0aGUKcmVsZXZhbnQgQ1JUQyBj YW5ub3QgYmUgZGlzYWJsZWQgY29ycmVjdGx5IHdpdGggYSB3YXJuaW5nIG9uIERDIHN0b3AgdGlt ZW91dC4KClNpZ25lZC1vZmYtYnk6IExpdSBZaW5nIDxnbnVpeWxAZ21haWwuY29tPgotLS0KdjIt PnYzOgoqIFRyaXZpYWwgY2hhbmdlIGR1ZSB0byByZWJhc2luZy4KCnYxLT52MjoKKiBBIGZpeHVw IG9uIHRoZSBUVkUgcmVnaXN0ZXIgYml0IElQVV9DTEtfRU4gdG8gYXZvaWQgYSB3YXJuaW5nIG9u IERDCiAgc3RvcCB0aW1lb3V0IHdoZW4gZG9pbmcgbW9kZSBzZXR0aW5nLgoKIGRyaXZlcnMvZ3B1 L2RybS9pbXgvZHdfaGRtaS1pbXguYyAgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2lt eC9pbXgtbGRiLmMgICAgICAgICAgfCAxNiArKysrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aW14L2lteC10dmUuYyAgICAgICAgICB8IDI3ICsrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2lteC9pcHV2My1jcnRjLmMgICAgICAgfCA0NCArKysrKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaW14L3BhcmFsbGVsLWRpc3BsYXkuYyB8 IDE4ICsrKy0tLS0tLS0tLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDgy IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pbXgvZHdfaGRtaS1p bXguYyBiL2RyaXZlcnMvZ3B1L2RybS9pbXgvZHdfaGRtaS1pbXguYwppbmRleCA1ZjY0Njc0Li41 ZjFkNDM3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaW14L2R3X2hkbWktaW14LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2lteC9kd19oZG1pLWlteC5jCkBAIC0xMTcsNyArMTE3LDcgQEAg c3RhdGljIHZvaWQgZHdfaGRtaV9pbXhfZW5jb2Rlcl9tb2RlX3NldChzdHJ1Y3QgZHJtX2VuY29k ZXIgKmVuY29kZXIsCiB7CiB9CiAKLXN0YXRpYyB2b2lkIGR3X2hkbWlfaW14X2VuY29kZXJfY29t bWl0KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKK3N0YXRpYyB2b2lkIGR3X2hkbWlfaW14 X2VuY29kZXJfZW5hYmxlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIHsKIAlzdHJ1Y3Qg aW14X2RybV9lbmNvZGVyICppbXhfZW5jb2RlciA9IGVuY190b19pbXhfZW5jKGVuY29kZXIpOwog CXN0cnVjdCBpbXhfaGRtaSAqaGRtaSA9IGlteF9lbmNfdG9faW14X2hkbWkoaW14X2VuY29kZXIp OwpAQCAtMTMwLDcgKzEzMCw3IEBAIHN0YXRpYyB2b2lkIGR3X2hkbWlfaW14X2VuY29kZXJfY29t bWl0KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBk cm1fZW5jb2Rlcl9oZWxwZXJfZnVuY3MgZHdfaGRtaV9pbXhfZW5jb2Rlcl9oZWxwZXJfZnVuY3Mg PSB7CiAJLm1vZGVfc2V0ICAgPSBkd19oZG1pX2lteF9lbmNvZGVyX21vZGVfc2V0LAotCS5jb21t aXQgICAgID0gZHdfaGRtaV9pbXhfZW5jb2Rlcl9jb21taXQsCisJLmVuYWJsZSAgICAgPSBkd19o ZG1pX2lteF9lbmNvZGVyX2VuYWJsZSwKIAkuZGlzYWJsZSAgICA9IGR3X2hkbWlfaW14X2VuY29k ZXJfZGlzYWJsZSwKIH07CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pbXgvaW14LWxk Yi5jIGIvZHJpdmVycy9ncHUvZHJtL2lteC9pbXgtbGRiLmMKaW5kZXggNGE5OGVhYS4uOWE0MTkw YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2lteC9pbXgtbGRiLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2lteC9pbXgtbGRiLmMKQEAgLTE0MiwxMCArMTQyLDYgQEAgc3RhdGljIHN0cnVj dCBkcm1fZW5jb2RlciAqaW14X2xkYl9jb25uZWN0b3JfYmVzdF9lbmNvZGVyKAogCXJldHVybiAm aW14X2xkYl9jaC0+aW14X2VuY29kZXIuZW5jb2RlcjsKIH0KIAotc3RhdGljIHZvaWQgaW14X2xk Yl9lbmNvZGVyX2RwbXMoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLCBpbnQgbW9kZSkKLXsK LX0KLQogc3RhdGljIHZvaWQgaW14X2xkYl9zZXRfY2xvY2soc3RydWN0IGlteF9sZGIgKmxkYiwg aW50IG11eCwgaW50IGNobm8sCiAJCXVuc2lnbmVkIGxvbmcgc2VyaWFsX2NsaywgdW5zaWduZWQg bG9uZyBkaV9jbGspCiB7CkBAIC0xNzQsNyArMTcwLDcgQEAgc3RhdGljIHZvaWQgaW14X2xkYl9z ZXRfY2xvY2soc3RydWN0IGlteF9sZGIgKmxkYiwgaW50IG11eCwgaW50IGNobm8sCiAJCQljaG5v KTsKIH0KIAotc3RhdGljIHZvaWQgaW14X2xkYl9lbmNvZGVyX2NvbW1pdChzdHJ1Y3QgZHJtX2Vu Y29kZXIgKmVuY29kZXIpCitzdGF0aWMgdm9pZCBpbXhfbGRiX2VuY29kZXJfZW5hYmxlKHN0cnVj dCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIHsKIAlzdHJ1Y3QgaW14X2RybV9lbmNvZGVyICppbXhf ZW5jb2RlciA9IGVuY190b19pbXhfZW5jKGVuY29kZXIpOwogCXN0cnVjdCBpbXhfbGRiX2NoYW5u ZWwgKmlteF9sZGJfY2ggPSBpbXhfZW5jX3RvX2lteF9sZGJfY2goaW14X2VuY29kZXIpOwpAQCAt MTg1LDggKzE4MSwxMyBAQCBzdGF0aWMgdm9pZCBpbXhfbGRiX2VuY29kZXJfY29tbWl0KHN0cnVj dCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIAlkcm1fcGFuZWxfcHJlcGFyZShpbXhfbGRiX2NoLT5w YW5lbCk7CiAKIAlpZiAoZHVhbCkgeworCQljbGtfc2V0X3BhcmVudChsZGItPmNsa19zZWxbbXV4 XSwgbGRiLT5jbGtbMF0pOworCQljbGtfc2V0X3BhcmVudChsZGItPmNsa19zZWxbbXV4XSwgbGRi LT5jbGtbMV0pOworCiAJCWNsa19wcmVwYXJlX2VuYWJsZShsZGItPmNsa1swXSk7CiAJCWNsa19w cmVwYXJlX2VuYWJsZShsZGItPmNsa1sxXSk7CisJfSBlbHNlIHsKKwkJY2xrX3NldF9wYXJlbnQo bGRiLT5jbGtfc2VsW211eF0sIGxkYi0+Y2xrW2lteF9sZGJfY2gtPmNobm9dKTsKIAl9CiAKIAlp ZiAoaW14X2xkYl9jaCA9PSAmbGRiLT5jaGFubmVsWzBdIHx8IGR1YWwpIHsKQEAgLTMyNiw3ICsz MjcsNyBAQCBzdGF0aWMgdm9pZCBpbXhfbGRiX2VuY29kZXJfZGlzYWJsZShzdHJ1Y3QgZHJtX2Vu Y29kZXIgKmVuY29kZXIpCiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9m dW5jcyBpbXhfbGRiX2Nvbm5lY3Rvcl9mdW5jcyA9IHsKLQkuZHBtcyA9IGRybV9oZWxwZXJfY29u bmVjdG9yX2RwbXMsCisJLmRwbXMgPSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZHBtcywK IAkuZmlsbF9tb2RlcyA9IGRybV9oZWxwZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2RlcywK IAkuZGV0ZWN0ID0gaW14X2xkYl9jb25uZWN0b3JfZGV0ZWN0LAogCS5kZXN0cm95ID0gaW14X2Ry bV9jb25uZWN0b3JfZGVzdHJveSwKQEAgLTM0NSw5ICszNDYsOCBAQCBzdGF0aWMgY29uc3Qgc3Ry dWN0IGRybV9lbmNvZGVyX2Z1bmNzIGlteF9sZGJfZW5jb2Rlcl9mdW5jcyA9IHsKIH07CiAKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1bmNzIGlteF9sZGJfZW5jb2Rl cl9oZWxwZXJfZnVuY3MgPSB7Ci0JLmRwbXMgPSBpbXhfbGRiX2VuY29kZXJfZHBtcywKLQkuY29t bWl0ID0gaW14X2xkYl9lbmNvZGVyX2NvbW1pdCwKIAkubW9kZV9zZXQgPSBpbXhfbGRiX2VuY29k ZXJfbW9kZV9zZXQsCisJLmVuYWJsZSA9IGlteF9sZGJfZW5jb2Rlcl9lbmFibGUsCiAJLmRpc2Fi bGUgPSBpbXhfbGRiX2VuY29kZXJfZGlzYWJsZSwKIH07CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pbXgvaW14LXR2ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2lteC9pbXgtdHZlLmMKaW5k ZXggODJhMWVkZC4uY2Q5MmFhYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2lteC9pbXgt dHZlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2lteC9pbXgtdHZlLmMKQEAgLTE0Nyw4ICsxNDcs NyBAQCBzdGF0aWMgdm9pZCB0dmVfZW5hYmxlKHN0cnVjdCBpbXhfdHZlICp0dmUpCiAJCXR2ZS0+ ZW5hYmxlZCA9IHRydWU7CiAJCWNsa19wcmVwYXJlX2VuYWJsZSh0dmUtPmNsayk7CiAJCXJldCA9 IHJlZ21hcF91cGRhdGVfYml0cyh0dmUtPnJlZ21hcCwgVFZFX0NPTV9DT05GX1JFRywKLQkJCQkJ IFRWRV9JUFVfQ0xLX0VOIHwgVFZFX0VOLAotCQkJCQkgVFZFX0lQVV9DTEtfRU4gfCBUVkVfRU4p OworCQkJCQkgVFZFX0VOLCBUVkVfRU4pOwogCX0KIAogCS8qIGNsZWFyIGludGVycnVwdCBzdGF0 dXMgcmVnaXN0ZXIgKi8KQEAgLTE3MSw3ICsxNzAsNyBAQCBzdGF0aWMgdm9pZCB0dmVfZGlzYWJs ZShzdHJ1Y3QgaW14X3R2ZSAqdHZlKQogCWlmICh0dmUtPmVuYWJsZWQpIHsKIAkJdHZlLT5lbmFi bGVkID0gZmFsc2U7CiAJCXJldCA9IHJlZ21hcF91cGRhdGVfYml0cyh0dmUtPnJlZ21hcCwgVFZF X0NPTV9DT05GX1JFRywKLQkJCQkJIFRWRV9JUFVfQ0xLX0VOIHwgVFZFX0VOLCAwKTsKKwkJCQkJ IFRWRV9FTiwgMCk7CiAJCWNsa19kaXNhYmxlX3VucHJlcGFyZSh0dmUtPmNsayk7CiAJfQogfQpA QCAtMjc0LDE4ICsyNzMsNiBAQCBzdGF0aWMgc3RydWN0IGRybV9lbmNvZGVyICppbXhfdHZlX2Nv bm5lY3Rvcl9iZXN0X2VuY29kZXIoCiAJcmV0dXJuICZ0dmUtPmlteF9lbmNvZGVyLmVuY29kZXI7 CiB9CiAKLXN0YXRpYyB2b2lkIGlteF90dmVfZW5jb2Rlcl9kcG1zKHN0cnVjdCBkcm1fZW5jb2Rl ciAqZW5jb2RlciwgaW50IG1vZGUpCi17Ci0Jc3RydWN0IGlteF9kcm1fZW5jb2RlciAqaW14X2Vu Y29kZXIgPSBlbmNfdG9faW14X2VuYyhlbmNvZGVyKTsKLQlzdHJ1Y3QgaW14X3R2ZSAqdHZlID0g aW14X2VuY190b190dmUoaW14X2VuY29kZXIpOwotCWludCByZXQ7Ci0KLQlyZXQgPSByZWdtYXBf dXBkYXRlX2JpdHModHZlLT5yZWdtYXAsIFRWRV9DT01fQ09ORl9SRUcsCi0JCQkJIFRWRV9UVl9P VVRfTU9ERV9NQVNLLCBUVkVfVFZfT1VUX0RJU0FCTEUpOwotCWlmIChyZXQgPCAwKQotCQlkZXZf ZXJyKHR2ZS0+ZGV2LCAiZmFpbGVkIHRvIGRpc2FibGUgVFZPVVQ6ICVkXG4iLCByZXQpOwotfQot CiBzdGF0aWMgdm9pZCBpbXhfdHZlX2VuY29kZXJfbW9kZV9zZXQoc3RydWN0IGRybV9lbmNvZGVy ICplbmNvZGVyLAogCQkJCSAgICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm9yaWdfbW9kZSwK IAkJCQkgICAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKQpAQCAtMzE1LDYgKzMwMiw5 IEBAIHN0YXRpYyB2b2lkIGlteF90dmVfZW5jb2Rlcl9tb2RlX3NldChzdHJ1Y3QgZHJtX2VuY29k ZXIgKmVuY29kZXIsCiAJCQlyZXQpOwogCX0KIAorCXJlZ21hcF91cGRhdGVfYml0cyh0dmUtPnJl Z21hcCwgVFZFX0NPTV9DT05GX1JFRywKKwkJCSAgIFRWRV9JUFVfQ0xLX0VOLCBUVkVfSVBVX0NM S19FTik7CisKIAlpZiAodHZlLT5tb2RlID09IFRWRV9NT0RFX1ZHQSkKIAkJcmV0ID0gdHZlX3Nl dHVwX3ZnYSh0dmUpOwogCWVsc2UKQEAgLTMyMyw3ICszMTMsNyBAQCBzdGF0aWMgdm9pZCBpbXhf dHZlX2VuY29kZXJfbW9kZV9zZXQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAogCQlkZXZf ZXJyKHR2ZS0+ZGV2LCAiZmFpbGVkIHRvIHNldCBjb25maWd1cmF0aW9uOiAlZFxuIiwgcmV0KTsK IH0KIAotc3RhdGljIHZvaWQgaW14X3R2ZV9lbmNvZGVyX2NvbW1pdChzdHJ1Y3QgZHJtX2VuY29k ZXIgKmVuY29kZXIpCitzdGF0aWMgdm9pZCBpbXhfdHZlX2VuY29kZXJfZW5hYmxlKHN0cnVjdCBk cm1fZW5jb2RlciAqZW5jb2RlcikKIHsKIAlzdHJ1Y3QgaW14X2RybV9lbmNvZGVyICppbXhfZW5j b2RlciA9IGVuY190b19pbXhfZW5jKGVuY29kZXIpOwogCXN0cnVjdCBpbXhfdHZlICp0dmUgPSBp bXhfZW5jX3RvX3R2ZShpbXhfZW5jb2Rlcik7CkBAIC0zNDAsNyArMzMwLDcgQEAgc3RhdGljIHZv aWQgaW14X3R2ZV9lbmNvZGVyX2Rpc2FibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQog fQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3JfZnVuY3MgaW14X3R2ZV9jb25u ZWN0b3JfZnVuY3MgPSB7Ci0JLmRwbXMgPSBkcm1faGVscGVyX2Nvbm5lY3Rvcl9kcG1zLAorCS5k cG1zID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2RwbXMsCiAJLmZpbGxfbW9kZXMgPSBk cm1faGVscGVyX3Byb2JlX3NpbmdsZV9jb25uZWN0b3JfbW9kZXMsCiAJLmRldGVjdCA9IGlteF90 dmVfY29ubmVjdG9yX2RldGVjdCwKIAkuZGVzdHJveSA9IGlteF9kcm1fY29ubmVjdG9yX2Rlc3Ry b3ksCkBAIC0zNjAsOSArMzUwLDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fZW5jb2Rlcl9m dW5jcyBpbXhfdHZlX2VuY29kZXJfZnVuY3MgPSB7CiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0 IGRybV9lbmNvZGVyX2hlbHBlcl9mdW5jcyBpbXhfdHZlX2VuY29kZXJfaGVscGVyX2Z1bmNzID0g ewotCS5kcG1zID0gaW14X3R2ZV9lbmNvZGVyX2RwbXMsCiAJLm1vZGVfc2V0ID0gaW14X3R2ZV9l bmNvZGVyX21vZGVfc2V0LAotCS5jb21taXQgPSBpbXhfdHZlX2VuY29kZXJfY29tbWl0LAorCS5l bmFibGUgPSBpbXhfdHZlX2VuY29kZXJfZW5hYmxlLAogCS5kaXNhYmxlID0gaW14X3R2ZV9lbmNv ZGVyX2Rpc2FibGUsCiB9OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaW14L2lwdXYz LWNydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pbXgvaXB1djMtY3J0Yy5jCmluZGV4IDNlODI1MzQu LjI3NGIwZTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pbXgvaXB1djMtY3J0Yy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pbXgvaXB1djMtY3J0Yy5jCkBAIC00OCw4ICs0OCw5IEBAIHN0 cnVjdCBpcHVfY3J0YyB7CiAKICNkZWZpbmUgdG9faXB1X2NydGMoeCkgY29udGFpbmVyX29mKHgs IHN0cnVjdCBpcHVfY3J0YywgYmFzZSkKIAotc3RhdGljIHZvaWQgaXB1X2NydGNfZW5hYmxlKHN0 cnVjdCBpcHVfY3J0YyAqaXB1X2NydGMpCitzdGF0aWMgdm9pZCBpcHVfY3J0Y19lbmFibGUoc3Ry dWN0IGRybV9jcnRjICpjcnRjKQogeworCXN0cnVjdCBpcHVfY3J0YyAqaXB1X2NydGMgPSB0b19p cHVfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaXB1X3NvYyAqaXB1ID0gZGV2X2dldF9kcnZkYXRhKGlw dV9jcnRjLT5kZXYtPnBhcmVudCk7CiAKIAlpcHVfZGNfZW5hYmxlKGlwdSk7CkBAIC01NywxMCAr NTgsMTAgQEAgc3RhdGljIHZvaWQgaXB1X2NydGNfZW5hYmxlKHN0cnVjdCBpcHVfY3J0YyAqaXB1 X2NydGMpCiAJaXB1X2RpX2VuYWJsZShpcHVfY3J0Yy0+ZGkpOwogfQogCi1zdGF0aWMgdm9pZCBp cHVfY3J0Y19kaXNhYmxlKHN0cnVjdCBpcHVfY3J0YyAqaXB1X2NydGMpCitzdGF0aWMgdm9pZCBp cHVfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKKwlzdHJ1Y3QgaXB1X2Ny dGMgKmlwdV9jcnRjID0gdG9faXB1X2NydGMoY3J0Yyk7CiAJc3RydWN0IGlwdV9zb2MgKmlwdSA9 IGRldl9nZXRfZHJ2ZGF0YShpcHVfY3J0Yy0+ZGV2LT5wYXJlbnQpOwotCXN0cnVjdCBkcm1fY3J0 YyAqY3J0YyA9ICZpcHVfY3J0Yy0+YmFzZTsKIAogCWlwdV9kY19kaXNhYmxlX2NoYW5uZWwoaXB1 X2NydGMtPmRjKTsKIAlpcHVfZGlfZGlzYWJsZShpcHVfY3J0Yy0+ZGkpOwpAQCAtNzQsMjQgKzc1 LDYgQEAgc3RhdGljIHZvaWQgaXB1X2NydGNfZGlzYWJsZShzdHJ1Y3QgaXB1X2NydGMgKmlwdV9j cnRjKQogCXNwaW5fdW5sb2NrX2lycSgmY3J0Yy0+ZGV2LT5ldmVudF9sb2NrKTsKIH0KIAotc3Rh dGljIHZvaWQgaXB1X2NydGNfZHBtcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGludCBtb2RlKQot ewotCXN0cnVjdCBpcHVfY3J0YyAqaXB1X2NydGMgPSB0b19pcHVfY3J0YyhjcnRjKTsKLQotCWRl dl9kYmcoaXB1X2NydGMtPmRldiwgIiVzIG1vZGU6ICVkXG4iLCBfX2Z1bmNfXywgbW9kZSk7Ci0K LQlzd2l0Y2ggKG1vZGUpIHsKLQljYXNlIERSTV9NT0RFX0RQTVNfT046Ci0JCWlwdV9jcnRjX2Vu YWJsZShpcHVfY3J0Yyk7Ci0JCWJyZWFrOwotCWNhc2UgRFJNX01PREVfRFBNU19TVEFOREJZOgot CWNhc2UgRFJNX01PREVfRFBNU19TVVNQRU5EOgotCWNhc2UgRFJNX01PREVfRFBNU19PRkY6Ci0J CWlwdV9jcnRjX2Rpc2FibGUoaXB1X2NydGMpOwotCQlicmVhazsKLQl9Ci19Ci0KIHN0YXRpYyBj b25zdCBzdHJ1Y3QgZHJtX2NydGNfZnVuY3MgaXB1X2NydGNfZnVuY3MgPSB7CiAJLnNldF9jb25m aWcgPSBkcm1fYXRvbWljX2hlbHBlcl9zZXRfY29uZmlnLAogCS5kZXN0cm95ID0gZHJtX2NydGNf Y2xlYW51cCwKQEAgLTEzMiwyMCArMTE1LDYgQEAgc3RhdGljIGJvb2wgaXB1X2NydGNfbW9kZV9m aXh1cChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyB2 b2lkIGlwdV9jcnRjX3ByZXBhcmUoc3RydWN0IGRybV9jcnRjICpjcnRjKQotewotCXN0cnVjdCBp cHVfY3J0YyAqaXB1X2NydGMgPSB0b19pcHVfY3J0YyhjcnRjKTsKLQotCWlwdV9jcnRjX2Rpc2Fi bGUoaXB1X2NydGMpOwotfQotCi1zdGF0aWMgdm9pZCBpcHVfY3J0Y19jb21taXQoc3RydWN0IGRy bV9jcnRjICpjcnRjKQotewotCXN0cnVjdCBpcHVfY3J0YyAqaXB1X2NydGMgPSB0b19pcHVfY3J0 YyhjcnRjKTsKLQotCWlwdV9jcnRjX2VuYWJsZShpcHVfY3J0Yyk7Ci19Ci0KIHN0YXRpYyBpbnQg aXB1X2NydGNfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgc3RydWN0 IGRybV9jcnRjX3N0YXRlICpzdGF0ZSkKIHsKQEAgLTIyNSwxMyArMTk0LDEyIEBAIHN0YXRpYyB2 b2lkIGlwdV9jcnRjX21vZGVfc2V0X25vZmIoc3RydWN0IGRybV9jcnRjICpjcnRjKQogfQogCiBz dGF0aWMgY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyBpcHVfaGVscGVyX2Z1bmNz ID0gewotCS5kcG1zID0gaXB1X2NydGNfZHBtcywKIAkubW9kZV9maXh1cCA9IGlwdV9jcnRjX21v ZGVfZml4dXAsCiAJLm1vZGVfc2V0X25vZmIgPSBpcHVfY3J0Y19tb2RlX3NldF9ub2ZiLAotCS5w cmVwYXJlID0gaXB1X2NydGNfcHJlcGFyZSwKLQkuY29tbWl0ID0gaXB1X2NydGNfY29tbWl0LAog CS5hdG9taWNfY2hlY2sgPSBpcHVfY3J0Y19hdG9taWNfY2hlY2ssCiAJLmF0b21pY19iZWdpbiA9 IGlwdV9jcnRjX2F0b21pY19iZWdpbiwKKwkuZGlzYWJsZSA9IGlwdV9jcnRjX2Rpc2FibGUsCisJ LmVuYWJsZSA9IGlwdV9jcnRjX2VuYWJsZSwKIH07CiAKIHN0YXRpYyBpbnQgaXB1X2VuYWJsZV92 Ymxhbmsoc3RydWN0IGRybV9jcnRjICpjcnRjKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2lteC9wYXJhbGxlbC1kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaW14L3BhcmFsbGVsLWRp c3BsYXkuYwppbmRleCA3Mzc0ZDgyLi5iYjVkYmQ2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaW14L3BhcmFsbGVsLWRpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaW14L3BhcmFs bGVsLWRpc3BsYXkuYwpAQCAtOTIsMTggKzkyLDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fZW5jb2Rl ciAqaW14X3BkX2Nvbm5lY3Rvcl9iZXN0X2VuY29kZXIoCiAJcmV0dXJuICZpbXhwZC0+aW14X2Vu Y29kZXIuZW5jb2RlcjsKIH0KIAotc3RhdGljIHZvaWQgaW14X3BkX2VuY29kZXJfZHBtcyhzdHJ1 Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsIGludCBtb2RlKQotewotCXN0cnVjdCBpbXhfZHJtX2Vu Y29kZXIgKmlteF9lbmNvZGVyID0gZW5jX3RvX2lteF9lbmMoZW5jb2Rlcik7Ci0Jc3RydWN0IGlt eF9wYXJhbGxlbF9kaXNwbGF5ICppbXhwZCA9IGlteF9lbmNfdG9faW14cGQoaW14X2VuY29kZXIp OwotCi0JaWYgKG1vZGUgIT0gRFJNX01PREVfRFBNU19PTikKLQkJZHJtX3BhbmVsX2Rpc2FibGUo aW14cGQtPnBhbmVsKTsKLQllbHNlCi0JCWRybV9wYW5lbF9lbmFibGUoaW14cGQtPnBhbmVsKTsK LX0KLQotc3RhdGljIHZvaWQgaW14X3BkX2VuY29kZXJfY29tbWl0KHN0cnVjdCBkcm1fZW5jb2Rl ciAqZW5jb2RlcikKK3N0YXRpYyB2b2lkIGlteF9wZF9lbmNvZGVyX2VuYWJsZShzdHJ1Y3QgZHJt X2VuY29kZXIgKmVuY29kZXIpCiB7CiAJc3RydWN0IGlteF9kcm1fZW5jb2RlciAqaW14X2VuY29k ZXIgPSBlbmNfdG9faW14X2VuYyhlbmNvZGVyKTsKIAlzdHJ1Y3QgaW14X3BhcmFsbGVsX2Rpc3Bs YXkgKmlteHBkID0gaW14X2VuY190b19pbXhwZChpbXhfZW5jb2Rlcik7CkBAIC0xMjgsNyArMTE3 LDcgQEAgc3RhdGljIHZvaWQgaW14X3BkX2VuY29kZXJfZGlzYWJsZShzdHJ1Y3QgZHJtX2VuY29k ZXIgKmVuY29kZXIpCiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9mdW5j cyBpbXhfcGRfY29ubmVjdG9yX2Z1bmNzID0gewotCS5kcG1zID0gZHJtX2hlbHBlcl9jb25uZWN0 b3JfZHBtcywKKwkuZHBtcyA9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9kcG1zLAogCS5m aWxsX21vZGVzID0gZHJtX2hlbHBlcl9wcm9iZV9zaW5nbGVfY29ubmVjdG9yX21vZGVzLAogCS5k ZXRlY3QgPSBpbXhfcGRfY29ubmVjdG9yX2RldGVjdCwKIAkuZGVzdHJveSA9IGlteF9kcm1fY29u bmVjdG9yX2Rlc3Ryb3ksCkBAIC0xNDcsOSArMTM2LDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBk cm1fZW5jb2Rlcl9mdW5jcyBpbXhfcGRfZW5jb2Rlcl9mdW5jcyA9IHsKIH07CiAKIHN0YXRpYyBj b25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1bmNzIGlteF9wZF9lbmNvZGVyX2hlbHBl cl9mdW5jcyA9IHsKLQkuZHBtcyA9IGlteF9wZF9lbmNvZGVyX2RwbXMsCi0JLmNvbW1pdCA9IGlt eF9wZF9lbmNvZGVyX2NvbW1pdCwKIAkubW9kZV9zZXQgPSBpbXhfcGRfZW5jb2Rlcl9tb2RlX3Nl dCwKKwkuZW5hYmxlID0gaW14X3BkX2VuY29kZXJfZW5hYmxlLAogCS5kaXNhYmxlID0gaW14X3Bk X2VuY29kZXJfZGlzYWJsZSwKIH07CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK