From: Manasi Navare Subject: [PATCH v4 13/25] drm/i915/dp: Compute DSC pipe config in atomic check Date: Tue, 11 Sep 2018 17:55:55 -0700 Message-ID: <20180912005607.29522-14-manasi.d.navare@intel.com> References: <20180912005607.29522-1-manasi.d.navare@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180912005607.29522-1-manasi.d.navare@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Manasi Navare , Anusha Srivatsa , Gaurav K Singh List-Id: dri-devel@lists.freedesktop.org RFNDIHBhcmFtcyBsaWtlIHRoZSBlbmFibGUsIGNvbXByZXNzZWQgYnBwLCBzbGljZSBvY3VudCBh bmQKZHNjX3NwbGl0IGFyZSBhZGRlZCB0byB0aGUgaW50ZWxfY3J0Y19zdGF0ZS4gVGhlc2UgcGFy YW1ldGVycwphcmUgc2V0IGJhc2VkIG9uIHRoZSByZXF1ZXN0ZWQgbW9kZSBhbmQgYXZhaWxhYmxl IGxpbmsgcGFyYW1ldGVycwpkdXJpbmcgdGhlIHBpcGUgY29uZmlndXJhdGlvbiBpbiBhdG9taWMg Y2hlY2sgcGhhc2UuClRoZXNlIHZhbHVlcyBhcmUgdGhlbiBsYXRlciB1c2VkIHRvIHBvcHVsYXRl IHRoZSByZW1haW5pbmcgRFNDCmFuZCBSQyBwYXJhbWV0ZXJzIGJlZm9yZSBlbmJhbGluZyBEU0Mg aW4gYXRvbWljIGNvbW1pdC4KCnY4OgoqIENoZWNrIGZvciBEU0MgYnBjIG5vdCAwIChtYW5hc2kp Cgp2NzoKKiBGaXggaW5kZW50YXRpb24gaW4gY29tcHV0ZV9tX24gKE1hbmFzaSkKCnY2IChGcm9t IEdhdXJhdik6CiogUmVtb3ZlIGZ1bmN0aW9uIGNhbGwgb2YgaW50ZWxfZHBfY29tcHV0ZV9kc2Nf cGFyYW1zKCkgYW5kCmludm9rZSBpbnRlbF9kcF9jb21wdXRlX2RzY19wYXJhbXMoKSBpbiB0aGUg cGF0Y2ggd2hlcmUKaXQgaXMgZGVmaW5lZCB0byBmaXggY29tcGlsYXRpb24gd2FybmluZyAoR2F1 cmF2KQoKdjU6CkFkZCBkcm1fZHNjX2NmZyBpbiBpbnRlbF9jcnRjX3N0YXRlIChNYW5hc2kpCgp2 NDoKKiBSZWJhc2Ugb24gcmVmYWN0b3Jpbmcgb2YgaW50ZWxfZHBfY29tcHV0ZV9jb25maWcgb24g dGlwIChNYW5hc2kpCiogQWRkIGEgY29tbWVudCB3aHkgd2UgbmVlZCB0byBjaGVjayBQU1Igd2hp bGUgZW5hYmxpbmcgRFNDIChHYXVyYXYpCgp2MzoKKiBDaGVjayBQUFIgPiBtYXhfY2RjbG9jayB0 byB1c2UgMiBWRFNDIGluc3RhbmNlcyAoVmlsbGUpCgp2MjoKKiBBZGQgaWYtZWxzZSBmb3IgZURQ L0RQIChHYXVyYXYpCgpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGxpbnV4LmludGVsLmNv bT4KQ2M6IFZpbGxlIFN5cmphbGEgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzog QW51c2hhIFNyaXZhdHNhIDxhbnVzaGEuc3JpdmF0c2FAaW50ZWwuY29tPgpDYzogR2F1cmF2IEsg U2luZ2ggPGdhdXJhdi5rLnNpbmdoQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWFuYXNpIE5h dmFyZSA8bWFuYXNpLmQubmF2YXJlQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgfCAgMjAgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5oIHwgICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICAgICAg fCAxNTMgKysrKysrKysrKysrKysrKysrKysrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcF9tc3QuYyAgfCAgIDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMTQ4IGluc2VydGlvbnMo KyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl eCAyYjc3ZDkzNTBhM2EuLmE3NTU0MTMyYmZlMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwpAQCAtNjQ3MSw3ICs2NDcxLDcgQEAgc3RhdGljIGludCBpcm9ubGFrZV9mZGlfY29t cHV0ZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAKIAlwaXBlX2NvbmZp Zy0+ZmRpX2xhbmVzID0gbGFuZTsKIAotCWludGVsX2xpbmtfY29tcHV0ZV9tX24ocGlwZV9jb25m aWctPnBpcGVfYnBwLCBsYW5lLCBmZGlfZG90Y2xvY2ssCisJaW50ZWxfbGlua19jb21wdXRlX21f bihwaXBlX2NvbmZpZy0+cGlwZV9icHAsIDAsIGxhbmUsIGZkaV9kb3RjbG9jaywKIAkJCSAgICAg ICBsaW5rX2J3LCAmcGlwZV9jb25maWctPmZkaV9tX24sIGZhbHNlKTsKIAogCXJldCA9IGlyb25s YWtlX2NoZWNrX2ZkaV9sYW5lcyhkZXYsIGludGVsX2NydGMtPnBpcGUsIHBpcGVfY29uZmlnKTsK QEAgLTY3MDgsMTcgKzY3MDgsMjUgQEAgc3RhdGljIHZvaWQgY29tcHV0ZV9tX24odW5zaWduZWQg aW50IG0sIHVuc2lnbmVkIGludCBuLAogfQogCiB2b2lkCi1pbnRlbF9saW5rX2NvbXB1dGVfbV9u KGludCBiaXRzX3Blcl9waXhlbCwgaW50IG5sYW5lcywKK2ludGVsX2xpbmtfY29tcHV0ZV9tX24o aW50IGJpdHNfcGVyX3BpeGVsLCB1aW50MTZfdCBjb21wcmVzc2VkX2JwcCwKKwkJICAgICAgIGlu dCBubGFuZXMsCiAJCSAgICAgICBpbnQgcGl4ZWxfY2xvY2ssIGludCBsaW5rX2Nsb2NrLAogCQkg ICAgICAgc3RydWN0IGludGVsX2xpbmtfbV9uICptX24sCiAJCSAgICAgICBib29sIHJlZHVjZV9t X24pCiB7CiAJbV9uLT50dSA9IDY0OwogCi0JY29tcHV0ZV9tX24oYml0c19wZXJfcGl4ZWwgKiBw aXhlbF9jbG9jaywKLQkJICAgIGxpbmtfY2xvY2sgKiBubGFuZXMgKiA4LAotCQkgICAgJm1fbi0+ Z21jaF9tLCAmbV9uLT5nbWNoX24sCi0JCSAgICByZWR1Y2VfbV9uKTsKKwkvKiBGb3IgRFNDLCBE YXRhIE0vTiBjYWxjdWxhdGlvbiB1c2VzIGNvbXByZXNzZWQgQlBQICovCisJaWYgKGNvbXByZXNz ZWRfYnBwKQorCQljb21wdXRlX21fbihjb21wcmVzc2VkX2JwcCAqIHBpeGVsX2Nsb2NrLAorCQkJ ICAgIGxpbmtfY2xvY2sgKiBubGFuZXMgKiA4LAorCQkJICAgICZtX24tPmdtY2hfbSwgJm1fbi0+ Z21jaF9uLAorCQkJICAgIHJlZHVjZV9tX24pOworCWVsc2UKKwkJY29tcHV0ZV9tX24oYml0c19w ZXJfcGl4ZWwgKiBwaXhlbF9jbG9jaywKKwkJCSAgICBsaW5rX2Nsb2NrICogbmxhbmVzICogOCwK KwkJCSAgICAmbV9uLT5nbWNoX20sICZtX24tPmdtY2hfbiwKKwkJCSAgICByZWR1Y2VfbV9uKTsK IAogCWNvbXB1dGVfbV9uKHBpeGVsX2Nsb2NrLCBsaW5rX2Nsb2NrLAogCQkgICAgJm1fbi0+bGlu a19tLCAmbV9uLT5saW5rX24sCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmgKaW5kZXgg ZWQ0NzRkYTZjMjAwLi4zZmU1Mjc4OGI0Y2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmgKQEAgLTQwMiw3ICs0MDIsOCBAQCBzdHJ1Y3QgaW50ZWxfbGlua19tX24gewogCSAgICAg KF9faSkrKykgXAogCQlmb3JfZWFjaF9pZihwbGFuZSkKIAotdm9pZCBpbnRlbF9saW5rX2NvbXB1 dGVfbV9uKGludCBicHAsIGludCBubGFuZXMsCit2b2lkIGludGVsX2xpbmtfY29tcHV0ZV9tX24o aW50IGJwcCwgdWludDE2X3QgY29tcHJlc3NlZF9icHAsCisJCQkgICAgaW50IG5sYW5lcywKIAkJ CSAgICBpbnQgcGl4ZWxfY2xvY2ssIGludCBsaW5rX2Nsb2NrLAogCQkJICAgIHN0cnVjdCBpbnRl bF9saW5rX21fbiAqbV9uLAogCQkJICAgIGJvb2wgcmVkdWNlX21fbik7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHAuYwppbmRleCA2M2I3ZWZhMTBhMGYuLmFkZTI1ZmJmY2RkMSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcC5jCkBAIC00Nyw2ICs0Nyw4IEBACiAKIC8qIERQIERTQyBzbWFsbCBqb2luZXIgaGFz IDIgRklGT3MgZWFjaCBvZiA2NDAgeCA2IGJ5dGVzICovCiAjZGVmaW5lIERQX0RTQ19NQVhfU01B TExfSk9JTkVSX1JBTV9CVUZGRVIJNjE0NDAKKyNkZWZpbmUgRFBfRFNDX01JTl9TVVBQT1JURURf QlBDCQk4CisjZGVmaW5lIERQX0RTQ19NQVhfU1VQUE9SVEVEX0JQQwkJMTAKIAogLyogRFAgRFND IHRocm91Z2hwdXQgdmFsdWVzIHVzZWQgZm9yIHNsaWNlIGNvdW50IGNhbGN1bGF0aW9ucyBLUGl4 ZWxzL3MgKi8KICNkZWZpbmUgRFBfRFNDX1BFQUtfUElYRUxfUkFURQkJCTI3MjAwMDAKQEAgLTE4 OTQsNiArMTg5NiwxNiBAQCBzdGF0aWMgaW50IGludGVsX2RwX2NvbXB1dGVfYnBwKHN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHAsCiAJCX0KIAl9CiAKKwkvKiBJZiBEU0MgaXMgc3VwcG9ydGVkLCB1 c2UgdGhlIG1heCB2YWx1ZSByZXBvcnRlZCBieSBwYW5lbCAqLworCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDEwICYmCisJICAgIGRybV9kcF9zaW5rX3N1cHBvcnRzX2RzYyhpbnRlbF9kcC0+ ZHNjX2RwY2QpKSB7CisJCWJwYyA9IG1pbl90KHU4LAorCQkJICAgIGRybV9kcF9kc2Nfc2lua19t YXhfY29sb3JfZGVwdGgoaW50ZWxfZHAtPmRzY19kcGNkKSwKKwkJCSAgICBEUF9EU0NfTUFYX1NV UFBPUlRFRF9CUEMpOworCQlpZiAoYnBjKQorCQkJYnBwID0gMyAqIGJwYzsKKwl9CisKIAlyZXR1 cm4gYnBwOwogfQogCkBAIC0xOTU0LDE0ICsxOTY2LDExIEBAIGludGVsX2RwX2NvbXB1dGVfbGlu a19jb25maWdfd2lkZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQkJCWxpbmtfY2xvY2sg PSBpbnRlbF9kcC0+Y29tbW9uX3JhdGVzW2Nsb2NrXTsKIAkJCQlsaW5rX2F2YWlsID0gaW50ZWxf ZHBfbWF4X2RhdGFfcmF0ZShsaW5rX2Nsb2NrLAogCQkJCQkJCQkgICAgbGFuZV9jb3VudCk7Ci0K LQkJCQlpZiAobW9kZV9yYXRlIDw9IGxpbmtfYXZhaWwpIHsKLQkJCQkJcGlwZV9jb25maWctPmxh bmVfY291bnQgPSBsYW5lX2NvdW50OwotCQkJCQlwaXBlX2NvbmZpZy0+cGlwZV9icHAgPSBicHA7 Ci0JCQkJCXBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrID0gbGlua19jbG9jazsKLQorCQkJCXBpcGVf Y29uZmlnLT5sYW5lX2NvdW50ID0gbGFuZV9jb3VudDsKKwkJCQlwaXBlX2NvbmZpZy0+cGlwZV9i cHAgPSBicHA7CisJCQkJcGlwZV9jb25maWctPnBvcnRfY2xvY2sgPSBsaW5rX2Nsb2NrOworCQkJ CWlmIChtb2RlX3JhdGUgPD0gbGlua19hdmFpbCkKIAkJCQkJcmV0dXJuIHRydWU7Ci0JCQkJfQog CQkJfQogCQl9CiAJfQpAQCAtMTk2OSwxMCArMTk3OCw4MyBAQCBpbnRlbF9kcF9jb21wdXRlX2xp bmtfY29uZmlnX3dpZGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAlyZXR1cm4gZmFsc2U7 CiB9CiAKK3N0YXRpYyBib29sIGludGVsX2RwX2RzY19jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwLAorCQkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25m aWcsCisJCQkJCXN0cnVjdCBsaW5rX2NvbmZpZ19saW1pdHMgKmxpbWl0cykKK3sKKwlzdHJ1Y3Qg aW50ZWxfZGlnaXRhbF9wb3J0ICpkaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRpZ19wb3J0LT5i YXNlLmJhc2UuZGV2KTsKKwlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9 ICZwaXBlX2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOworCWVudW0gcGlwZSBwaXBlID0gdG9f aW50ZWxfY3J0YyhwaXBlX2NvbmZpZy0+YmFzZS5jcnRjKS0+cGlwZTsKKwl1MTYgZHNjX21heF9v dXRwdXRfYnBwID0gMDsKKwl1OCBkc2NfZHBfc2xpY2VfY291bnQgPSAwOworCisJaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPCAxMCB8fAorCSAgICAhZHJtX2RwX3Npbmtfc3VwcG9ydHNfZHNjKGlu dGVsX2RwLT5kc2NfZHBjZCkpCisJCXJldHVybiBmYWxzZTsKKworCS8qIERQIERTQyBvbmx5IHN1 cHBvcnRlZCBvbiBQaXBlIEIgYW5kIEMgKi8KKwlpZiAocGlwZSA9PSBQSVBFX0EgJiYgIWludGVs X2RwX2lzX2VkcChpbnRlbF9kcCkpCisJCXJldHVybiBmYWxzZTsKKworCS8qIERTQyBub3Qgc3Vw cG9ydGVkIGZvciBEU0Mgc2luayBCUEMgPCA4ICovCisJaWYgKGxpbWl0cy0+bWF4X2JwcCA8IDMg KiBEUF9EU0NfTUlOX1NVUFBPUlRFRF9CUEMpIHsKKwkJRFJNX0RFQlVHX0tNUygiTm8gRFNDIHN1 cHBvcnQgZm9yIGxlc3MgdGhhbiA4YnBjXG4iKTsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCWlm IChpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKSB7CisJCXBpcGVfY29uZmlnLT5kc2NfcGFyYW1z LmNvbXByZXNzZWRfYnBwID0KKwkJCWRybV9lZHBfZHNjX3Npbmtfb3V0cHV0X2JwcChpbnRlbF9k cC0+ZHNjX2RwY2QpID4+IDQ7CisJCXBpcGVfY29uZmlnLT5kc2NfcGFyYW1zLnNsaWNlX2NvdW50 ID0KKwkJCWRybV9kcF9kc2Nfc2lua19tYXhfc2xpY2VfY291bnQoaW50ZWxfZHAtPmRzY19kcGNk LAorCQkJCQkJCXRydWUpOworCX0gZWxzZSB7CisJCWRzY19tYXhfb3V0cHV0X2JwcCA9CisJCQlp bnRlbF9kcF9kc2NfZ2V0X291dHB1dF9icHAocGlwZV9jb25maWctPnBvcnRfY2xvY2ssCisJCQkJ CQkgICAgcGlwZV9jb25maWctPmxhbmVfY291bnQsCisJCQkJCQkgICAgYWRqdXN0ZWRfbW9kZS0+ Y3J0Y19jbG9jaywKKwkJCQkJCSAgICBhZGp1c3RlZF9tb2RlLT5jcnRjX2hkaXNwbGF5KTsKKwkJ ZHNjX2RwX3NsaWNlX2NvdW50ID0KKwkJCWludGVsX2RwX2RzY19nZXRfc2xpY2VfY291bnQoaW50 ZWxfZHAsCisJCQkJCQkgICAgIGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2ssCisJCQkJCQkgICAg IGFkanVzdGVkX21vZGUtPmNydGNfaGRpc3BsYXkpOworCQlpZiAoIShkc2NfbWF4X291dHB1dF9i cHAgJiYgZHNjX2RwX3NsaWNlX2NvdW50KSkgeworCQkJRFJNX0RFQlVHX0tNUygiQ29tcHJlc3Nl ZCBCUFAvU2xpY2UgQ291bnQgbm90IHN1cHBvcnRlZFxuIik7CisJCQlyZXR1cm4gZmFsc2U7CisJ CX0KKwkJcGlwZV9jb25maWctPmRzY19wYXJhbXMuY29tcHJlc3NlZF9icHAgPSBkc2NfbWF4X291 dHB1dF9icHAgPj4gNDsKKwkJcGlwZV9jb25maWctPmRzY19wYXJhbXMuc2xpY2VfY291bnQgPSBk c2NfZHBfc2xpY2VfY291bnQ7CisJfQorCS8qCisJICogVkRTQyBlbmdpbmUgb3BlcmF0ZXMgYXQg MSBQaXhlbCBwZXIgY2xvY2ssIHNvIGlmIHBlYWsgcGl4ZWwgcmF0ZQorCSAqIGlzIGdyZWF0ZXIg dGhhbiB0aGUgbWF4aW11bSBDZGNsb2NrIGFuZCBpZiBzbGljZSBjb3VudCBpcyBldmVuCisJICog dGhlbiB3ZSBuZWVkIHRvIHVzZSAyIFZEU0MgaW5zdGFuY2VzLgorCSAqLworCXBpcGVfY29uZmln LT5kc2NfcGFyYW1zLmRzY19zcGxpdCA9IGZhbHNlOworCWlmIChhZGp1c3RlZF9tb2RlLT5jcnRj X2Nsb2NrID4gZGV2X3ByaXYtPm1heF9jZGNsa19mcmVxKSB7CisJCWlmIChwaXBlX2NvbmZpZy0+ ZHNjX3BhcmFtcy5zbGljZV9jb3VudCA+IDEpIHsKKwkJCXBpcGVfY29uZmlnLT5kc2NfcGFyYW1z LmRzY19zcGxpdCA9IHRydWU7CisJCX0gZWxzZSB7CisJCQlEUk1fREVCVUdfS01TKCJDYW5ub3Qg c3BsaXQgc3RyZWFtIHRvIHVzZSAyIFZEU0MgaW5zdGFuY2VzXG4iKTsKKwkJCXJldHVybiBmYWxz ZTsKKwkJfQorCX0KKwlwaXBlX2NvbmZpZy0+ZHNjX3BhcmFtcy5jb21wcmVzc2lvbl9lbmFibGUg PSB0cnVlOworCURSTV9ERUJVR19LTVMoIkRQIERTQyBjb21wdXRlZCB3aXRoIElucHV0IEJwcCA9 ICVkICIKKwkJICAgICAgIkNvbXByZXNzZWQgQnBwID0gJWQgU2xpY2UgQ291bnQgPSAlZFxuIiwK KwkJICAgICAgcGlwZV9jb25maWctPnBpcGVfYnBwLAorCQkgICAgICBwaXBlX2NvbmZpZy0+ZHNj X3BhcmFtcy5jb21wcmVzc2VkX2JwcCwKKwkJICAgICAgcGlwZV9jb25maWctPmRzY19wYXJhbXMu c2xpY2VfY291bnQpOworCisJcmV0dXJuIHRydWU7Cit9CisKIHN0YXRpYyBib29sCiBpbnRlbF9k cF9jb21wdXRlX2xpbmtfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJ ICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpCiB7CisJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAJ c3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPSAmcGlwZV9jb25maWctPmJh c2UuYWRqdXN0ZWRfbW9kZTsKIAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2lu dGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKIAlzdHJ1Y3QgbGlua19jb25maWdfbGltaXRzIGxpbWl0 czsKQEAgLTE5OTAsNyArMjA3Miw5IEBAIGludGVsX2RwX2NvbXB1dGVfbGlua19jb25maWcoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJbGltaXRzLm1pbl9sYW5lX2NvdW50ID0gMTsK IAlsaW1pdHMubWF4X2xhbmVfY291bnQgPSBpbnRlbF9kcF9tYXhfbGFuZV9jb3VudChpbnRlbF9k cCk7CiAKLQlsaW1pdHMubWluX2JwcCA9IDYgKiAzOworCWxpbWl0cy5taW5fYnBwID0gKElOVEVM X0dFTihkZXZfcHJpdikgPj0gMTAgJiYKKwkJCSAgZHJtX2RwX3Npbmtfc3VwcG9ydHNfZHNjKGlu dGVsX2RwLT5kc2NfZHBjZCkpID8KKwkJRFBfRFNDX01JTl9TVVBQT1JURURfQlBDICogMyA6IDYg KiAzOwogCWxpbWl0cy5tYXhfYnBwID0gaW50ZWxfZHBfY29tcHV0ZV9icHAoaW50ZWxfZHAsIHBp cGVfY29uZmlnKTsKIAogCWlmIChpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKSB7CkBAIC0yMDE3 LDE5ICsyMTAxLDQyIEBAIGludGVsX2RwX2NvbXB1dGVfbGlua19jb25maWcoc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXIsCiAJICogT3B0aW1pemUgZm9yIHNsb3cgYW5kIHdpZGUuIFRoaXMg aXMgdGhlIHBsYWNlIHRvIGFkZCBhbHRlcm5hdGl2ZQogCSAqIG9wdGltaXphdGlvbiBwb2xpY3ku CiAJICovCi0JaWYgKCFpbnRlbF9kcF9jb21wdXRlX2xpbmtfY29uZmlnX3dpZGUoaW50ZWxfZHAs IHBpcGVfY29uZmlnLCAmbGltaXRzKSkKLQkJcmV0dXJuIGZhbHNlOwotCi0JRFJNX0RFQlVHX0tN UygiRFAgbGFuZSBjb3VudCAlZCBjbG9jayAlZCBicHAgJWRcbiIsCi0JCSAgICAgIHBpcGVfY29u ZmlnLT5sYW5lX2NvdW50LCBwaXBlX2NvbmZpZy0+cG9ydF9jbG9jaywKLQkJICAgICAgcGlwZV9j b25maWctPnBpcGVfYnBwKTsKLQotCURSTV9ERUJVR19LTVMoIkRQIGxpbmsgcmF0ZSByZXF1aXJl ZCAlaSBhdmFpbGFibGUgJWlcbiIsCi0JCSAgICAgIGludGVsX2RwX2xpbmtfcmVxdWlyZWQoYWRq dXN0ZWRfbW9kZS0+Y3J0Y19jbG9jaywKLQkJCQkJICAgICBwaXBlX2NvbmZpZy0+cGlwZV9icHAp LAotCQkgICAgICBpbnRlbF9kcF9tYXhfZGF0YV9yYXRlKHBpcGVfY29uZmlnLT5wb3J0X2Nsb2Nr LAotCQkJCQkgICAgIHBpcGVfY29uZmlnLT5sYW5lX2NvdW50KSk7CisJaWYgKCFpbnRlbF9kcF9j b21wdXRlX2xpbmtfY29uZmlnX3dpZGUoaW50ZWxfZHAsIHBpcGVfY29uZmlnLAorCQkJCQkgICAg ICAgJmxpbWl0cykpIHsKKwkJRFJNX0RFQlVHX0tNUygiRFAgcmVxdWlyZWQgTGluayByYXRlICVp IGRvZXMgbm90IGZpdCBhdmFpbGFibGUgJWlcbiIsCisJCQkgICAgICBpbnRlbF9kcF9saW5rX3Jl cXVpcmVkKGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2ssCisJCQkJCQkgICAgIHBpcGVfY29uZmln LT5waXBlX2JwcCksCisJCQkgICAgICBpbnRlbF9kcF9tYXhfZGF0YV9yYXRlKHBpcGVfY29uZmln LT5wb3J0X2Nsb2NrLAorCQkJCQkJICAgICBwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCkpOworCisJ CS8qIGVuYWJsZSBjb21wcmVzc2lvbiBpZiB0aGUgbW9kZSBkb2Vzbid0IGZpdCBhdmFpbGFibGUg QlcgKi8KKwkJaWYgKCFpbnRlbF9kcF9kc2NfY29tcHV0ZV9jb25maWcoaW50ZWxfZHAsIHBpcGVf Y29uZmlnLAorCQkJCQkJICZsaW1pdHMpKQorCQkJcmV0dXJuIGZhbHNlOworCX0KKworCWlmIChw aXBlX2NvbmZpZy0+ZHNjX3BhcmFtcy5jb21wcmVzc2lvbl9lbmFibGUpIHsKKwkJRFJNX0RFQlVH X0tNUygiRFAgbGFuZSBjb3VudCAlZCBjbG9jayAlZCBJbnB1dCBicHAgJWQgQ29tcHJlc3NlZCBi cHAgJWRcbiIsCisJCQkgICAgICBwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCwgcGlwZV9jb25maWct PnBvcnRfY2xvY2ssCisJCQkgICAgICBwaXBlX2NvbmZpZy0+cGlwZV9icHAsCisJCQkgICAgICBw aXBlX2NvbmZpZy0+ZHNjX3BhcmFtcy5jb21wcmVzc2VkX2JwcCk7CisKKwkJRFJNX0RFQlVHX0tN UygiRFAgbGluayByYXRlIHJlcXVpcmVkICVpIGF2YWlsYWJsZSAlaVxuIiwKKwkJCSAgICAgIGlu dGVsX2RwX2xpbmtfcmVxdWlyZWQoYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jaywKKwkJCQkJCSAg ICAgcGlwZV9jb25maWctPmRzY19wYXJhbXMuY29tcHJlc3NlZF9icHApLAorCQkJICAgICAgaW50 ZWxfZHBfbWF4X2RhdGFfcmF0ZShwaXBlX2NvbmZpZy0+cG9ydF9jbG9jaywKKwkJCQkJCSAgICAg cGlwZV9jb25maWctPmxhbmVfY291bnQpKTsKKwl9IGVsc2UgeworCQlEUk1fREVCVUdfS01TKCJE UCBsYW5lIGNvdW50ICVkIGNsb2NrICVkIGJwcCAlZFxuIiwKKwkJCSAgICAgIHBpcGVfY29uZmln LT5sYW5lX2NvdW50LCBwaXBlX2NvbmZpZy0+cG9ydF9jbG9jaywKKwkJCSAgICAgIHBpcGVfY29u ZmlnLT5waXBlX2JwcCk7CiAKKwkJRFJNX0RFQlVHX0tNUygiRFAgbGluayByYXRlIHJlcXVpcmVk ICVpIGF2YWlsYWJsZSAlaVxuIiwKKwkJCSAgICAgIGludGVsX2RwX2xpbmtfcmVxdWlyZWQoYWRq dXN0ZWRfbW9kZS0+Y3J0Y19jbG9jaywKKwkJCQkJCSAgICAgcGlwZV9jb25maWctPnBpcGVfYnBw KSwKKwkJCSAgICAgIGludGVsX2RwX21heF9kYXRhX3JhdGUocGlwZV9jb25maWctPnBvcnRfY2xv Y2ssCisJCQkJCQkgICAgIHBpcGVfY29uZmlnLT5sYW5lX2NvdW50KSk7CisJfQogCXJldHVybiB0 cnVlOwogfQogCkBAIC0yMTA4LDcgKzIyMTUsOSBAQCBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZyhz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCWludGVsX2Nvbm5fc3RhdGUtPmJyb2Fk Y2FzdF9yZ2IgPT0gSU5URUxfQlJPQURDQVNUX1JHQl9MSU1JVEVEOwogCX0KIAotCWludGVsX2xp bmtfY29tcHV0ZV9tX24ocGlwZV9jb25maWctPnBpcGVfYnBwLCBwaXBlX2NvbmZpZy0+bGFuZV9j b3VudCwKKwlpbnRlbF9saW5rX2NvbXB1dGVfbV9uKHBpcGVfY29uZmlnLT5waXBlX2JwcCwKKwkJ CSAgICAgICBwaXBlX2NvbmZpZy0+ZHNjX3BhcmFtcy5jb21wcmVzc2VkX2JwcCwKKwkJCSAgICAg ICBwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCwKIAkJCSAgICAgICBhZGp1c3RlZF9tb2RlLT5jcnRj X2Nsb2NrLAogCQkJICAgICAgIHBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrLAogCQkJICAgICAgICZw aXBlX2NvbmZpZy0+ZHBfbV9uLApAQCAtMjExNyw3ICsyMjI2LDcgQEAgaW50ZWxfZHBfY29tcHV0 ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJaWYgKGludGVsX2Nvbm5l Y3Rvci0+cGFuZWwuZG93bmNsb2NrX21vZGUgIT0gTlVMTCAmJgogCQlkZXZfcHJpdi0+ZHJycy50 eXBlID09IFNFQU1MRVNTX0RSUlNfU1VQUE9SVCkgewogCQkJcGlwZV9jb25maWctPmhhc19kcnJz ID0gdHJ1ZTsKLQkJCWludGVsX2xpbmtfY29tcHV0ZV9tX24ocGlwZV9jb25maWctPnBpcGVfYnBw LAorCQkJaW50ZWxfbGlua19jb21wdXRlX21fbihwaXBlX2NvbmZpZy0+cGlwZV9icHAsIDAsCiAJ CQkJCSAgICAgICBwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCwKIAkJCQkJICAgICAgIGludGVsX2Nv bm5lY3Rvci0+cGFuZWwuZG93bmNsb2NrX21vZGUtPmNsb2NrLAogCQkJCQkgICAgICAgcGlwZV9j b25maWctPnBvcnRfY2xvY2ssCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcF9tc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCmluZGV4IDc3 OTIwZjFhM2RhMS4uMWYyNzY2ZTg3NmYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcF9tc3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3Qu YwpAQCAtODMsNyArODMsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9kcF9tc3RfY29tcHV0ZV9jb25m aWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCXJldHVybiBmYWxzZTsKIAl9CiAK LQlpbnRlbF9saW5rX2NvbXB1dGVfbV9uKGJwcCwgbGFuZV9jb3VudCwKKwlpbnRlbF9saW5rX2Nv bXB1dGVfbV9uKGJwcCwgMCwgbGFuZV9jb3VudCwKIAkJCSAgICAgICBhZGp1c3RlZF9tb2RlLT5j cnRjX2Nsb2NrLAogCQkJICAgICAgIHBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrLAogCQkJICAgICAg ICZwaXBlX2NvbmZpZy0+ZHBfbV9uLAotLSAKMi4xOC4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK