From: Mika Kuoppala Subject: [PATCH 4/8] drm/i915: Make execlist port count variable Date: Tue, 12 Sep 2017 11:36:14 +0300 Message-ID: <20170912083618.13009-5-mika.kuoppala@intel.com> References: <20170912083618.13009-1-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCF8B6E57F for ; Tue, 12 Sep 2017 08:39:49 +0000 (UTC) In-Reply-To: <20170912083618.13009-1-mika.kuoppala@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 R3VDIGNhbiBoYW5kbGUgbW9yZSB0aGFuIHR3byBzdWJtaXNzaW9uIHBvcnRzLiBNYWtlIHBvcnQg Y291bnQKdmFyaWFibGUgdG8gcHJlcGFyZSBzdXBwb3J0aW5nIG1vcmUgdGhhbiAyIHBvcnRzLgoK U2lnbmVkLW9mZi1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICAgICAgIHwgIDggKysrKy0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICB8ICAzICsrLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyAgICAgIHwgMTcgKysrKysrKysr KysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8ICA4 ICsrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAy NCArKysrKysrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaCAgICB8IDIzICsrKysrKysrKysrKysrKysrKy0tLS0tCiA2IGZpbGVzIGNoYW5n ZWQsIDU4IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMKaW5kZXggY2MzNjQwOTkzNmRjLi43N2FjNzc1ZTMxMmQgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0zMzE1LDYgKzMzMTUsNyBAQCBzdGF0aWMgaW50IGk5 MTVfZW5naW5lX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAJCQkgICB1 cHBlcl8zMl9iaXRzKGFkZHIpLCBsb3dlcl8zMl9iaXRzKGFkZHIpKTsKIAogCQlpZiAoaTkxNS5l bmFibGVfZXhlY2xpc3RzKSB7CisJCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0ICogY29u c3QgZWwgPSAmZW5naW5lLT5leGVjbGlzdDsKIAkJCXUzMiBwdHIsIHJlYWQsIHdyaXRlOwogCQkJ dW5zaWduZWQgaW50IGlkeDsKIApAQCAtMzM0NCwxMSArMzM0NSwxMCBAQCBzdGF0aWMgaW50IGk5 MTVfZW5naW5lX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAJCQl9CiAK IAkJCXJjdV9yZWFkX2xvY2soKTsKLQkJCWZvciAoaWR4ID0gMDsgaWR4IDwgQVJSQVlfU0laRShl bmdpbmUtPmV4ZWNsaXN0LnBvcnQpOyBpZHgrKykgeworCQkJZm9yIChpZHggPSAwOyBpZHggPCBl eGVjbGlzdF9udW1fcG9ydHMoZWwpOyBpZHgrKykgewogCQkJCXVuc2lnbmVkIGludCBjb3VudDsK IAotCQkJCXJxID0gcG9ydF91bnBhY2soJmVuZ2luZS0+ZXhlY2xpc3QucG9ydFtpZHhdLAotCQkJ CQkJICZjb3VudCk7CisJCQkJcnEgPSBwb3J0X3VucGFjaygmZWwtPnBvcnRbaWR4XSwgJmNvdW50 KTsKIAkJCQlpZiAocnEpIHsKIAkJCQkJc2VxX3ByaW50ZihtLCAiXHRcdEVMU1BbJWRdIGNvdW50 PSVkLCAiLAogCQkJCQkJICAgaWR4LCBjb3VudCk7CkBAIC0zMzYxLDcgKzMzNjEsNyBAQCBzdGF0 aWMgaW50IGk5MTVfZW5naW5lX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQp CiAJCQlyY3VfcmVhZF91bmxvY2soKTsKIAogCQkJc3Bpbl9sb2NrX2lycSgmZW5naW5lLT50aW1l bGluZS0+bG9jayk7Ci0JCQlmb3IgKHJiID0gZW5naW5lLT5leGVjbGlzdC5maXJzdDsgcmI7IHJi ID0gcmJfbmV4dChyYikpIHsKKwkJCWZvciAocmIgPSBlbC0+Zmlyc3Q7IHJiOyByYiA9IHJiX25l eHQocmIpKSB7CiAJCQkJc3RydWN0IGk5MTVfcHJpb2xpc3QgKnAgPQogCQkJCQlyYl9lbnRyeShy YiwgdHlwZW9mKCpwKSwgbm9kZSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDFjYzMx YTViMDQ5Zi4uZmQwNjhhYzY2Mzg4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTEwMDEs NyArMTAwMSw4IEBAIHN0cnVjdCBpOTE1X2dwdV9zdGF0ZSB7CiAJCQl1MzIgc2Vxbm87CiAJCQl1 MzIgaGVhZDsKIAkJCXUzMiB0YWlsOwotCQl9ICpyZXF1ZXN0cywgZXhlY2xpc3RbMl07CisJCX0g KnJlcXVlc3RzLCBleGVjbGlzdFtFWEVDTElTVF9NQVhfUE9SVFNdOworCQl1bnNpZ25lZCBpbnQg bnVtX3BvcnRzOwogCiAJCXN0cnVjdCBkcm1faTkxNV9lcnJvcl93YWl0ZXIgewogCQkJY2hhciBj b21tW1RBU0tfQ09NTV9MRU5dOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5k ZXggNjExNGJmNzkyMTlkLi5lMDQ4ZDcxM2Y3MmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n cHVfZXJyb3IuYwpAQCAtMzk2LDYgKzM5Niw4IEBAIHN0YXRpYyB2b2lkIGVycm9yX3ByaW50X2Nv bnRleHQoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIHN0YXRpYyB2b2lkIGVy cm9yX3ByaW50X2VuZ2luZShzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkJ ICAgICAgIGNvbnN0IHN0cnVjdCBkcm1faTkxNV9lcnJvcl9lbmdpbmUgKmVlKQogeworCWludCBu OworCiAJZXJyX3ByaW50ZihtLCAiJXMgY29tbWFuZCBzdHJlYW06XG4iLCBlbmdpbmVfc3RyKGVl LT5lbmdpbmVfaWQpKTsKIAllcnJfcHJpbnRmKG0sICIgIFNUQVJUOiAweCUwOHhcbiIsIGVlLT5z dGFydCk7CiAJZXJyX3ByaW50ZihtLCAiICBIRUFEOiAgMHglMDh4IFsweCUwOHhdXG4iLCBlZS0+ aGVhZCwgZWUtPnJxX2hlYWQpOwpAQCAtNDY1LDggKzQ2NywxMSBAQCBzdGF0aWMgdm9pZCBlcnJv cl9wcmludF9lbmdpbmUoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAkJICAg amlmZmllc190b19tc2VjcyhqaWZmaWVzIC0gZWUtPmhhbmdjaGVja190aW1lc3RhbXApKTsKIAll cnJfcHJpbnRmKG0sICIgIGVuZ2luZSByZXNldCBjb3VudDogJXVcbiIsIGVlLT5yZXNldF9jb3Vu dCk7CiAKLQllcnJvcl9wcmludF9yZXF1ZXN0KG0sICIgIEVMU1BbMF06ICIsICZlZS0+ZXhlY2xp c3RbMF0pOwotCWVycm9yX3ByaW50X3JlcXVlc3QobSwgIiAgRUxTUFsxXTogIiwgJmVlLT5leGVj bGlzdFsxXSk7CisJZm9yIChuID0gMDsgbiA8IGVlLT5udW1fcG9ydHM7IG4rKykgeworCQllcnJf cHJpbnRmKG0sICIgIEVMU1BbJWRdOiIsIG4pOworCQllcnJvcl9wcmludF9yZXF1ZXN0KG0sICIg IiwgJmVlLT5leGVjbGlzdFtuXSk7CisJfQorCiAJZXJyb3JfcHJpbnRfY29udGV4dChtLCAiICBB Y3RpdmUgY29udGV4dDogIiwgJmVlLT5jb250ZXh0KTsKIH0KIApAQCAtMTMyNywxNyArMTMzMiwx OSBAQCBzdGF0aWMgdm9pZCBlbmdpbmVfcmVjb3JkX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSwKIHN0YXRpYyB2b2lkIGVycm9yX3JlY29yZF9lbmdpbmVfZXhlY2xpc3Rz KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJCQkJICBzdHJ1Y3QgZHJtX2k5MTVf ZXJyb3JfZW5naW5lICplZSkKIHsKLQljb25zdCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9 IGVuZ2luZS0+ZXhlY2xpc3QucG9ydDsKKwljb25zdCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNs aXN0ICogY29uc3QgZWwgPSAmZW5naW5lLT5leGVjbGlzdDsKIAl1bnNpZ25lZCBpbnQgbjsKIAot CWZvciAobiA9IDA7IG4gPCBBUlJBWV9TSVpFKGVuZ2luZS0+ZXhlY2xpc3QucG9ydCk7IG4rKykg ewotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxID0gcG9ydF9yZXF1ZXN0KCZwb3J0 W25dKTsKKwlmb3IgKG4gPSAwOyBuIDwgZXhlY2xpc3RfbnVtX3BvcnRzKGVsKTsgbisrKSB7CisJ CXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEgPSBwb3J0X3JlcXVlc3QoJmVsLT5wb3J0 W25dKTsKIAogCQlpZiAoIXJxKQogCQkJYnJlYWs7CiAKIAkJcmVjb3JkX3JlcXVlc3QocnEsICZl ZS0+ZXhlY2xpc3Rbbl0pOwogCX0KKworCWVlLT5udW1fcG9ydHMgPSBuOwogfQogCiBzdGF0aWMg dm9pZCByZWNvcmRfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfY29udGV4dCAqZSwKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCAzMzZkMjJlYTUy MTYuLmMzOGEzZTcxZTI4NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n dWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYwpAQCAtNjYzLDYgKzY2Myw4IEBAIHN0YXRpYyBib29sIGk5MTVfZ3VjX2RlcXVldWUo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVf ZXhlY2xpc3QgKiBjb25zdCBlbCA9ICZlbmdpbmUtPmV4ZWNsaXN0OwogCXN0cnVjdCBleGVjbGlz dF9wb3J0ICpwb3J0ID0gZWwtPnBvcnQ7CisJY29uc3Qgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKiBj b25zdCBsYXN0X3BvcnQgPQorCQkmZWwtPnBvcnRbZWwtPnBvcnRfbWFza107CiAJc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpsYXN0ID0gcG9ydF9yZXF1ZXN0KHBvcnQpOwogCXN0cnVjdCBy Yl9ub2RlICpyYjsKIAlib29sIHN1Ym1pdCA9IGZhbHNlOwpAQCAtNjc2LDcgKzY3OCw3IEBAIHN0 YXRpYyBib29sIGk5MTVfZ3VjX2RlcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQogCiAJCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShycSwgcm4sICZwLT5yZXF1ZXN0cywgcHJp b3RyZWUubGluaykgewogCQkJaWYgKGxhc3QgJiYgcnEtPmN0eCAhPSBsYXN0LT5jdHgpIHsKLQkJ CQlpZiAocG9ydCAhPSBlbC0+cG9ydCkgeworCQkJCWlmIChwb3J0ID09IGxhc3RfcG9ydCkgewog CQkJCQlfX2xpc3RfZGVsX21hbnkoJnAtPnJlcXVlc3RzLAogCQkJCQkJCSZycS0+cHJpb3RyZWUu bGluayk7CiAJCQkJCWdvdG8gZG9uZTsKQEAgLTcxNiw2ICs3MTgsOCBAQCBzdGF0aWMgdm9pZCBp OTE1X2d1Y19pcnFfaGFuZGxlcih1bnNpZ25lZCBsb25nIGRhdGEpCiAJc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqIGNvbnN0IGVuZ2luZSA9IChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICopZGF0YTsK IAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0ICogY29uc3QgZWwgPSAmZW5naW5lLT5leGVj bGlzdDsKIAlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGVsLT5wb3J0OworCWNvbnN0IHN0 cnVjdCBleGVjbGlzdF9wb3J0ICogY29uc3QgbGFzdF9wb3J0ID0KKwkJJmVsLT5wb3J0W2VsLT5w b3J0X21hc2tdOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7CiAJYm9vbCBzdWJt aXQ7CiAKQEAgLTczMSw3ICs3MzUsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2d1Y19pcnFfaGFuZGxl cih1bnNpZ25lZCBsb25nIGRhdGEpCiAJCX0KIAogCQlzdWJtaXQgPSBmYWxzZTsKLQkJaWYgKCFw b3J0X2NvdW50KCZwb3J0WzFdKSkKKwkJaWYgKCFwb3J0X2NvdW50KGxhc3RfcG9ydCkpCiAJCQlz dWJtaXQgPSBpOTE1X2d1Y19kZXF1ZXVlKGVuZ2luZSk7CiAJfSB3aGlsZSAoc3VibWl0KTsKIH0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNzM2MjZkYmNlZjUwLi40NzUyZDcxZGQ2NDQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0zNDMsNyArMzQzLDcgQEAgc3RhdGljIHZv aWQgZXhlY2xpc3RzX3N1Ym1pdF9wb3J0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CiAJCWVuZ2luZS0+aTkxNS0+cmVncyArIGk5MTVfbW1pb19yZWdfb2Zmc2V0KFJJTkdfRUxTUChl bmdpbmUpKTsKIAl1bnNpZ25lZCBpbnQgbjsKIAotCWZvciAobiA9IEFSUkFZX1NJWkUoZW5naW5l LT5leGVjbGlzdC5wb3J0KTsgbi0tOyApIHsKKwlmb3IgKG4gPSBleGVjbGlzdF9udW1fcG9ydHMo JmVuZ2luZS0+ZXhlY2xpc3QpOyBuLS07ICkgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJxOwogCQl1bnNpZ25lZCBpbnQgY291bnQ7CiAJCXU2NCBkZXNjOwpAQCAtNDAwLDYgKzQw MCw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmxhc3Q7CiAJc3RydWN0 IGludGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsID0gJmVuZ2luZS0+ZXhlY2xpc3Q7CiAJ c3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbC0+cG9ydDsKKwljb25zdCBzdHJ1Y3QgZXhl Y2xpc3RfcG9ydCAqIGNvbnN0IGxhc3RfcG9ydCA9CisJCSZlbC0+cG9ydFtlbC0+cG9ydF9tYXNr XTsKIAlzdHJ1Y3QgcmJfbm9kZSAqcmI7CiAJYm9vbCBzdWJtaXQgPSBmYWxzZTsKIApAQCAtNDU5 LDcgKzQ2MSw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKIAkJCQkgKiBjb21iaW5lIHRoaXMgcmVxdWVzdCB3aXRoIHRoZSBs YXN0LCB0aGVuIHdlCiAJCQkJICogYXJlIGRvbmUuCiAJCQkJICovCi0JCQkJaWYgKHBvcnQgIT0g ZWwtPnBvcnQpIHsKKwkJCQlpZiAocG9ydCA9PSBsYXN0X3BvcnQpIHsKIAkJCQkJX19saXN0X2Rl bF9tYW55KCZwLT5yZXF1ZXN0cywKIAkJCQkJCQkmcnEtPnByaW90cmVlLmxpbmspOwogCQkJCQln b3RvIGRvbmU7CkBAIC0xMjM2LDcgKzEyMzgsNyBAQCBzdGF0aWMgdTggZ3RpaXJbXSA9IHsKIHN0 YXRpYyBpbnQgZ2VuOF9pbml0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5 MTU7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0LnBvcnQ7 CisJc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsID0gJmVuZ2luZS0+ZXhl Y2xpc3Q7CiAJdW5zaWduZWQgaW50IG47CiAJYm9vbCBzdWJtaXQ7CiAJaW50IHJldDsKQEAgLTEy NzQsMTYgKzEyNzYsMTggQEAgc3RhdGljIGludCBnZW44X2luaXRfY29tbW9uX3Jpbmcoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCiAJLyogQWZ0ZXIgYSBHUFUgcmVzZXQsIHdlIG1h eSBoYXZlIHJlcXVlc3RzIHRvIHJlcGxheSAqLwogCXN1Ym1pdCA9IGZhbHNlOwotCWZvciAobiA9 IDA7IG4gPCBBUlJBWV9TSVpFKGVuZ2luZS0+ZXhlY2xpc3QucG9ydCk7IG4rKykgewotCQlpZiAo IXBvcnRfaXNzZXQoJnBvcnRbbl0pKQorCWZvciAobiA9IDA7IG4gPCBleGVjbGlzdF9udW1fcG9y dHMoZWwpOyBuKyspIHsKKwkJc3RydWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBwb3J0ID0gJmVs LT5wb3J0W25dOworCisJCWlmICghcG9ydF9pc3NldChwb3J0KSkKIAkJCWJyZWFrOwogCiAJCURS TV9ERUJVR19EUklWRVIoIlJlc3RhcnRpbmcgJXM6JWQgZnJvbSAweCV4XG4iLAogCQkJCSBlbmdp bmUtPm5hbWUsIG4sCi0JCQkJIHBvcnRfcmVxdWVzdCgmcG9ydFtuXSktPmdsb2JhbF9zZXFubyk7 CisJCQkJIHBvcnRfcmVxdWVzdChwb3J0KS0+Z2xvYmFsX3NlcW5vKTsKIAogCQkvKiBEaXNjYXJk IHRoZSBjdXJyZW50IGluZmxpZ2h0IGNvdW50ICovCi0JCXBvcnRfc2V0KCZwb3J0W25dLCBwb3J0 X3JlcXVlc3QoJnBvcnRbbl0pKTsKKwkJcG9ydF9zZXQocG9ydCwgcG9ydF9yZXF1ZXN0KHBvcnQp KTsKIAkJc3VibWl0ID0gdHJ1ZTsKIAl9CiAKQEAgLTEzNDMsNyArMTM0Nyw3IEBAIHN0YXRpYyB2 b2lkIHJlc2V0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkg KiByZXF1ZXN0cyB3ZXJlIGNvbXBsZXRlZC4KIAkgKi8KIAlpZiAoIXJlcXVlc3QpIHsKLQkJZXhl Y2xpc3RfY2FuY2VsX3BvcnRfcmVxdWVzdHMoJmVuZ2luZS0+ZXhlY2xpc3QpOworCQlleGVjbGlz dF9jYW5jZWxfcG9ydF9yZXF1ZXN0cyhlbCk7CiAJCXJldHVybjsKIAl9CiAKQEAgLTE3NTksNiAr MTc2MywxMCBAQCBsb2dpY2FsX3Jpbmdfc2V0dXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogCS8qIEludGVudGlvbmFsbHkgbGVmdCBibGFuay4gKi8KIAllbmdpbmUtPmJ1ZmZlciA9 IE5VTEw7CiAKKwllbmdpbmUtPmV4ZWNsaXN0LnBvcnRfbWFzayA9IDE7CisJQlVJTERfQlVHX09O X05PVF9QT1dFUl9PRl8yKGV4ZWNsaXN0X251bV9wb3J0cygmZW5naW5lLT5leGVjbGlzdCkpOwor CUdFTV9CVUdfT04oZXhlY2xpc3RfbnVtX3BvcnRzKCZlbmdpbmUtPmV4ZWNsaXN0KSA+IEVYRUNM SVNUX01BWF9QT1JUUyk7CisKIAlmd19kb21haW5zID0gaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9m b3JfcmVnKGRldl9wcml2LAogCQkJCQkJICAgIFJJTkdfRUxTUChlbmdpbmUpLAogCQkJCQkJICAg IEZXX1JFR19XUklURSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5k ZXggZDdhOTQxZmMzZjg3Li43YjY0ZTVlMTYxMzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmgKQEAgLTIzNCw3ICsyMzQsMTQgQEAgc3RydWN0IGludGVsX2VuZ2luZV9l eGVjbGlzdCB7CiAJCSAqIEBjb250ZXh0X2lkOiBjb250ZXh0IElEIGZvciBwb3J0CiAJCSAqLwog CQlHRU1fREVCVUdfREVDTCh1MzIgY29udGV4dF9pZCk7Ci0JfSBwb3J0WzJdOworCisjZGVmaW5l IEVYRUNMSVNUX01BWF9QT1JUUyAyCisJfSBwb3J0W0VYRUNMSVNUX01BWF9QT1JUU107CisKKwkv KioKKwkgKiBAcG9ydF9tYXNrOiBudW1iZXIgb2YgZXhlY2xpc3QgcG9ydHMgLSAxCisJICovCisJ dW5zaWduZWQgaW50IHBvcnRfbWFzazsKIAogCS8qKgogCSAqIEBxdWV1ZTogcXVldWUgb2YgcmVx dWVzdHMsIGluIHByaW9yaXR5IGxpc3RzCkBAIC00OTMsMjAgKzUwMCwyNiBAQCBzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzIHsKIAl1MzIgKCpnZXRfY21kX2xlbmd0aF9tYXNrKSh1MzIgY21kX2hlYWRl cik7CiB9OwogCi12b2lkIGV4ZWNsaXN0X2NhbmNlbF9wb3J0X3JlcXVlc3RzKHN0cnVjdCBpbnRl bF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCk7CitzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGlu dAorZXhlY2xpc3RfbnVtX3BvcnRzKGNvbnN0IHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3Qg KiBjb25zdCBlbCkKK3sKKwlyZXR1cm4gZWwtPnBvcnRfbWFzayArIDE7Cit9CiAKIHN0YXRpYyBp bmxpbmUgdm9pZAogZXhlY2xpc3RfcG9ydF9jb21wbGV0ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4 ZWNsaXN0ICogY29uc3QgZWwsCiAJCSAgICAgICBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqIGNvbnN0 IHBvcnQpCiB7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBwb3J0MSA9ICZlbC0+cG9y dFsxXTsKKwljb25zdCB1bnNpZ25lZCBpbnQgbSA9IGVsLT5wb3J0X21hc2s7CiAKIAlHRU1fREVC VUdfQlVHX09OKHBvcnRfaW5kZXgocG9ydCwgZWwpICE9IDApOwogCi0JKnBvcnQgPSAqcG9ydDE7 Ci0JbWVtc2V0KHBvcnQxLCAwLCBzaXplb2Yoc3RydWN0IGV4ZWNsaXN0X3BvcnQpKTsKKwltZW1t b3ZlKHBvcnQsIHBvcnQgKyAxLCBtICogc2l6ZW9mKHN0cnVjdCBleGVjbGlzdF9wb3J0KSk7CisJ bWVtc2V0KHBvcnQgKyBtLCAwLCBzaXplb2Yoc3RydWN0IGV4ZWNsaXN0X3BvcnQpKTsKIH0KIAor dm9pZCBleGVjbGlzdF9jYW5jZWxfcG9ydF9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4 ZWNsaXN0ICogY29uc3QgZWwpOworCiBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGludAogaW50ZWxf ZW5naW5lX2ZsYWcoY29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotLSAK Mi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK