From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manasi Navare Subject: [CI v12 4/6] drm/i915/display/icl: Enable master-slaves in trans port sync Date: Fri, 18 Oct 2019 10:27:23 -0700 Message-ID: <20191018172725.1338-4-manasi.d.navare@intel.com> References: <20191018172725.1338-1-manasi.d.navare@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 763826EB79 for ; Fri, 18 Oct 2019 17:25:18 +0000 (UTC) In-Reply-To: <20191018172725.1338-1-manasi.d.navare@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: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org QXMgcGVyIHRoZSBkaXNwbGF5IGVuYWJsZSBzZXF1ZW5jZSwgd2UgbmVlZCB0byBmb2xsb3cgdGhl IGVuYWJsZSBzZXF1ZW5jZQpmb3Igc2xhdmVzIGZpcnN0IHdpdGggRFBfVFBfQ1RMIHNldCB0byBJ ZGxlIGFuZCBjb25maWd1cmUgdGhlIHRyYW5zY29kZXIKcG9ydCBzeW5jIHJlZ2lzdGVyIHRvIHNl bGVjdCB0aGUgY29yZXJzcG9uZGluZyBtYXN0ZXIsIHRoZW4gZm9sbG93IHRoZQplbmFibGUgc2Vx dWVuY2UgZm9yIG1hc3RlciBsZWF2aW5nIERQX1RQX0NUTCB0byBpZGxlLgpBdCB0aGlzIHBvaW50 IHRoZSB0cmFuc2NvZGVyIHBvcnQgc3luYyBtb2RlIGlzIGNvbmZpZ3VyZWQgYW5kIGVuYWJsZWQK YW5kIHRoZSBWYmxhbmtzIG9mIGJvdGggcG9ydHMgYXJlIHN5bmNocm9uaXplZCBzbyB0aGVuIHNl dCBEUF9UUF9DVEwKZm9yIHRoZSBzbGF2ZSBhbmQgbWFzdGVyIHRvIE5vcm1hbCBhbmQgZG8gcG9z dCBjcnRjIGVuYWJsZSB1cGRhdGVzLgoKdjExOgoqIFJlYmFzZSAoTWFuYXNpKQp2MTA6CiogaW4g dHJhbnMgc3luYyBtb2RlLCBkb250IHN0b3AgbGluayB0cmFpbiBmb3IgdGdsIChNYW5hc2kpCnY5 OgpSZW1vdmUgdXBkYXRlX3NjYW5saW5lX29mZnNldCB0byByZWJhc2Ugb24gTWFhcnRlbidzIHBh dGNoIChNYW5hc2kpCnY4OgoqIFJlYmFzZSBvbiBNYWFydGVuJ3MgcGF0Y2hlcyAoTWFuYXNpKQp2 NzoKKiBVc2UgZmZzKHNsYXZlcykgdG8gZ2V0IHNsYXZlIGNydGMgKFZpbGxlKQp2NjoKKiBNb2Rl c2V0IGltcGxpZXMgYWN0aXZlX2NoYW5nZWQsIHJlbW92ZSBvbmUgY29uZGl0aW9uIChNYWFydGVu KQp2NToKKiBGaXggY2hlY2twYXRjaCB3YXJuaW5nIChNYW5hc2kpCnY0OgoqIFJldXNlIHNrbF9j b21taXRfbW9kZXNldF9lbmFibGVzKCkgaG9vayAoTWFhcnRlbikKKiBPYnRhaW4gc2xhdmUgY3J0 YyBhbmQgc3RhdGVzIGZyb20gbWFzdGVyIChNYWFydGVuKQp2MzoKKiBSZWJhc2Ugb24gZHJtLXRp cCAoTWFuYXNpKQp2MjoKKiBDcmVhdGUgYSBpY2xfdXBkYXRlX2NydGNzIGhvb2sgKE1hYXJ0ZW4s IERhbnZldCkKKiBUaGlzIHNlcXVlbmNlIG9ubHkgZm9yIENSVENzIGluIHRyYW5zIHBvcnQgc3lu YyBtb2RlIChNYWFydGVuKQoKQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwu Y2g+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpD YzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K Q2M6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6 IE1hbmFzaSBOYXZhcmUgPG1hbmFzaS5kLm5hdmFyZUBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBN YWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGRpLmMgICAgIHwgICA2ICstCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyB8IDEzNiArKysrKysr KysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXku aCB8ICAgMiArCiAzIGZpbGVzIGNoYW5nZWQsIDEzOSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGRp LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2RkaS5jCmluZGV4IDRjODE0 NDllYzE0NC4uNDZhN2IyY2EyNzgyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX2RkaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfZGRpLmMKQEAgLTM1MDAsNyArMzUwMCw4IEBAIHN0YXRpYyB2b2lkIHRnbF9kZGlfcHJlX2Vu YWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlpbnRlbF9kcF9zdGFydF9s aW5rX3RyYWluKGludGVsX2RwKTsKIAogCS8qIDcuayAqLwotCWludGVsX2RwX3N0b3BfbGlua190 cmFpbihpbnRlbF9kcCk7CisJaWYgKCFpc190cmFuc19wb3J0X3N5bmNfbW9kZShjcnRjX3N0YXRl KSkKKwkJaW50ZWxfZHBfc3RvcF9saW5rX3RyYWluKGludGVsX2RwKTsKIAogCS8qCiAJICogVE9E TzogZW5hYmxlIGNsb2NrIGdhdGluZwpAQCAtMzU3NCw3ICszNTc1LDggQEAgc3RhdGljIHZvaWQg aHN3X2RkaV9wcmVfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJ CQkgICAgICB0cnVlKTsKIAlpbnRlbF9kcF9zaW5rX3NldF9mZWNfcmVhZHkoaW50ZWxfZHAsIGNy dGNfc3RhdGUpOwogCWludGVsX2RwX3N0YXJ0X2xpbmtfdHJhaW4oaW50ZWxfZHApOwotCWlmIChw b3J0ICE9IFBPUlRfQSB8fCBJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCisJaWYgKChwb3J0ICE9 IFBPUlRfQSB8fCBJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpICYmCisJICAgICFpc190cmFuc19w b3J0X3N5bmNfbW9kZShjcnRjX3N0YXRlKSkKIAkJaW50ZWxfZHBfc3RvcF9saW5rX3RyYWluKGlu dGVsX2RwKTsKIAogCWludGVsX2RkaV9lbmFibGVfZmVjKGVuY29kZXIsIGNydGNfc3RhdGUpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwppbmRleCBmNmM1 NzI1NWJmMjguLmJmYmY5MTZkYzI1MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE0MDYxLDYgKzE0MDYxLDE4IEBAIHN0YXRpYyB2b2lkIGlu dGVsX3VwZGF0ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQlpbnRlbF9jcnRjX2Fy bV9maWZvX3VuZGVycnVuKGNydGMsIG5ld19jcnRjX3N0YXRlKTsKIH0KIAorc3RhdGljIHN0cnVj dCBpbnRlbF9jcnRjICppbnRlbF9nZXRfc2xhdmVfY3J0Yyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShuZXdfY3J0Y19zdGF0ZS0+YmFzZS5jcnRjLT5kZXYpOworCWVudW0g dHJhbnNjb2RlciBzbGF2ZV90cmFuc2NvZGVyOworCisJV0FSTl9PTighaXNfcG93ZXJfb2ZfMihu ZXdfY3J0Y19zdGF0ZS0+c3luY19tb2RlX3NsYXZlc19tYXNrKSk7CisKKwlzbGF2ZV90cmFuc2Nv ZGVyID0gZmZzKG5ld19jcnRjX3N0YXRlLT5zeW5jX21vZGVfc2xhdmVzX21hc2spIC0gMTsKKwly ZXR1cm4gaW50ZWxfZ2V0X2NydGNfZm9yX3BpcGUoZGV2X3ByaXYsCisJCQkJICAgICAgIChlbnVt IHBpcGUpc2xhdmVfdHJhbnNjb2Rlcik7Cit9CisKIHN0YXRpYyB2b2lkIGludGVsX29sZF9jcnRj X3N0YXRlX2Rpc2FibGVzKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJCQkg IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKIAkJCQkJICBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUsCkBAIC0xNDEzOSw2ICsxNDE1MSwxMTMg QEAgc3RhdGljIHZvaWQgaW50ZWxfY29tbWl0X21vZGVzZXRfZW5hYmxlcyhzdHJ1Y3QgaW50ZWxf YXRvbWljX3N0YXRlICpzdGF0ZSkKIAl9CiB9CiAKK3N0YXRpYyB2b2lkIGludGVsX2NydGNfZW5h YmxlX3RyYW5zX3BvcnRfc3luYyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCQkJICAgICAg c3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkJCSAgICAgIHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHN0YXRlLT5iYXNlLmRldik7CisKKwlpbnRlbF9jcnRjX3Vw ZGF0ZV9hY3RpdmVfdGltaW5ncyhuZXdfY3J0Y19zdGF0ZSk7CisJZGV2X3ByaXYtPmRpc3BsYXku Y3J0Y19lbmFibGUobmV3X2NydGNfc3RhdGUsIHN0YXRlKTsKKwlpbnRlbF9jcnRjX2VuYWJsZV9w aXBlX2NyYyhjcnRjKTsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfc2V0X2RwX3RwX2N0bF9ub3Jt YWwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkJICAgICAgIHN0cnVjdCBpbnRlbF9hdG9t aWNfc3RhdGUgKnN0YXRlKQoreworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0 YXRlOworCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uOworCXN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHA7CisJaW50IGk7CisKKwlmb3JfZWFjaF9uZXdfY29ubmVjdG9yX2luX3N0YXRlKCZzdGF0 ZS0+YmFzZSwgY29ubiwgY29ubl9zdGF0ZSwgaSkgeworCQlpZiAoY29ubl9zdGF0ZS0+Y3J0YyA9 PSAmY3J0Yy0+YmFzZSkKKwkJCWJyZWFrOworCX0KKwlpbnRlbF9kcCA9IGVuY190b19pbnRlbF9k cCgmaW50ZWxfYXR0YWNoZWRfZW5jb2Rlcihjb25uKS0+YmFzZSk7CisJaW50ZWxfZHBfc3RvcF9s aW5rX3RyYWluKGludGVsX2RwKTsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9jcnRjX2Vu YWJsZV91cGRhdGVzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkJCQkgICBzdHJ1Y3QgaW50 ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3 X2NydGNfc3RhdGUgPQorCQlpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBj cnRjKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUgPQorCQlpbnRl bF9hdG9taWNfZ2V0X29sZF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZSA9CisJCWludGVsX2F0b21pY19nZXRfbmV3X3Bs YW5lX3N0YXRlKHN0YXRlLAorCQkJCQkJIHRvX2ludGVsX3BsYW5lKGNydGMtPmJhc2UucHJpbWFy eSkpOworCWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpOworCisJ aWYgKG5ld19jcnRjX3N0YXRlLT51cGRhdGVfcGlwZSAmJiAhbmV3X2NydGNfc3RhdGUtPmVuYWJs ZV9mYmMpCisJCWludGVsX2ZiY19kaXNhYmxlKGNydGMpOworCWVsc2UgaWYgKG5ld19wbGFuZV9z dGF0ZSkKKwkJaW50ZWxfZmJjX2VuYWJsZShjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgbmV3X3BsYW5l X3N0YXRlKTsKKworCS8qIFBlcmZvcm0gdmJsYW5rIGV2YXNpb24gYXJvdW5kIGNvbW1pdCBvcGVy YXRpb24gKi8KKwlpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChuZXdfY3J0Y19zdGF0ZSk7CisJY29t bWl0X3BpcGVfY29uZmlnKHN0YXRlLCBvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUpOwor CXNrbF91cGRhdGVfcGxhbmVzX29uX2NydGMoc3RhdGUsIGNydGMpOworCWludGVsX3BpcGVfdXBk YXRlX2VuZChuZXdfY3J0Y19zdGF0ZSk7CisKKwkvKgorCSAqIFdlIHVzdWFsbHkgZW5hYmxlIEZJ Rk8gdW5kZXJydW4gaW50ZXJydXB0cyBhcyBwYXJ0IG9mIHRoZQorCSAqIENSVEMgZW5hYmxlIHNl cXVlbmNlIGR1cmluZyBtb2Rlc2V0cy4gIEJ1dCB3aGVuIHdlIGluaGVyaXQgYQorCSAqIHZhbGlk IHBpcGUgY29uZmlndXJhdGlvbiBmcm9tIHRoZSBCSU9TIHdlIG5lZWQgdG8gdGFrZSBjYXJlCisJ ICogb2YgZW5hYmxpbmcgdGhlbSBvbiB0aGUgQ1JUQydzIGZpcnN0IGZhc3RzZXQuCisJICovCisJ aWYgKG5ld19jcnRjX3N0YXRlLT51cGRhdGVfcGlwZSAmJiAhbW9kZXNldCAmJgorCSAgICBvbGRf Y3J0Y19zdGF0ZS0+YmFzZS5tb2RlLnByaXZhdGVfZmxhZ3MgJiBJOTE1X01PREVfRkxBR19JTkhF UklURUQpCisJCWludGVsX2NydGNfYXJtX2ZpZm9fdW5kZXJydW4oY3J0YywgbmV3X2NydGNfc3Rh dGUpOworfQorCitzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVfdHJhbnNfcG9ydF9zeW5jX2NydGNz KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkJCQkgICAgICAgc3RydWN0IGludGVsX2F0b21p Y19zdGF0ZSAqc3RhdGUsCisJCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xk X2NydGNfc3RhdGUsCisJCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2Ny dGNfc3RhdGUpCit7CisJc3RydWN0IGludGVsX2NydGMgKnNsYXZlX2NydGMgPSBpbnRlbF9nZXRf c2xhdmVfY3J0YyhuZXdfY3J0Y19zdGF0ZSk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5l d19zbGF2ZV9jcnRjX3N0YXRlID0KKwkJaW50ZWxfYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShz dGF0ZSwgc2xhdmVfY3J0Yyk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9zbGF2ZV9j cnRjX3N0YXRlID0KKwkJaW50ZWxfYXRvbWljX2dldF9vbGRfY3J0Y19zdGF0ZShzdGF0ZSwgc2xh dmVfY3J0Yyk7CisKKwlXQVJOX09OKCFzbGF2ZV9jcnRjIHx8ICFuZXdfc2xhdmVfY3J0Y19zdGF0 ZSB8fAorCQkhb2xkX3NsYXZlX2NydGNfc3RhdGUpOworCisJRFJNX0RFQlVHX0tNUygiVXBkYXRp bmcgVHJhbnNjb2RlciBQb3J0IFN5bmMgTWFzdGVyIENSVEMgPSAlZCAlcyBhbmQgU2xhdmUgQ1JU QyAlZCAlc1xuIiwKKwkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkLCBjcnRjLT5iYXNlLm5hbWUs IHNsYXZlX2NydGMtPmJhc2UuYmFzZS5pZCwKKwkJICAgICAgc2xhdmVfY3J0Yy0+YmFzZS5uYW1l KTsKKworCS8qIEVuYWJsZSBzZXEgZm9yIHNsYXZlIHdpdGggd2l0aCBEUF9UUF9DVEwgbGVmdCBJ ZGxlIHVudGlsIHRoZQorCSAqIG1hc3RlciBpcyByZWFkeQorCSAqLworCWludGVsX2NydGNfZW5h YmxlX3RyYW5zX3BvcnRfc3luYyhzbGF2ZV9jcnRjLAorCQkJCQkgIHN0YXRlLAorCQkJCQkgIG5l d19zbGF2ZV9jcnRjX3N0YXRlKTsKKworCS8qIEVuYWJsZSBzZXEgZm9yIG1hc3RlciB3aXRoIHdp dGggRFBfVFBfQ1RMIGxlZnQgSWRsZSAqLworCWludGVsX2NydGNfZW5hYmxlX3RyYW5zX3BvcnRf c3luYyhjcnRjLAorCQkJCQkgIHN0YXRlLAorCQkJCQkgIG5ld19jcnRjX3N0YXRlKTsKKworCS8q IFNldCBTbGF2ZSdzIERQX1RQX0NUTCB0byBOb3JtYWwgKi8KKwlpbnRlbF9zZXRfZHBfdHBfY3Rs X25vcm1hbChzbGF2ZV9jcnRjLAorCQkJCSAgIHN0YXRlKTsKKworCS8qIFNldCBNYXN0ZXIncyBE UF9UUF9DVEwgVG8gTm9ybWFsICovCisJdXNsZWVwX3JhbmdlKDIwMCwgNDAwKTsKKwlpbnRlbF9z ZXRfZHBfdHBfY3RsX25vcm1hbChjcnRjLAorCQkJCSAgIHN0YXRlKTsKKworCS8qIE5vdyBkbyB0 aGUgcG9zdCBjcnRjIGVuYWJsZSBmb3IgYWxsIG1hc3RlciBhbmQgc2xhdmVzICovCisJaW50ZWxf cG9zdF9jcnRjX2VuYWJsZV91cGRhdGVzKHNsYXZlX2NydGMsCisJCQkJICAgICAgIHN0YXRlKTsK KwlpbnRlbF9wb3N0X2NydGNfZW5hYmxlX3VwZGF0ZXMoY3J0YywKKwkJCQkgICAgICAgc3RhdGUp OworfQorCiBzdGF0aWMgdm9pZCBza2xfY29tbWl0X21vZGVzZXRfZW5hYmxlcyhzdHJ1Y3QgaW50 ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KHN0YXRlLT5iYXNlLmRldik7CkBAIC0xNDE3Miw2ICsxNDI5MSw3IEBA IHN0YXRpYyB2b2lkIHNrbF9jb21taXRfbW9kZXNldF9lbmFibGVzKHN0cnVjdCBpbnRlbF9hdG9t aWNfc3RhdGUgKnN0YXRlKQogCQlmb3JfZWFjaF9vbGRuZXdfaW50ZWxfY3J0Y19pbl9zdGF0ZShz dGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlLCBpKSB7CiAJCQllbnVt IHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CiAJCQlib29sIHZibF93YWl0ID0gZmFsc2U7CisJCQli b29sIG1vZGVzZXQgPSBuZWVkc19tb2Rlc2V0KG5ld19jcnRjX3N0YXRlKTsKIAogCQkJaWYgKHVw ZGF0ZWQgJiBCSVQoY3J0Yy0+cGlwZSkgfHwgIW5ld19jcnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSkK IAkJCQljb250aW51ZTsKQEAgLTE0MTkyLDEyICsxNDMxMiwyMiBAQCBzdGF0aWMgdm9pZCBza2xf Y29tbWl0X21vZGVzZXRfZW5hYmxlcyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkK IAkJCSAqLwogCQkJaWYgKCFza2xfZGRiX2VudHJ5X2VxdWFsKCZuZXdfY3J0Y19zdGF0ZS0+d20u c2tsLmRkYiwKIAkJCQkJCSAmb2xkX2NydGNfc3RhdGUtPndtLnNrbC5kZGIpICYmCi0JCQkgICAg IW5ld19jcnRjX3N0YXRlLT5iYXNlLmFjdGl2ZV9jaGFuZ2VkICYmCisJCQkgICAgIW1vZGVzZXQg JiYKIAkJCSAgICBzdGF0ZS0+d21fcmVzdWx0cy5kaXJ0eV9waXBlcyAhPSB1cGRhdGVkKQogCQkJ CXZibF93YWl0ID0gdHJ1ZTsKIAotCQkJaW50ZWxfdXBkYXRlX2NydGMoY3J0Yywgc3RhdGUsIG9s ZF9jcnRjX3N0YXRlLAotCQkJCQkgIG5ld19jcnRjX3N0YXRlKTsKKwkJCWlmIChtb2Rlc2V0ICYm IGlzX3RyYW5zX3BvcnRfc3luY19tb2RlKG5ld19jcnRjX3N0YXRlKSkgeworCQkJCWlmIChpc190 cmFuc19wb3J0X3N5bmNfbWFzdGVyKG5ld19jcnRjX3N0YXRlKSkKKwkJCQkJaW50ZWxfdXBkYXRl X3RyYW5zX3BvcnRfc3luY19jcnRjcyhjcnRjLAorCQkJCQkJCQkJICAgc3RhdGUsCisJCQkJCQkJ CQkgICBvbGRfY3J0Y19zdGF0ZSwKKwkJCQkJCQkJCSAgIG5ld19jcnRjX3N0YXRlKTsKKwkJCQll bHNlCisJCQkJCWNvbnRpbnVlOworCQkJfSBlbHNlIHsKKwkJCQlpbnRlbF91cGRhdGVfY3J0Yyhj cnRjLCBzdGF0ZSwgb2xkX2NydGNfc3RhdGUsCisJCQkJCQkgIG5ld19jcnRjX3N0YXRlKTsKKwkJ CX0KIAogCQkJaWYgKHZibF93YWl0KQogCQkJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXZfcHJp diwgcGlwZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVs X2Rpc3BsYXkuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5o CmluZGV4IGRiMTQ5Y2I1NmVjNS4uN2RjYjE3NmQ5MWIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuaApAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVk ZSA8ZHJtL2RybV91dGlsLmg+CiAjaW5jbHVkZSA8ZHJtL2k5MTVfZHJtLmg+CisjaW5jbHVkZSAi aW50ZWxfZHBfbGlua190cmFpbmluZy5oIgogCiBlbnVtIGxpbmtfbV9uX3NldDsKIHN0cnVjdCBk cGxsOwpAQCAtNTQsNiArNTUsNyBAQCBzdHJ1Y3QgaW50ZWxfcGxhbmU7CiBzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGU7CiBzdHJ1Y3QgaW50ZWxfcmVtYXBwZWRfaW5mbzsKIHN0cnVjdCBpbnRlbF9y b3RhdGlvbl9pbmZvOworc3RydWN0IGludGVsX2NydGNfc3RhdGU7CiAKIGVudW0gaTkxNV9ncGlv IHsKIAlHUElPQSwKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4