From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liu Ying Subject: [PATCH v2 08/10] drm/imx: atomic phase 3 step 3: Legacy callback fixups Date: Tue, 31 May 2016 17:24:29 +0800 Message-ID: <1464686671-20299-9-git-send-email-gnuiyl@gmail.com> References: <1464686671-20299-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 na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0088.outbound.protection.outlook.com [157.56.111.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 34CDB6E369 for ; Tue, 31 May 2016 09:25:06 +0000 (UTC) In-Reply-To: <1464686671-20299-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 ZW91dC4KClNpZ25lZC1vZmYtYnk6IExpdSBZaW5nIDxnbnVpeWxAZ21haWwuY29tPgotLS0KdjEt PnYyOgoqIEEgZml4dXAgb24gdGhlIFRWRSByZWdpc3RlciBiaXQgSVBVX0NMS19FTiB0byBhdm9p ZCBhIHdhcm5pbmcgb24gREMKICBzdG9wIHRpbWVvdXQgd2hlbiBkb2luZyBtb2RlIHNldHRpbmcu CgogZHJpdmVycy9ncHUvZHJtL2lteC9kd19oZG1pLWlteC5jICAgICAgfCAgNCArKy0tCiBkcml2 ZXJzL2dwdS9kcm0vaW14L2lteC1sZGIuYyAgICAgICAgICB8IDE2ICsrKysrKy0tLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pbXgvaW14LXR2ZS5jICAgICAgICAgIHwgMjcgKysrKysrKy0tLS0tLS0t LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaW14L2lwdXYzLWNydGMuYyAgICAgICB8IDQzICsrKysr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pbXgvcGFyYWxs ZWwtZGlzcGxheS5jIHwgMTggKysrLS0tLS0tLS0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgMjcgaW5z ZXJ0aW9ucygrKSwgODEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2lteC9kd19oZG1pLWlteC5jIGIvZHJpdmVycy9ncHUvZHJtL2lteC9kd19oZG1pLWlteC5jCmlu ZGV4IDVmNjQ2NzQuLjVmMWQ0MzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pbXgvZHdf aGRtaS1pbXguYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaW14L2R3X2hkbWktaW14LmMKQEAgLTEx Nyw3ICsxMTcsNyBAQCBzdGF0aWMgdm9pZCBkd19oZG1pX2lteF9lbmNvZGVyX21vZGVfc2V0KHN0 cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKIHsKIH0KIAotc3RhdGljIHZvaWQgZHdfaGRtaV9p bXhfZW5jb2Rlcl9jb21taXQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQorc3RhdGljIHZv aWQgZHdfaGRtaV9pbXhfZW5jb2Rlcl9lbmFibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVy KQogewogCXN0cnVjdCBpbXhfZHJtX2VuY29kZXIgKmlteF9lbmNvZGVyID0gZW5jX3RvX2lteF9l bmMoZW5jb2Rlcik7CiAJc3RydWN0IGlteF9oZG1pICpoZG1pID0gaW14X2VuY190b19pbXhfaGRt aShpbXhfZW5jb2Rlcik7CkBAIC0xMzAsNyArMTMwLDcgQEAgc3RhdGljIHZvaWQgZHdfaGRtaV9p bXhfZW5jb2Rlcl9jb21taXQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogCiBzdGF0aWMg Y29uc3Qgc3RydWN0IGRybV9lbmNvZGVyX2hlbHBlcl9mdW5jcyBkd19oZG1pX2lteF9lbmNvZGVy X2hlbHBlcl9mdW5jcyA9IHsKIAkubW9kZV9zZXQgICA9IGR3X2hkbWlfaW14X2VuY29kZXJfbW9k ZV9zZXQsCi0JLmNvbW1pdCAgICAgPSBkd19oZG1pX2lteF9lbmNvZGVyX2NvbW1pdCwKKwkuZW5h YmxlICAgICA9IGR3X2hkbWlfaW14X2VuY29kZXJfZW5hYmxlLAogCS5kaXNhYmxlICAgID0gZHdf aGRtaV9pbXhfZW5jb2Rlcl9kaXNhYmxlLAogfTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2lteC9pbXgtbGRiLmMgYi9kcml2ZXJzL2dwdS9kcm0vaW14L2lteC1sZGIuYwppbmRleCA0 YTk4ZWFhLi45YTQxOTBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaW14L2lteC1sZGIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaW14L2lteC1sZGIuYwpAQCAtMTQyLDEwICsxNDIsNiBA QCBzdGF0aWMgc3RydWN0IGRybV9lbmNvZGVyICppbXhfbGRiX2Nvbm5lY3Rvcl9iZXN0X2VuY29k ZXIoCiAJcmV0dXJuICZpbXhfbGRiX2NoLT5pbXhfZW5jb2Rlci5lbmNvZGVyOwogfQogCi1zdGF0 aWMgdm9pZCBpbXhfbGRiX2VuY29kZXJfZHBtcyhzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIs IGludCBtb2RlKQotewotfQotCiBzdGF0aWMgdm9pZCBpbXhfbGRiX3NldF9jbG9jayhzdHJ1Y3Qg aW14X2xkYiAqbGRiLCBpbnQgbXV4LCBpbnQgY2hubywKIAkJdW5zaWduZWQgbG9uZyBzZXJpYWxf Y2xrLCB1bnNpZ25lZCBsb25nIGRpX2NsaykKIHsKQEAgLTE3NCw3ICsxNzAsNyBAQCBzdGF0aWMg dm9pZCBpbXhfbGRiX3NldF9jbG9jayhzdHJ1Y3QgaW14X2xkYiAqbGRiLCBpbnQgbXV4LCBpbnQg Y2hubywKIAkJCWNobm8pOwogfQogCi1zdGF0aWMgdm9pZCBpbXhfbGRiX2VuY29kZXJfY29tbWl0 KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKK3N0YXRpYyB2b2lkIGlteF9sZGJfZW5jb2Rl cl9lbmFibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogewogCXN0cnVjdCBpbXhfZHJt X2VuY29kZXIgKmlteF9lbmNvZGVyID0gZW5jX3RvX2lteF9lbmMoZW5jb2Rlcik7CiAJc3RydWN0 IGlteF9sZGJfY2hhbm5lbCAqaW14X2xkYl9jaCA9IGlteF9lbmNfdG9faW14X2xkYl9jaChpbXhf ZW5jb2Rlcik7CkBAIC0xODUsOCArMTgxLDEzIEBAIHN0YXRpYyB2b2lkIGlteF9sZGJfZW5jb2Rl cl9jb21taXQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogCWRybV9wYW5lbF9wcmVwYXJl KGlteF9sZGJfY2gtPnBhbmVsKTsKIAogCWlmIChkdWFsKSB7CisJCWNsa19zZXRfcGFyZW50KGxk Yi0+Y2xrX3NlbFttdXhdLCBsZGItPmNsa1swXSk7CisJCWNsa19zZXRfcGFyZW50KGxkYi0+Y2xr X3NlbFttdXhdLCBsZGItPmNsa1sxXSk7CisKIAkJY2xrX3ByZXBhcmVfZW5hYmxlKGxkYi0+Y2xr WzBdKTsKIAkJY2xrX3ByZXBhcmVfZW5hYmxlKGxkYi0+Y2xrWzFdKTsKKwl9IGVsc2UgeworCQlj bGtfc2V0X3BhcmVudChsZGItPmNsa19zZWxbbXV4XSwgbGRiLT5jbGtbaW14X2xkYl9jaC0+Y2hu b10pOwogCX0KIAogCWlmIChpbXhfbGRiX2NoID09ICZsZGItPmNoYW5uZWxbMF0gfHwgZHVhbCkg ewpAQCAtMzI2LDcgKzMyNyw3IEBAIHN0YXRpYyB2b2lkIGlteF9sZGJfZW5jb2Rlcl9kaXNhYmxl KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBk cm1fY29ubmVjdG9yX2Z1bmNzIGlteF9sZGJfY29ubmVjdG9yX2Z1bmNzID0gewotCS5kcG1zID0g ZHJtX2hlbHBlcl9jb25uZWN0b3JfZHBtcywKKwkuZHBtcyA9IGRybV9hdG9taWNfaGVscGVyX2Nv bm5lY3Rvcl9kcG1zLAogCS5maWxsX21vZGVzID0gZHJtX2hlbHBlcl9wcm9iZV9zaW5nbGVfY29u bmVjdG9yX21vZGVzLAogCS5kZXRlY3QgPSBpbXhfbGRiX2Nvbm5lY3Rvcl9kZXRlY3QsCiAJLmRl c3Ryb3kgPSBpbXhfZHJtX2Nvbm5lY3Rvcl9kZXN0cm95LApAQCAtMzQ1LDkgKzM0Niw4IEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfZnVuY3MgaW14X2xkYl9lbmNvZGVyX2Z1bmNz ID0gewogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fZW5jb2Rlcl9oZWxwZXJfZnVuY3Mg aW14X2xkYl9lbmNvZGVyX2hlbHBlcl9mdW5jcyA9IHsKLQkuZHBtcyA9IGlteF9sZGJfZW5jb2Rl cl9kcG1zLAotCS5jb21taXQgPSBpbXhfbGRiX2VuY29kZXJfY29tbWl0LAogCS5tb2RlX3NldCA9 IGlteF9sZGJfZW5jb2Rlcl9tb2RlX3NldCwKKwkuZW5hYmxlID0gaW14X2xkYl9lbmNvZGVyX2Vu YWJsZSwKIAkuZGlzYWJsZSA9IGlteF9sZGJfZW5jb2Rlcl9kaXNhYmxlLAogfTsKIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2lteC9pbXgtdHZlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaW14 L2lteC10dmUuYwppbmRleCA4MmExZWRkLi5jZDkyYWFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaW14L2lteC10dmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaW14L2lteC10dmUuYwpA QCAtMTQ3LDggKzE0Nyw3IEBAIHN0YXRpYyB2b2lkIHR2ZV9lbmFibGUoc3RydWN0IGlteF90dmUg KnR2ZSkKIAkJdHZlLT5lbmFibGVkID0gdHJ1ZTsKIAkJY2xrX3ByZXBhcmVfZW5hYmxlKHR2ZS0+ Y2xrKTsKIAkJcmV0ID0gcmVnbWFwX3VwZGF0ZV9iaXRzKHR2ZS0+cmVnbWFwLCBUVkVfQ09NX0NP TkZfUkVHLAotCQkJCQkgVFZFX0lQVV9DTEtfRU4gfCBUVkVfRU4sCi0JCQkJCSBUVkVfSVBVX0NM S19FTiB8IFRWRV9FTik7CisJCQkJCSBUVkVfRU4sIFRWRV9FTik7CiAJfQogCiAJLyogY2xlYXIg aW50ZXJydXB0IHN0YXR1cyByZWdpc3RlciAqLwpAQCAtMTcxLDcgKzE3MCw3IEBAIHN0YXRpYyB2 b2lkIHR2ZV9kaXNhYmxlKHN0cnVjdCBpbXhfdHZlICp0dmUpCiAJaWYgKHR2ZS0+ZW5hYmxlZCkg ewogCQl0dmUtPmVuYWJsZWQgPSBmYWxzZTsKIAkJcmV0ID0gcmVnbWFwX3VwZGF0ZV9iaXRzKHR2 ZS0+cmVnbWFwLCBUVkVfQ09NX0NPTkZfUkVHLAotCQkJCQkgVFZFX0lQVV9DTEtfRU4gfCBUVkVf RU4sIDApOworCQkJCQkgVFZFX0VOLCAwKTsKIAkJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKHR2ZS0+ Y2xrKTsKIAl9CiB9CkBAIC0yNzQsMTggKzI3Myw2IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2VuY29k ZXIgKmlteF90dmVfY29ubmVjdG9yX2Jlc3RfZW5jb2RlcigKIAlyZXR1cm4gJnR2ZS0+aW14X2Vu Y29kZXIuZW5jb2RlcjsKIH0KIAotc3RhdGljIHZvaWQgaW14X3R2ZV9lbmNvZGVyX2RwbXMoc3Ry dWN0IGRybV9lbmNvZGVyICplbmNvZGVyLCBpbnQgbW9kZSkKLXsKLQlzdHJ1Y3QgaW14X2RybV9l bmNvZGVyICppbXhfZW5jb2RlciA9IGVuY190b19pbXhfZW5jKGVuY29kZXIpOwotCXN0cnVjdCBp bXhfdHZlICp0dmUgPSBpbXhfZW5jX3RvX3R2ZShpbXhfZW5jb2Rlcik7Ci0JaW50IHJldDsKLQot CXJldCA9IHJlZ21hcF91cGRhdGVfYml0cyh0dmUtPnJlZ21hcCwgVFZFX0NPTV9DT05GX1JFRywK LQkJCQkgVFZFX1RWX09VVF9NT0RFX01BU0ssIFRWRV9UVl9PVVRfRElTQUJMRSk7Ci0JaWYgKHJl dCA8IDApCi0JCWRldl9lcnIodHZlLT5kZXYsICJmYWlsZWQgdG8gZGlzYWJsZSBUVk9VVDogJWRc biIsIHJldCk7Ci19Ci0KIHN0YXRpYyB2b2lkIGlteF90dmVfZW5jb2Rlcl9tb2RlX3NldChzdHJ1 Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCiAJCQkJICAgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9k ZSAqb3JpZ19tb2RlLAogCQkJCSAgICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCkBA IC0zMTUsNiArMzAyLDkgQEAgc3RhdGljIHZvaWQgaW14X3R2ZV9lbmNvZGVyX21vZGVfc2V0KHN0 cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKIAkJCXJldCk7CiAJfQogCisJcmVnbWFwX3VwZGF0 ZV9iaXRzKHR2ZS0+cmVnbWFwLCBUVkVfQ09NX0NPTkZfUkVHLAorCQkJICAgVFZFX0lQVV9DTEtf RU4sIFRWRV9JUFVfQ0xLX0VOKTsKKwogCWlmICh0dmUtPm1vZGUgPT0gVFZFX01PREVfVkdBKQog CQlyZXQgPSB0dmVfc2V0dXBfdmdhKHR2ZSk7CiAJZWxzZQpAQCAtMzIzLDcgKzMxMyw3IEBAIHN0 YXRpYyB2b2lkIGlteF90dmVfZW5jb2Rlcl9tb2RlX3NldChzdHJ1Y3QgZHJtX2VuY29kZXIgKmVu Y29kZXIsCiAJCWRldl9lcnIodHZlLT5kZXYsICJmYWlsZWQgdG8gc2V0IGNvbmZpZ3VyYXRpb246 ICVkXG4iLCByZXQpOwogfQogCi1zdGF0aWMgdm9pZCBpbXhfdHZlX2VuY29kZXJfY29tbWl0KHN0 cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKK3N0YXRpYyB2b2lkIGlteF90dmVfZW5jb2Rlcl9l bmFibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogewogCXN0cnVjdCBpbXhfZHJtX2Vu Y29kZXIgKmlteF9lbmNvZGVyID0gZW5jX3RvX2lteF9lbmMoZW5jb2Rlcik7CiAJc3RydWN0IGlt eF90dmUgKnR2ZSA9IGlteF9lbmNfdG9fdHZlKGlteF9lbmNvZGVyKTsKQEAgLTM0MCw3ICszMzAs NyBAQCBzdGF0aWMgdm9pZCBpbXhfdHZlX2VuY29kZXJfZGlzYWJsZShzdHJ1Y3QgZHJtX2VuY29k ZXIgKmVuY29kZXIpCiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9mdW5j cyBpbXhfdHZlX2Nvbm5lY3Rvcl9mdW5jcyA9IHsKLQkuZHBtcyA9IGRybV9oZWxwZXJfY29ubmVj dG9yX2RwbXMsCisJLmRwbXMgPSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZHBtcywKIAku ZmlsbF9tb2RlcyA9IGRybV9oZWxwZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2RlcywKIAku ZGV0ZWN0ID0gaW14X3R2ZV9jb25uZWN0b3JfZGV0ZWN0LAogCS5kZXN0cm95ID0gaW14X2RybV9j b25uZWN0b3JfZGVzdHJveSwKQEAgLTM2MCw5ICszNTAsOCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0 IGRybV9lbmNvZGVyX2Z1bmNzIGlteF90dmVfZW5jb2Rlcl9mdW5jcyA9IHsKIH07CiAKIHN0YXRp YyBjb25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1bmNzIGlteF90dmVfZW5jb2Rlcl9o ZWxwZXJfZnVuY3MgPSB7Ci0JLmRwbXMgPSBpbXhfdHZlX2VuY29kZXJfZHBtcywKIAkubW9kZV9z ZXQgPSBpbXhfdHZlX2VuY29kZXJfbW9kZV9zZXQsCi0JLmNvbW1pdCA9IGlteF90dmVfZW5jb2Rl cl9jb21taXQsCisJLmVuYWJsZSA9IGlteF90dmVfZW5jb2Rlcl9lbmFibGUsCiAJLmRpc2FibGUg PSBpbXhfdHZlX2VuY29kZXJfZGlzYWJsZSwKIH07CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pbXgvaXB1djMtY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2lteC9pcHV2My1jcnRjLmMK aW5kZXggN2Y0NDc1YTEuLmYyMDM0MGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pbXgv aXB1djMtY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pbXgvaXB1djMtY3J0Yy5jCkBAIC03 MCw4ICs3MCw5IEBAIHN0cnVjdCBpcHVfY3J0YyB7CiAKICNkZWZpbmUgdG9faXB1X2NydGMoeCkg Y29udGFpbmVyX29mKHgsIHN0cnVjdCBpcHVfY3J0YywgYmFzZSkKIAotc3RhdGljIHZvaWQgaXB1 X2NydGNfZW5hYmxlKHN0cnVjdCBpcHVfY3J0YyAqaXB1X2NydGMpCitzdGF0aWMgdm9pZCBpcHVf Y3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogeworCXN0cnVjdCBpcHVfY3J0YyAq aXB1X2NydGMgPSB0b19pcHVfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaXB1X3NvYyAqaXB1ID0gZGV2 X2dldF9kcnZkYXRhKGlwdV9jcnRjLT5kZXYtPnBhcmVudCk7CiAKIAlpcHVfZGNfZW5hYmxlKGlw dSk7CkBAIC04MCw4ICs4MSw5IEBAIHN0YXRpYyB2b2lkIGlwdV9jcnRjX2VuYWJsZShzdHJ1Y3Qg aXB1X2NydGMgKmlwdV9jcnRjKQogCWRybV9jcnRjX3ZibGFua19vbigmaXB1X2NydGMtPmJhc2Up OwogfQogCi1zdGF0aWMgdm9pZCBpcHVfY3J0Y19kaXNhYmxlKHN0cnVjdCBpcHVfY3J0YyAqaXB1 X2NydGMpCitzdGF0aWMgdm9pZCBpcHVfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YykKIHsKKwlzdHJ1Y3QgaXB1X2NydGMgKmlwdV9jcnRjID0gdG9faXB1X2NydGMoY3J0Yyk7CiAJ c3RydWN0IGlwdV9zb2MgKmlwdSA9IGRldl9nZXRfZHJ2ZGF0YShpcHVfY3J0Yy0+ZGV2LT5wYXJl bnQpOwogCiAJaXB1X2RjX2Rpc2FibGVfY2hhbm5lbChpcHVfY3J0Yy0+ZGMpOwpAQCAtOTAsMjQg KzkyLDYgQEAgc3RhdGljIHZvaWQgaXB1X2NydGNfZGlzYWJsZShzdHJ1Y3QgaXB1X2NydGMgKmlw dV9jcnRjKQogCWRybV9jcnRjX3ZibGFua19vZmYoJmlwdV9jcnRjLT5iYXNlKTsKIH0KIAotc3Rh dGljIHZvaWQgaXB1X2NydGNfZHBtcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGludCBtb2RlKQot ewotCXN0cnVjdCBpcHVfY3J0YyAqaXB1X2NydGMgPSB0b19pcHVfY3J0YyhjcnRjKTsKLQotCWRl dl9kYmcoaXB1X2NydGMtPmRldiwgIiVzIG1vZGU6ICVkXG4iLCBfX2Z1bmNfXywgbW9kZSk7Ci0K LQlzd2l0Y2ggKG1vZGUpIHsKLQljYXNlIERSTV9NT0RFX0RQTVNfT046Ci0JCWlwdV9jcnRjX2Vu YWJsZShpcHVfY3J0Yyk7Ci0JCWJyZWFrOwotCWNhc2UgRFJNX01PREVfRFBNU19TVEFOREJZOgot CWNhc2UgRFJNX01PREVfRFBNU19TVVNQRU5EOgotCWNhc2UgRFJNX01PREVfRFBNU19PRkY6Ci0J CWlwdV9jcnRjX2Rpc2FibGUoaXB1X2NydGMpOwotCQlicmVhazsKLQl9Ci19Ci0KIHN0YXRpYyB2 b2lkIGlwdV9mbGlwX3VucmVmX3dvcmtfZnVuYyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKl9fd29yaykK IHsKIAlzdHJ1Y3QgaXB1X2ZsaXBfd29yayAqd29yayA9CkBAIC0yNzgsMjAgKzI2Miw2IEBAIHN0 YXRpYyBib29sIGlwdV9jcnRjX21vZGVfZml4dXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXJl dHVybiB0cnVlOwogfQogCi1zdGF0aWMgdm9pZCBpcHVfY3J0Y19wcmVwYXJlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKLXsKLQlzdHJ1Y3QgaXB1X2NydGMgKmlwdV9jcnRjID0gdG9faXB1X2NydGMo Y3J0Yyk7Ci0KLQlpcHVfY3J0Y19kaXNhYmxlKGlwdV9jcnRjKTsKLX0KLQotc3RhdGljIHZvaWQg aXB1X2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKLXsKLQlzdHJ1Y3QgaXB1X2Ny dGMgKmlwdV9jcnRjID0gdG9faXB1X2NydGMoY3J0Yyk7Ci0KLQlpcHVfY3J0Y19lbmFibGUoaXB1 X2NydGMpOwotfQotCiBzdGF0aWMgaW50IGlwdV9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAJCQkJIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUpCiB7CkBAIC0z NTksMTIgKzMyOSwxMSBAQCBzdGF0aWMgdm9pZCBpcHVfY3J0Y19tb2RlX3NldF9ub2ZiKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY3J0Y19oZWxw ZXJfZnVuY3MgaXB1X2hlbHBlcl9mdW5jcyA9IHsKLQkuZHBtcyA9IGlwdV9jcnRjX2RwbXMsCiAJ Lm1vZGVfZml4dXAgPSBpcHVfY3J0Y19tb2RlX2ZpeHVwLAogCS5tb2RlX3NldF9ub2ZiID0gaXB1 X2NydGNfbW9kZV9zZXRfbm9mYiwKLQkucHJlcGFyZSA9IGlwdV9jcnRjX3ByZXBhcmUsCi0JLmNv bW1pdCA9IGlwdV9jcnRjX2NvbW1pdCwKIAkuYXRvbWljX2NoZWNrID0gaXB1X2NydGNfYXRvbWlj X2NoZWNrLAorCS5kaXNhYmxlID0gaXB1X2NydGNfZGlzYWJsZSwKKwkuZW5hYmxlID0gaXB1X2Ny dGNfZW5hYmxlLAogfTsKIAogc3RhdGljIGludCBpcHVfZW5hYmxlX3ZibGFuayhzdHJ1Y3QgZHJt X2NydGMgKmNydGMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaW14L3BhcmFsbGVsLWRp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pbXgvcGFyYWxsZWwtZGlzcGxheS5jCmluZGV4IDcz NzRkODIuLmJiNWRiZDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pbXgvcGFyYWxsZWwt ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pbXgvcGFyYWxsZWwtZGlzcGxheS5jCkBA IC05MiwxOCArOTIsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9lbmNvZGVyICppbXhfcGRfY29ubmVj dG9yX2Jlc3RfZW5jb2RlcigKIAlyZXR1cm4gJmlteHBkLT5pbXhfZW5jb2Rlci5lbmNvZGVyOwog fQogCi1zdGF0aWMgdm9pZCBpbXhfcGRfZW5jb2Rlcl9kcG1zKHN0cnVjdCBkcm1fZW5jb2RlciAq ZW5jb2RlciwgaW50IG1vZGUpCi17Ci0Jc3RydWN0IGlteF9kcm1fZW5jb2RlciAqaW14X2VuY29k ZXIgPSBlbmNfdG9faW14X2VuYyhlbmNvZGVyKTsKLQlzdHJ1Y3QgaW14X3BhcmFsbGVsX2Rpc3Bs YXkgKmlteHBkID0gaW14X2VuY190b19pbXhwZChpbXhfZW5jb2Rlcik7Ci0KLQlpZiAobW9kZSAh PSBEUk1fTU9ERV9EUE1TX09OKQotCQlkcm1fcGFuZWxfZGlzYWJsZShpbXhwZC0+cGFuZWwpOwot CWVsc2UKLQkJZHJtX3BhbmVsX2VuYWJsZShpbXhwZC0+cGFuZWwpOwotfQotCi1zdGF0aWMgdm9p ZCBpbXhfcGRfZW5jb2Rlcl9jb21taXQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQorc3Rh dGljIHZvaWQgaW14X3BkX2VuY29kZXJfZW5hYmxlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2Rl cikKIHsKIAlzdHJ1Y3QgaW14X2RybV9lbmNvZGVyICppbXhfZW5jb2RlciA9IGVuY190b19pbXhf ZW5jKGVuY29kZXIpOwogCXN0cnVjdCBpbXhfcGFyYWxsZWxfZGlzcGxheSAqaW14cGQgPSBpbXhf ZW5jX3RvX2lteHBkKGlteF9lbmNvZGVyKTsKQEAgLTEyOCw3ICsxMTcsNyBAQCBzdGF0aWMgdm9p ZCBpbXhfcGRfZW5jb2Rlcl9kaXNhYmxlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIH0K IAogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX2Z1bmNzIGlteF9wZF9jb25uZWN0 b3JfZnVuY3MgPSB7Ci0JLmRwbXMgPSBkcm1faGVscGVyX2Nvbm5lY3Rvcl9kcG1zLAorCS5kcG1z ID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2RwbXMsCiAJLmZpbGxfbW9kZXMgPSBkcm1f aGVscGVyX3Byb2JlX3NpbmdsZV9jb25uZWN0b3JfbW9kZXMsCiAJLmRldGVjdCA9IGlteF9wZF9j b25uZWN0b3JfZGV0ZWN0LAogCS5kZXN0cm95ID0gaW14X2RybV9jb25uZWN0b3JfZGVzdHJveSwK QEAgLTE0Nyw5ICsxMzYsOCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9lbmNvZGVyX2Z1bmNz IGlteF9wZF9lbmNvZGVyX2Z1bmNzID0gewogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1f ZW5jb2Rlcl9oZWxwZXJfZnVuY3MgaW14X3BkX2VuY29kZXJfaGVscGVyX2Z1bmNzID0gewotCS5k cG1zID0gaW14X3BkX2VuY29kZXJfZHBtcywKLQkuY29tbWl0ID0gaW14X3BkX2VuY29kZXJfY29t bWl0LAogCS5tb2RlX3NldCA9IGlteF9wZF9lbmNvZGVyX21vZGVfc2V0LAorCS5lbmFibGUgPSBp bXhfcGRfZW5jb2Rlcl9lbmFibGUsCiAJLmRpc2FibGUgPSBpbXhfcGRfZW5jb2Rlcl9kaXNhYmxl LAogfTsKIAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=