From: Manasi Navare Subject: [PATCH v2 12/23] drm/i915/dp: Compute DSC pipe config in atomic check Date: Tue, 31 Jul 2018 14:07:08 -0700 Message-ID: <1533071239-28815-13-git-send-email-manasi.d.navare@intel.com> References: <1533071239-28815-1-git-send-email-manasi.d.navare@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10BAF6E39F for ; Tue, 31 Jul 2018 21:04:52 +0000 (UTC) In-Reply-To: <1533071239-28815-1-git-send-email-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 List-Id: intel-gfx@lists.freedesktop.org RFNDIHBhcmFtcyBsaWtlIHRoZSBlbmFibGUsIGNvbXByZXNzZWQgYnBwLCBzbGljZSBvY3VudCBh bmQKZHNjX3NwbGl0IGFyZSBhZGRlZCB0byB0aGUgaW50ZWxfY3J0Y19zdGF0ZS4gVGhlc2UgcGFy YW1ldGVycwphcmUgc2V0IGJhc2VkIG9uIHRoZSByZXF1ZXN0ZWQgbW9kZSBhbmQgYXZhaWxhYmxl IGxpbmsgcGFyYW1ldGVycwpkdXJpbmcgdGhlIHBpcGUgY29uZmlndXJhdGlvbiBpbiBhdG9taWMg Y2hlY2sgcGhhc2UuClRoZXNlIHZhbHVlcyBhcmUgdGhlbiBsYXRlciB1c2VkIHRvIHBvcHVsYXRl IHRoZSByZW1haW5pbmcgRFNDCmFuZCBSQyBwYXJhbWV0ZXJzIGJlZm9yZSBlbmJhbGluZyBEU0Mg aW4gYXRvbWljIGNvbW1pdC4KCnY3OgoqIEZpeCBpbmRlbnRhdGlvbiBpbiBjb21wdXRlX21fbiAo TWFuYXNpKQoKdjYgKEZyb20gR2F1cmF2KToKKiBSZW1vdmUgZnVuY3Rpb24gY2FsbCBvZiBpbnRl bF9kcF9jb21wdXRlX2RzY19wYXJhbXMoKSBhbmQKaW52b2tlIGludGVsX2RwX2NvbXB1dGVfZHNj X3BhcmFtcygpIGluIHRoZSBwYXRjaCB3aGVyZQppdCBpcyBkZWZpbmVkIHRvIGZpeCBjb21waWxh dGlvbiB3YXJuaW5nIChHYXVyYXYpCgp2NToKQWRkIGRybV9kc2NfY2ZnIGluIGludGVsX2NydGNf c3RhdGUgKE1hbmFzaSkKCnY0OgoqIFJlYmFzZSBvbiByZWZhY3RvcmluZyBvZiBpbnRlbF9kcF9j b21wdXRlX2NvbmZpZyBvbiB0aXAgKE1hbmFzaSkKKiBBZGQgYSBjb21tZW50IHdoeSB3ZSBuZWVk IHRvIGNoZWNrIFBTUiB3aGlsZSBlbmFibGluZyBEU0MgKEdhdXJhdikKCnYzOgoqIENoZWNrIFBQ UiA+IG1heF9jZGNsb2NrIHRvIHVzZSAyIFZEU0MgaW5zdGFuY2VzIChWaWxsZSkKCnYyOgoqIEFk ZCBpZi1lbHNlIGZvciBlRFAvRFAgKEdhdXJhdikKCkNjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1 bGFAbGludXguaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyamFsYSA8dmlsbGUuc3lyamFsYUBsaW51 eC5pbnRlbC5jb20+CkNjOiBBbnVzaGEgU3JpdmF0c2EgPGFudXNoYS5zcml2YXRzYUBpbnRlbC5j b20+CkNjOiBHYXVyYXYgSyBTaW5naCA8Z2F1cmF2Lmsuc2luZ2hAaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBNYW5hc2kgTmF2YXJlIDxtYW5hc2kuZC5uYXZhcmVAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICAyMCArKystLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5oIHwgICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcC5jICAgICAgfCAxNDEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jICB8ICAgMiArLQogNCBmaWxl cyBjaGFuZ2VkLCAxNDIgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDU3N2IzMGQuLmRlODk1YWIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTY0NjAsNyArNjQ2MCw3IEBAIHN0YXRpYyBpbnQg aXJvbmxha2VfZmRpX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj LAogCiAJcGlwZV9jb25maWctPmZkaV9sYW5lcyA9IGxhbmU7CiAKLQlpbnRlbF9saW5rX2NvbXB1 dGVfbV9uKHBpcGVfY29uZmlnLT5waXBlX2JwcCwgbGFuZSwgZmRpX2RvdGNsb2NrLAorCWludGVs X2xpbmtfY29tcHV0ZV9tX24ocGlwZV9jb25maWctPnBpcGVfYnBwLCAwLCBsYW5lLCBmZGlfZG90 Y2xvY2ssCiAJCQkgICAgICAgbGlua19idywgJnBpcGVfY29uZmlnLT5mZGlfbV9uLCBmYWxzZSk7 CiAKIAlyZXQgPSBpcm9ubGFrZV9jaGVja19mZGlfbGFuZXMoZGV2LCBpbnRlbF9jcnRjLT5waXBl LCBwaXBlX2NvbmZpZyk7CkBAIC02Njk3LDE3ICs2Njk3LDI1IEBAIHN0YXRpYyB2b2lkIGNvbXB1 dGVfbV9uKHVuc2lnbmVkIGludCBtLCB1bnNpZ25lZCBpbnQgbiwKIH0KIAogdm9pZAotaW50ZWxf bGlua19jb21wdXRlX21fbihpbnQgYml0c19wZXJfcGl4ZWwsIGludCBubGFuZXMsCitpbnRlbF9s aW5rX2NvbXB1dGVfbV9uKGludCBiaXRzX3Blcl9waXhlbCwgdWludDE2X3QgY29tcHJlc3NlZF9i cHAsCisJCSAgICAgICBpbnQgbmxhbmVzLAogCQkgICAgICAgaW50IHBpeGVsX2Nsb2NrLCBpbnQg bGlua19jbG9jaywKIAkJICAgICAgIHN0cnVjdCBpbnRlbF9saW5rX21fbiAqbV9uLAogCQkgICAg ICAgYm9vbCByZWR1Y2VfbV9uKQogewogCW1fbi0+dHUgPSA2NDsKIAotCWNvbXB1dGVfbV9uKGJp dHNfcGVyX3BpeGVsICogcGl4ZWxfY2xvY2ssCi0JCSAgICBsaW5rX2Nsb2NrICogbmxhbmVzICog OCwKLQkJICAgICZtX24tPmdtY2hfbSwgJm1fbi0+Z21jaF9uLAotCQkgICAgcmVkdWNlX21fbik7 CisJLyogRm9yIERTQywgRGF0YSBNL04gY2FsY3VsYXRpb24gdXNlcyBjb21wcmVzc2VkIEJQUCAq LworCWlmIChjb21wcmVzc2VkX2JwcCkKKwkJY29tcHV0ZV9tX24oY29tcHJlc3NlZF9icHAgKiBw aXhlbF9jbG9jaywKKwkJCSAgICBsaW5rX2Nsb2NrICogbmxhbmVzICogOCwKKwkJCSAgICAmbV9u LT5nbWNoX20sICZtX24tPmdtY2hfbiwKKwkJCSAgICByZWR1Y2VfbV9uKTsKKwllbHNlCisJCWNv bXB1dGVfbV9uKGJpdHNfcGVyX3BpeGVsICogcGl4ZWxfY2xvY2ssCisJCQkgICAgbGlua19jbG9j ayAqIG5sYW5lcyAqIDgsCisJCQkgICAgJm1fbi0+Z21jaF9tLCAmbV9uLT5nbWNoX24sCisJCQkg ICAgcmVkdWNlX21fbik7CiAKIAljb21wdXRlX21fbihwaXhlbF9jbG9jaywgbGlua19jbG9jaywK IAkJICAgICZtX24tPmxpbmtfbSwgJm1fbi0+bGlua19uLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5oCmluZGV4IDBhNzlhNDYuLmJhMDEzZTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmgKQEAgLTM2MCw3ICszNjAsOCBAQCBzdHJ1Y3QgaW50ZWxfbGlua19tX24gewog CSAgICAgKF9faSkrKykgXAogCQlmb3JfZWFjaF9pZihwbGFuZSkKIAotdm9pZCBpbnRlbF9saW5r X2NvbXB1dGVfbV9uKGludCBicHAsIGludCBubGFuZXMsCit2b2lkIGludGVsX2xpbmtfY29tcHV0 ZV9tX24oaW50IGJwcCwgdWludDE2X3QgY29tcHJlc3NlZF9icHAsCisJCQkgICAgaW50IG5sYW5l cywKIAkJCSAgICBpbnQgcGl4ZWxfY2xvY2ssIGludCBsaW5rX2Nsb2NrLAogCQkJICAgIHN0cnVj dCBpbnRlbF9saW5rX21fbiAqbV9uLAogCQkJICAgIGJvb2wgcmVkdWNlX21fbik7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYwppbmRleCA4NDU5ZDc0Li43MTMyZjUyIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RwLmMKQEAgLTQ3LDYgKzQ3LDggQEAKIAogLyogRFAgRFNDIHNtYWxsIGpvaW5lciBoYXMgMiBG SUZPcyBlYWNoIG9mIDY0MCB4IDYgYnl0ZXMgKi8KICNkZWZpbmUgRFBfRFNDX01BWF9TTUFMTF9K T0lORVJfUkFNX0JVRkZFUgk2MTQ0MAorI2RlZmluZSBEUF9EU0NfTUlOX1NVUFBPUlRFRF9CUEMJ CTgKKyNkZWZpbmUgRFBfRFNDX01BWF9TVVBQT1JURURfQlBDCQkxMAogCiAvKiBEUCBEU0MgdGhy b3VnaHB1dCB2YWx1ZXMgdXNlZCBmb3Igc2xpY2UgY291bnQgY2FsY3VsYXRpb25zIEtQaXhlbHMv cyAqLwogI2RlZmluZSBEUF9EU0NfUEVBS19QSVhFTF9SQVRFCQkJMjcyMDAwMApAQCAtMTg5Nyw2 ICsxODk5LDE2IEBAIHN0YXRpYyBpbnQgaW50ZWxfZHBfY29tcHV0ZV9icHAoc3RydWN0IGludGVs X2RwICppbnRlbF9kcCwKIAkJfQogCX0KIAorCS8qIElmIERTQyBpcyBzdXBwb3J0ZWQsIHVzZSB0 aGUgbWF4IHZhbHVlIHJlcG9ydGVkIGJ5IHBhbmVsICovCisJaWYgKElOVEVMX0dFTihkZXZfcHJp dikgPj0gMTAgJiYKKwkgICAgZHJtX2RwX3Npbmtfc3VwcG9ydHNfZHNjKGludGVsX2RwLT5kc2Nf ZHBjZCkpIHsKKwkJYnBjID0gbWluX3QodTgsCisJCQkgICAgZHJtX2RwX2RzY19zaW5rX21heF9j b2xvcl9kZXB0aChpbnRlbF9kcC0+ZHNjX2RwY2QpLAorCQkJICAgIERQX0RTQ19NQVhfU1VQUE9S VEVEX0JQQyk7CisJCWlmICghYnBjKQorCQkJYnBwID0gMyAqIGJwYzsKKwl9CisKIAlyZXR1cm4g YnBwOwogfQogCkBAIC0xOTU3LDE0ICsxOTY5LDExIEBAIGludGVsX2RwX2NvbXB1dGVfbGlua19j b25maWdfd2lkZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQkJCWxpbmtfY2xvY2sgPSBp bnRlbF9kcC0+Y29tbW9uX3JhdGVzW2Nsb2NrXTsKIAkJCQlsaW5rX2F2YWlsID0gaW50ZWxfZHBf bWF4X2RhdGFfcmF0ZShsaW5rX2Nsb2NrLAogCQkJCQkJCQkgICAgbGFuZV9jb3VudCk7Ci0KLQkJ CQlpZiAobW9kZV9yYXRlIDw9IGxpbmtfYXZhaWwpIHsKLQkJCQkJcGlwZV9jb25maWctPmxhbmVf Y291bnQgPSBsYW5lX2NvdW50OwotCQkJCQlwaXBlX2NvbmZpZy0+cGlwZV9icHAgPSBicHA7Ci0J CQkJCXBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrID0gbGlua19jbG9jazsKLQorCQkJCXBpcGVfY29u ZmlnLT5sYW5lX2NvdW50ID0gbGFuZV9jb3VudDsKKwkJCQlwaXBlX2NvbmZpZy0+cGlwZV9icHAg PSBicHA7CisJCQkJcGlwZV9jb25maWctPnBvcnRfY2xvY2sgPSBsaW5rX2Nsb2NrOworCQkJCWlm IChtb2RlX3JhdGUgPD0gbGlua19hdmFpbCkKIAkJCQkJcmV0dXJuIHRydWU7Ci0JCQkJfQogCQkJ fQogCQl9CiAJfQpAQCAtMTk3MiwxMCArMTk4MSw4MiBAQCBpbnRlbF9kcF9jb21wdXRlX2xpbmtf Y29uZmlnX3dpZGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAlyZXR1cm4gZmFsc2U7CiB9 CiAKK3N0YXRpYyBib29sIGludGVsX2RwX2RzY19jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxf ZHAgKmludGVsX2RwLAorCQkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcs CisJCQkJCXN0cnVjdCBsaW5rX2NvbmZpZ19saW1pdHMgKmxpbWl0cykKK3sKKwlzdHJ1Y3QgaW50 ZWxfZGlnaXRhbF9wb3J0ICpkaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRpZ19wb3J0LT5iYXNl LmJhc2UuZGV2KTsKKwlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9ICZw aXBlX2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOworCWVudW0gcGlwZSBwaXBlID0gdG9faW50 ZWxfY3J0YyhwaXBlX2NvbmZpZy0+YmFzZS5jcnRjKS0+cGlwZTsKKwl1MTYgZHNjX21heF9vdXRw dXRfYnBwID0gMDsKKwl1OCBkc2NfZHBfc2xpY2VfY291bnQgPSAwOworCisJaWYgKElOVEVMX0dF TihkZXZfcHJpdikgPCAxMCB8fAorCSAgICAhZHJtX2RwX3Npbmtfc3VwcG9ydHNfZHNjKGludGVs X2RwLT5kc2NfZHBjZCkpCisJCXJldHVybiBmYWxzZTsKKworCS8qIERQIERTQyBvbmx5IHN1cHBv cnRlZCBvbiBQaXBlIEIgYW5kIEMgKi8KKwlpZiAocGlwZSA9PSBQSVBFX0EgJiYgIWludGVsX2Rw X2lzX2VkcChpbnRlbF9kcCkpCisJCXJldHVybiBmYWxzZTsKKworCS8qIERTQyBub3Qgc3VwcG9y dGVkIGZvciBEU0Mgc2luayBCUEMgPCA4ICovCisJaWYgKGxpbWl0cy0+bWF4X2JwcCA8IDMgKiBE UF9EU0NfTUlOX1NVUFBPUlRFRF9CUEMpIHsKKwkJRFJNX0RFQlVHX0tNUygiTm8gRFNDIHN1cHBv cnQgZm9yIGxlc3MgdGhhbiA4YnBjXG4iKTsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCWlmIChp bnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKSB7CisJCXBpcGVfY29uZmlnLT5kc2NfcGFyYW1zLmNv bXByZXNzZWRfYnBwID0KKwkJCWRybV9lZHBfZHNjX3Npbmtfb3V0cHV0X2JwcChpbnRlbF9kcC0+ ZHNjX2RwY2QpID4+IDQ7CisJCXBpcGVfY29uZmlnLT5kc2NfcGFyYW1zLnNsaWNlX2NvdW50ID0K KwkJCWRybV9kcF9kc2Nfc2lua19tYXhfc2xpY2VfY291bnQoaW50ZWxfZHAtPmRzY19kcGNkLAor CQkJCQkJCXRydWUpOworCX0gZWxzZSB7CisKKwkJZHNjX21heF9vdXRwdXRfYnBwID0gaW50ZWxf ZHBfZHNjX2dldF9vdXRwdXRfYnBwKHBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrLAorCQkJCQkJCQkg cGlwZV9jb25maWctPmxhbmVfY291bnQsCisJCQkJCQkJCSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Ns b2NrLAorCQkJCQkJCQkgYWRqdXN0ZWRfbW9kZS0+Y3J0Y19oZGlzcGxheSk7CisJCWRzY19kcF9z bGljZV9jb3VudCA9IGludGVsX2RwX2RzY19nZXRfc2xpY2VfY291bnQoaW50ZWxfZHAsCisJCQkJ CQkJCSAgYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jaywKKwkJCQkJCQkJICBhZGp1c3RlZF9tb2Rl LT5jcnRjX2hkaXNwbGF5KTsKKwkJaWYgKCEoZHNjX21heF9vdXRwdXRfYnBwICYmIGRzY19kcF9z bGljZV9jb3VudCkpIHsKKwkJCURSTV9ERUJVR19LTVMoIkNvbXByZXNzZWQgQlBQL1NsaWNlIENv dW50IG5vdCBzdXBwb3J0ZWRcbiIpOworCQkJcmV0dXJuIGZhbHNlOworCQl9CisJCXBpcGVfY29u ZmlnLT5kc2NfcGFyYW1zLmNvbXByZXNzZWRfYnBwID0gZHNjX21heF9vdXRwdXRfYnBwID4+IDQ7 CisJCXBpcGVfY29uZmlnLT5kc2NfcGFyYW1zLnNsaWNlX2NvdW50ID0gZHNjX2RwX3NsaWNlX2Nv dW50OworCX0KKwkvKgorCSAqIFZEU0MgZW5naW5lIG9wZXJhdGVzIGF0IDEgUGl4ZWwgcGVyIGNs b2NrLCBzbyBpZiBwZWFrIHBpeGVsIHJhdGUKKwkgKiBpcyBncmVhdGVyIHRoYW4gdGhlIG1heGlt dW0gQ2RjbG9jayBhbmQgaWYgc2xpY2UgY291bnQgaXMgZXZlbgorCSAqIHRoZW4gd2UgbmVlZCB0 byB1c2UgMiBWRFNDIGluc3RhbmNlcy4KKwkgKi8KKwlwaXBlX2NvbmZpZy0+ZHNjX3BhcmFtcy5k c2Nfc3BsaXQgPSBmYWxzZTsKKwlpZiAoYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jayA+IGRldl9w cml2LT5tYXhfY2RjbGtfZnJlcSkgeworCQlpZiAocGlwZV9jb25maWctPmRzY19wYXJhbXMuc2xp Y2VfY291bnQgPiAxKSB7CisJCQlwaXBlX2NvbmZpZy0+ZHNjX3BhcmFtcy5kc2Nfc3BsaXQgPSB0 cnVlOworCQl9IGVsc2UgeworCQkJRFJNX0RFQlVHX0tNUygiQ2Fubm90IHNwbGl0IHN0cmVhbSB0 byB1c2UgMiBWRFNDIGluc3RhbmNlc1xuIik7CisJCQlyZXR1cm4gZmFsc2U7CisJCX0KKwl9CisJ cGlwZV9jb25maWctPmRzY19wYXJhbXMuY29tcHJlc3Npb25fZW5hYmxlID0gdHJ1ZTsKKwlEUk1f REVCVUdfS01TKCJEUCBEU0MgY29tcHV0ZWQgd2l0aCBJbnB1dCBCcHAgPSAlZCAiCisJCSAgICAg ICJDb21wcmVzc2VkIEJwcCA9ICVkIFNsaWNlIENvdW50ID0gJWRcbiIsCisJCSAgICAgIHBpcGVf Y29uZmlnLT5waXBlX2JwcCwKKwkJICAgICAgcGlwZV9jb25maWctPmRzY19wYXJhbXMuY29tcHJl c3NlZF9icHAsCisJCSAgICAgIHBpcGVfY29uZmlnLT5kc2NfcGFyYW1zLnNsaWNlX2NvdW50KTsK KworCXJldHVybiB0cnVlOworfQorCiBzdGF0aWMgYm9vbAogaW50ZWxfZHBfY29tcHV0ZV9saW5r X2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCSAgICAgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwogCXN0cnVjdCBkcm1fZGlz cGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0gJnBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21v ZGU7CiAJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGVuY190b19pbnRlbF9kcCgmZW5jb2Rl ci0+YmFzZSk7CiAJc3RydWN0IGxpbmtfY29uZmlnX2xpbWl0cyBsaW1pdHM7CkBAIC0xOTkzLDcg KzIwNzQsOSBAQCBpbnRlbF9kcF9jb21wdXRlX2xpbmtfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyLAogCWxpbWl0cy5taW5fbGFuZV9jb3VudCA9IDE7CiAJbGltaXRzLm1heF9s YW5lX2NvdW50ID0gaW50ZWxfZHBfbWF4X2xhbmVfY291bnQoaW50ZWxfZHApOwogCi0JbGltaXRz Lm1pbl9icHAgPSA2ICogMzsKKwlsaW1pdHMubWluX2JwcCA9IChJTlRFTF9HRU4oZGV2X3ByaXYp ID49IDEwICYmCisJCQkgIGRybV9kcF9zaW5rX3N1cHBvcnRzX2RzYyhpbnRlbF9kcC0+ZHNjX2Rw Y2QpKSA/CisJCURQX0RTQ19NSU5fU1VQUE9SVEVEX0JQQyAqIDMgOiA2ICogMzsKIAlsaW1pdHMu bWF4X2JwcCA9IGludGVsX2RwX2NvbXB1dGVfYnBwKGludGVsX2RwLCBwaXBlX2NvbmZpZyk7CiAK IAlpZiAoaW50ZWxfZHBfaXNfZWRwKGludGVsX2RwKSkgewpAQCAtMjAyMCwxOSArMjEwMyw0MyBA QCBpbnRlbF9kcF9jb21wdXRlX2xpbmtfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyLAogCSAqIE9wdGltaXplIGZvciBzbG93IGFuZCB3aWRlLiBUaGlzIGlzIHRoZSBwbGFjZSB0 byBhZGQgYWx0ZXJuYXRpdmUKIAkgKiBvcHRpbWl6YXRpb24gcG9saWN5LgogCSAqLwotCWlmICgh aW50ZWxfZHBfY29tcHV0ZV9saW5rX2NvbmZpZ193aWRlKGludGVsX2RwLCBwaXBlX2NvbmZpZywg JmxpbWl0cykpCi0JCXJldHVybiBmYWxzZTsKKwlpZiAoIWludGVsX2RwX2NvbXB1dGVfbGlua19j b25maWdfd2lkZShpbnRlbF9kcCwgcGlwZV9jb25maWcsCisJCQkJCSAgICAgICAmbGltaXRzKSkg ewogCi0JRFJNX0RFQlVHX0tNUygiRFAgbGFuZSBjb3VudCAlZCBjbG9jayAlZCBicHAgJWRcbiIs Ci0JCSAgICAgIHBpcGVfY29uZmlnLT5sYW5lX2NvdW50LCBwaXBlX2NvbmZpZy0+cG9ydF9jbG9j aywKLQkJICAgICAgcGlwZV9jb25maWctPnBpcGVfYnBwKTsKKwkJRFJNX0RFQlVHX0tNUygiRFAg cmVxdWlyZWQgTGluayByYXRlICVpIGRvZXMgbm90IGZpdCBhdmFpbGFibGUgJWlcbiIsCisJCQkg ICAgICBpbnRlbF9kcF9saW5rX3JlcXVpcmVkKGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2ssCisJ CQkJCQkgICAgIHBpcGVfY29uZmlnLT5waXBlX2JwcCksCisJCQkgICAgICBpbnRlbF9kcF9tYXhf ZGF0YV9yYXRlKHBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrLAorCQkJCQkJICAgICBwaXBlX2NvbmZp Zy0+bGFuZV9jb3VudCkpOworCisJCS8qIGVuYWJsZSBjb21wcmVzc2lvbiBpZiB0aGUgbW9kZSBk b2Vzbid0IGZpdCBhdmFpbGFibGUgQlcgKi8KKwkJaWYgKCFpbnRlbF9kcF9kc2NfY29tcHV0ZV9j b25maWcoaW50ZWxfZHAsIHBpcGVfY29uZmlnLAorCQkJCQkJICZsaW1pdHMpKQorCQkJcmV0dXJu IGZhbHNlOworCX0KKworCWlmIChwaXBlX2NvbmZpZy0+ZHNjX3BhcmFtcy5jb21wcmVzc2lvbl9l bmFibGUpIHsKKwkJRFJNX0RFQlVHX0tNUygiRFAgbGFuZSBjb3VudCAlZCBjbG9jayAlZCBJbnB1 dCBicHAgJWQgQ29tcHJlc3NlZCBicHAgJWRcbiIsCisJCQkgICAgICBwaXBlX2NvbmZpZy0+bGFu ZV9jb3VudCwgcGlwZV9jb25maWctPnBvcnRfY2xvY2ssCisJCQkgICAgICBwaXBlX2NvbmZpZy0+ cGlwZV9icHAsCisJCQkgICAgICBwaXBlX2NvbmZpZy0+ZHNjX3BhcmFtcy5jb21wcmVzc2VkX2Jw cCk7CiAKIAlEUk1fREVCVUdfS01TKCJEUCBsaW5rIHJhdGUgcmVxdWlyZWQgJWkgYXZhaWxhYmxl ICVpXG4iLAogCQkgICAgICBpbnRlbF9kcF9saW5rX3JlcXVpcmVkKGFkanVzdGVkX21vZGUtPmNy dGNfY2xvY2ssCi0JCQkJCSAgICAgcGlwZV9jb25maWctPnBpcGVfYnBwKSwKKwkJCQkJICAgICBw aXBlX2NvbmZpZy0+ZHNjX3BhcmFtcy5jb21wcmVzc2VkX2JwcCksCiAJCSAgICAgIGludGVsX2Rw X21heF9kYXRhX3JhdGUocGlwZV9jb25maWctPnBvcnRfY2xvY2ssCiAJCQkJCSAgICAgcGlwZV9j b25maWctPmxhbmVfY291bnQpKTsKKwl9IGVsc2UgeworCQlEUk1fREVCVUdfS01TKCJEUCBsYW5l IGNvdW50ICVkIGNsb2NrICVkIGJwcCAlZFxuIiwKKwkJCSAgICAgIHBpcGVfY29uZmlnLT5sYW5l X2NvdW50LCBwaXBlX2NvbmZpZy0+cG9ydF9jbG9jaywKKwkJCSAgICAgIHBpcGVfY29uZmlnLT5w aXBlX2JwcCk7CiAKKwlEUk1fREVCVUdfS01TKCJEUCBsaW5rIHJhdGUgcmVxdWlyZWQgJWkgYXZh aWxhYmxlICVpXG4iLAorCQkgICAgICBpbnRlbF9kcF9saW5rX3JlcXVpcmVkKGFkanVzdGVkX21v ZGUtPmNydGNfY2xvY2ssCisJCQkJCSAgICAgcGlwZV9jb25maWctPnBpcGVfYnBwKSwKKwkJICAg ICAgaW50ZWxfZHBfbWF4X2RhdGFfcmF0ZShwaXBlX2NvbmZpZy0+cG9ydF9jbG9jaywKKwkJCQkJ ICAgICBwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCkpOworCX0KIAlyZXR1cm4gdHJ1ZTsKIH0KIApA QCAtMjExMSw3ICsyMjE4LDkgQEAgaW50ZWxfZHBfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXIsCiAJCQlpbnRlbF9jb25uX3N0YXRlLT5icm9hZGNhc3RfcmdiID09 IElOVEVMX0JST0FEQ0FTVF9SR0JfTElNSVRFRDsKIAl9CiAKLQlpbnRlbF9saW5rX2NvbXB1dGVf bV9uKHBpcGVfY29uZmlnLT5waXBlX2JwcCwgcGlwZV9jb25maWctPmxhbmVfY291bnQsCisJaW50 ZWxfbGlua19jb21wdXRlX21fbihwaXBlX2NvbmZpZy0+cGlwZV9icHAsCisJCQkgICAgICAgcGlw ZV9jb25maWctPmRzY19wYXJhbXMuY29tcHJlc3NlZF9icHAsCisJCQkgICAgICAgcGlwZV9jb25m aWctPmxhbmVfY291bnQsCiAJCQkgICAgICAgYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jaywKIAkJ CSAgICAgICBwaXBlX2NvbmZpZy0+cG9ydF9jbG9jaywKIAkJCSAgICAgICAmcGlwZV9jb25maWct PmRwX21fbiwKQEAgLTIxMjAsNyArMjIyOSw3IEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCWlmIChpbnRlbF9jb25uZWN0b3ItPnBhbmVs LmRvd25jbG9ja19tb2RlICE9IE5VTEwgJiYKIAkJZGV2X3ByaXYtPmRycnMudHlwZSA9PSBTRUFN TEVTU19EUlJTX1NVUFBPUlQpIHsKIAkJCXBpcGVfY29uZmlnLT5oYXNfZHJycyA9IHRydWU7Ci0J CQlpbnRlbF9saW5rX2NvbXB1dGVfbV9uKHBpcGVfY29uZmlnLT5waXBlX2JwcCwKKwkJCWludGVs X2xpbmtfY29tcHV0ZV9tX24ocGlwZV9jb25maWctPnBpcGVfYnBwLCAwLAogCQkJCQkgICAgICAg cGlwZV9jb25maWctPmxhbmVfY291bnQsCiAJCQkJCSAgICAgICBpbnRlbF9jb25uZWN0b3ItPnBh bmVsLmRvd25jbG9ja19tb2RlLT5jbG9jaywKIAkJCQkJICAgICAgIHBpcGVfY29uZmlnLT5wb3J0 X2Nsb2NrLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYwppbmRleCAzNTJlNTIxLi40Zjk0 MWI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYwpAQCAtODMsNyArODMsNyBAQCBz dGF0aWMgYm9vbCBpbnRlbF9kcF9tc3RfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXIsCiAJCXJldHVybiBmYWxzZTsKIAl9CiAKLQlpbnRlbF9saW5rX2NvbXB1dGVf bV9uKGJwcCwgbGFuZV9jb3VudCwKKwlpbnRlbF9saW5rX2NvbXB1dGVfbV9uKGJwcCwgMCwgbGFu ZV9jb3VudCwKIAkJCSAgICAgICBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrLAogCQkJICAgICAg IHBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrLAogCQkJICAgICAgICZwaXBlX2NvbmZpZy0+ZHBfbV9u LAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=