From: Mika Kuoppala Subject: [PATCH 6/8] drm/i915: Introduce execlist_port_* accessors Date: Wed, 20 Sep 2017 17:37:03 +0300 Message-ID: <20170920143705.11277-7-mika.kuoppala@intel.com> References: <20170920143705.11277-1-mika.kuoppala@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 CB8366E0BE for ; Wed, 20 Sep 2017 14:38:36 +0000 (UTC) In-Reply-To: <20170920143705.11277-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 SW5zdGVhZCBvZiB0cnVzdGluZyB0aGF0IGZpcnN0IGF2YWlsYWJsZSBwb3J0IGlzIGF0IGluZGV4 IDAsCnVzZSBhY2Nlc3NvciB0byBoaWRlIHRoaXMuIFRoaXMgaXMgYSBwcmVwYXJhdGlvbiBmb3Ig YQpmb2xsb3dpbmcgcGF0Y2hlcyB3aGVyZSBoZWFkIGNhbiBiZSBhdCBhcmJpdHJhcnkgbG9jYXRp b24KaW4gdGhlIHBvcnQgYXJyYXkuCgp2MjogaW1wcm92ZWQgY29tbWl0IG1lc3NhZ2UsIGVsc3Bf cmVhZHkgcmVhZGFiaWxpdHkgKENocmlzKQoKU2lnbmVkLW9mZi1ieTogTWlrYSBLdW9wcGFsYSA8 bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgICAgICAgIHwgMTYgKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3B1X2Vycm9yLmMgICAgICB8ICA0ICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n dWNfc3VibWlzc2lvbi5jIHwgMTcgKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfaXJxLmMgICAgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9l bmdpbmVfY3MuYyAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMg ICAgICAgICAgIHwgNDIgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggICAgfCA0NiArKysrKysrKysrKysrKysrKysrKysr KysrKy0tLS0KIDcgZmlsZXMgY2hhbmdlZCwgODcgaW5zZXJ0aW9ucygrKSwgNDIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCBkYmViNmYwOGFiNzkuLmFm OGNjMmVhYjFiMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTMzNDgsMTYg KzMzNDgsMjAgQEAgc3RhdGljIGludCBpOTE1X2VuZ2luZV9pbmZvKHN0cnVjdCBzZXFfZmlsZSAq bSwgdm9pZCAqdW51c2VkKQogCiAJCQlyY3VfcmVhZF9sb2NrKCk7CiAJCQlmb3IgKGlkeCA9IDA7 IGlkeCA8IGV4ZWNsaXN0X251bV9wb3J0cyhlbCk7IGlkeCsrKSB7Ci0JCQkJdW5zaWduZWQgaW50 IGNvdW50OworCQkJCWNvbnN0IHN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0OworCQkJCXVuc2ln bmVkIGludCBjb3VudCwgbjsKIAotCQkJCXJxID0gcG9ydF91bnBhY2soJmVsLT5wb3J0W2lkeF0s ICZjb3VudCk7CisJCQkJcG9ydCA9IGV4ZWNsaXN0X3BvcnRfaW5kZXgoZWwsIGlkeCk7CisJCQkJ biA9IHBvcnRfaW5kZXgocG9ydCwgZWwpOworCisJCQkJcnEgPSBwb3J0X3VucGFjayhwb3J0LCAm Y291bnQpOwogCQkJCWlmIChycSkgewotCQkJCQlzZXFfcHJpbnRmKG0sICJcdFx0RUxTUFslZF0g Y291bnQ9JWQsICIsCi0JCQkJCQkgICBpZHgsIGNvdW50KTsKKwkJCQkJc2VxX3ByaW50ZihtLCAi XHRcdEVMU1BbJWQ6JWRdIGNvdW50PSVkLCAiLAorCQkJCQkJICAgaWR4LCBuLCBjb3VudCk7CiAJ CQkJCXByaW50X3JlcXVlc3QobSwgcnEsICJycTogIik7CiAJCQkJfSBlbHNlIHsKLQkJCQkJc2Vx X3ByaW50ZihtLCAiXHRcdEVMU1BbJWRdIGlkbGVcbiIsCi0JCQkJCQkgICBpZHgpOworCQkJCQlz ZXFfcHJpbnRmKG0sICJcdFx0RUxTUFslZDolZF0gaWRsZVxuIiwKKwkJCQkJCSAgIGlkeCwgbik7 CiAJCQkJfQogCQkJfQogCQkJcmN1X3JlYWRfdW5sb2NrKCk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ncHVfZXJyb3IuYwppbmRleCAwYTgwM2Q3NjI1NmIuLjE5ZTRjMjk3Yzg1NyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC0xMzMyLDExICsxMzMyLDExIEBAIHN0YXRp YyB2b2lkIGVuZ2luZV9yZWNvcmRfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lLAogc3RhdGljIHZvaWQgZXJyb3JfcmVjb3JkX2VuZ2luZV9leGVjbGlzdHMoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkJCQkgIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9lbmdp bmUgKmVlKQogewotCWNvbnN0IHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBl bCA9ICZlbmdpbmUtPmV4ZWNsaXN0OworCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBj b25zdCBlbCA9ICZlbmdpbmUtPmV4ZWNsaXN0OwogCXVuc2lnbmVkIGludCBuOwogCiAJZm9yIChu ID0gMDsgbiA8IGV4ZWNsaXN0X251bV9wb3J0cyhlbCk7IG4rKykgewotCQlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJxID0gcG9ydF9yZXF1ZXN0KCZlbC0+cG9ydFtuXSk7CisJCXN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEgPSBwb3J0X3JlcXVlc3QoZXhlY2xpc3RfcG9ydF9p bmRleChlbCwgbikpOwogCiAJCWlmICghcnEpCiAJCQlicmVhazsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCAzYTRmODc1ZDU5MzAuLjI1YzliYWM5NGMz OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtNTYy LDggKzU2Miw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ3VjX2RlcXVldWUoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQogCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBl bCA9ICZlbmdpbmUtPmV4ZWNsaXN0OwogCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0ID0gZWwt PnBvcnQ7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpsYXN0ID0gTlVMTDsKLQljb25z dCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqIGNvbnN0IGxhc3RfcG9ydCA9Ci0JCSZlbC0+cG9ydFtl bC0+cG9ydF9tYXNrXTsKKwljb25zdCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqIGNvbnN0IGxhc3Rf cG9ydCA9IGV4ZWNsaXN0X3BvcnRfdGFpbChlbCk7CiAJYm9vbCBzdWJtaXQgPSBmYWxzZTsKIAlz dHJ1Y3QgcmJfbm9kZSAqcmI7CiAKQEAgLTU4Nyw3ICs1ODYsOCBAQCBzdGF0aWMgdm9pZCBpOTE1 X2d1Y19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCQkJCWlmIChz dWJtaXQpCiAJCQkJCXBvcnRfYXNzaWduKHBvcnQsIGxhc3QpOwotCQkJCXBvcnQrKzsKKworCQkJ CXBvcnQgPSBleGVjbGlzdF9wb3J0X25leHQoZWwsIHBvcnQpOwogCQkJfQogCiAJCQlJTklUX0xJ U1RfSEVBRCgmcnEtPnByaW90cmVlLmxpbmspOwpAQCAtNjE4LDE5ICs2MTgsMTggQEAgc3RhdGlj IHZvaWQgaTkxNV9ndWNfaXJxX2hhbmRsZXIodW5zaWduZWQgbG9uZyBkYXRhKQogewogCXN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKiBjb25zdCBlbmdpbmUgPSAoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqKWRhdGE7CiAJc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsID0gJmVu Z2luZS0+ZXhlY2xpc3Q7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbC0+cG9ydDsK LQljb25zdCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqIGNvbnN0IGxhc3RfcG9ydCA9Ci0JCSZlbC0+ cG9ydFtlbC0+cG9ydF9tYXNrXTsKKwlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGV4ZWNs aXN0X3BvcnRfaGVhZChlbCk7CisJY29uc3Qgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBs YXN0X3BvcnQgPSBleGVjbGlzdF9wb3J0X3RhaWwoZWwpOwogCXN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcnE7CiAKLQlycSA9IHBvcnRfcmVxdWVzdCgmcG9ydFswXSk7CisJcnEgPSBwb3J0 X3JlcXVlc3QocG9ydCk7CiAJd2hpbGUgKHJxICYmIGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVk KHJxKSkgewogCQl0cmFjZV9pOTE1X2dlbV9yZXF1ZXN0X291dChycSk7CiAJCWk5MTVfZ2VtX3Jl cXVlc3RfcHV0KHJxKTsKIAotCQlleGVjbGlzdF9wb3J0X2NvbXBsZXRlKGVsLCBwb3J0KTsKKwkJ cG9ydCA9IGV4ZWNsaXN0X3BvcnRfY29tcGxldGUoZWwsIHBvcnQpOwogCi0JCXJxID0gcG9ydF9y ZXF1ZXN0KCZwb3J0WzBdKTsKKwkJcnEgPSBwb3J0X3JlcXVlc3QocG9ydCk7CiAJfQogCiAJaWYg KCFwb3J0X2lzc2V0KGxhc3RfcG9ydCkpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCBkZTcw M2MyNmUxMjQuLmFjNWE5NTQzOTM5MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0xMzQy LDcgKzEzNDIsNyBAQCBnZW44X2NzX2lycV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSwgdTMyIGlpciwgaW50IHRlc3Rfc2hpZnQpCiAJYm9vbCB0YXNrbGV0ID0gZmFsc2U7 CiAKIAlpZiAoaWlyICYgKEdUX0NPTlRFWFRfU1dJVENIX0lOVEVSUlVQVCA8PCB0ZXN0X3NoaWZ0 KSkgewotCQlpZiAocG9ydF9jb3VudCgmZWwtPnBvcnRbMF0pKSB7CisJCWlmIChwb3J0X2NvdW50 KGV4ZWNsaXN0X3BvcnRfaGVhZChlbCkpKSB7CiAJCQlfX3NldF9iaXQoRU5HSU5FX0lSUV9FWEVD TElTVCwgJmVuZ2luZS0+aXJxX3Bvc3RlZCk7CiAJCQl0YXNrbGV0ID0gdHJ1ZTsKIAkJfQpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwppbmRleCA1MjNkNTYwODQ4NzAuLmIwZDcw MjA2M2E1MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2Nz LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKQEAgLTE1MDIs NyArMTUwMiw3IEBAIGJvb2wgaW50ZWxfZW5naW5lX2lzX2lkbGUoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogCQlyZXR1cm4gZmFsc2U7CiAKIAkvKiBCb3RoIHBvcnRzIGRyYWluZWQs IG5vIG1vcmUgRUxTUCBzdWJtaXNzaW9uPyAqLwotCWlmIChwb3J0X3JlcXVlc3QoJmVuZ2luZS0+ ZXhlY2xpc3QucG9ydFswXSkpCisJaWYgKHBvcnRfcmVxdWVzdChleGVjbGlzdF9wb3J0X2hlYWQo JmVuZ2luZS0+ZXhlY2xpc3QpKSkKIAkJcmV0dXJuIGZhbHNlOwogCiAJLyogRUxTUCBpcyBlbXB0 eSwgYnV0IHRoZXJlIGFyZSByZWFkeSByZXF1ZXN0cz8gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMKaW5kZXggYzY1OTc0NWU2YjdiLi44NTUwY2Q2NjM1YzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5jCkBAIC0zOTQsMjQgKzM5NCwyNyBAQCBzdGF0aWMgdTY0IGV4ZWNsaXN0c191cGRhdGVf Y29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQogCiBzdGF0aWMgdm9pZCBl eGVjbGlzdHNfc3VibWl0X3BvcnRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsK LQlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGVuZ2luZS0+ZXhlY2xpc3QucG9ydDsKKwlz dHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0ICogY29uc3QgZWwgPSAmZW5naW5lLT5leGVjbGlz dDsKIAl1MzIgX19pb21lbSAqZWxzcCA9CiAJCWVuZ2luZS0+aTkxNS0+cmVncyArIGk5MTVfbW1p b19yZWdfb2Zmc2V0KFJJTkdfRUxTUChlbmdpbmUpKTsKIAl1bnNpZ25lZCBpbnQgbjsKIAotCWZv ciAobiA9IGV4ZWNsaXN0X251bV9wb3J0cygmZW5naW5lLT5leGVjbGlzdCk7IG4tLTsgKSB7CisJ Zm9yIChuID0gZXhlY2xpc3RfbnVtX3BvcnRzKGVsKTsgbi0tOyApIHsKKwkJc3RydWN0IGV4ZWNs aXN0X3BvcnQgKnBvcnQ7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7CiAJCXVu c2lnbmVkIGludCBjb3VudDsKIAkJdTY0IGRlc2M7CiAKLQkJcnEgPSBwb3J0X3VucGFjaygmcG9y dFtuXSwgJmNvdW50KTsKKwkJcG9ydCA9IGV4ZWNsaXN0X3BvcnRfaW5kZXgoZWwsIG4pOworCisJ CXJxID0gcG9ydF91bnBhY2socG9ydCwgJmNvdW50KTsKIAkJaWYgKHJxKSB7CiAJCQlHRU1fQlVH X09OKGNvdW50ID4gIW4pOwogCQkJaWYgKCFjb3VudCsrKQogCQkJCWV4ZWNsaXN0c19jb250ZXh0 X3N0YXR1c19jaGFuZ2UocnEsIElOVEVMX0NPTlRFWFRfU0NIRURVTEVfSU4pOwotCQkJcG9ydF9z ZXQoJnBvcnRbbl0sIHBvcnRfcGFjayhycSwgY291bnQpKTsKKwkJCXBvcnRfc2V0KHBvcnQsIHBv cnRfcGFjayhycSwgY291bnQpKTsKIAkJCWRlc2MgPSBleGVjbGlzdHNfdXBkYXRlX2NvbnRleHQo cnEpOwotCQkJR0VNX0RFQlVHX0VYRUMocG9ydFtuXS5jb250ZXh0X2lkID0gdXBwZXJfMzJfYml0 cyhkZXNjKSk7CisJCQlHRU1fREVCVUdfRVhFQyhwb3J0LT5jb250ZXh0X2lkID0gdXBwZXJfMzJf Yml0cyhkZXNjKSk7CiAJCX0gZWxzZSB7CiAJCQlHRU1fQlVHX09OKCFuKTsKIAkJCWRlc2MgPSAw OwpAQCAtNDU1LDkgKzQ1OCw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKmxhc3Q7CiAJc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsID0gJmVu Z2luZS0+ZXhlY2xpc3Q7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbC0+cG9ydDsK LQljb25zdCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqIGNvbnN0IGxhc3RfcG9ydCA9Ci0JCSZlbC0+ cG9ydFtlbC0+cG9ydF9tYXNrXTsKKwlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGV4ZWNs aXN0X3BvcnRfaGVhZChlbCk7CisJY29uc3Qgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBs YXN0X3BvcnQgPSBleGVjbGlzdF9wb3J0X3RhaWwoZWwpOwogCXN0cnVjdCByYl9ub2RlICpyYjsK IAlib29sIHN1Ym1pdCA9IGZhbHNlOwogCkBAIC01NDEsNyArNTQzLDggQEAgc3RhdGljIHZvaWQg ZXhlY2xpc3RzX2RlcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCiAJCQkJ aWYgKHN1Ym1pdCkKIAkJCQkJcG9ydF9hc3NpZ24ocG9ydCwgbGFzdCk7Ci0JCQkJcG9ydCsrOwor CisJCQkJcG9ydCA9IGV4ZWNsaXN0X3BvcnRfbmV4dChlbCwgcG9ydCk7CiAKIAkJCQlHRU1fQlVH X09OKHBvcnRfaXNzZXQocG9ydCkpOwogCQkJfQpAQCAtNjM4LDExICs2NDEsMTIgQEAgc3RhdGlj IHZvaWQgZXhlY2xpc3RzX2NhbmNlbF9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZW5naW5lLT50aW1lbGluZS0+bG9jaywg ZmxhZ3MpOwogfQogCi1zdGF0aWMgYm9vbCBleGVjbGlzdHNfZWxzcF9yZWFkeShjb25zdCBzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCitzdGF0aWMgYm9vbCBleGVjbGlzdHNfZWxzcF9y ZWFkeShzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0ICogY29uc3QgZWwpCiB7Ci0JY29uc3Qg c3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbmdpbmUtPmV4ZWNsaXN0LnBvcnQ7CisJc3Ry dWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBwb3J0MCA9IGV4ZWNsaXN0X3BvcnRfaGVhZChlbCk7 CisJc3RydWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBwb3J0MSA9IGV4ZWNsaXN0X3BvcnRfbmV4 dChlbCwgcG9ydDApOwogCi0JcmV0dXJuIHBvcnRfY291bnQoJnBvcnRbMF0pICsgcG9ydF9jb3Vu dCgmcG9ydFsxXSkgPCAyOworCXJldHVybiBwb3J0X2NvdW50KHBvcnQwKSArIHBvcnRfY291bnQo cG9ydDEpIDwgMjsKIH0KIAogLyoKQEAgLTY1Myw3ICs2NTcsNyBAQCBzdGF0aWMgdm9pZCBpbnRl bF9scmNfaXJxX2hhbmRsZXIodW5zaWduZWQgbG9uZyBkYXRhKQogewogCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKiBjb25zdCBlbmdpbmUgPSAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqKWRhdGE7 CiAJc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0IGVsID0gJmVuZ2luZS0+ZXhl Y2xpc3Q7Ci0Jc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQgPSBlbC0+cG9ydDsKKwlzdHJ1Y3Qg ZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGV4ZWNsaXN0X3BvcnRfaGVhZChlbCk7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCiAJLyogV2UgY2FuIHNr aXAgYWNxdWlyaW5nIGludGVsX3J1bnRpbWVfcG1fZ2V0KCkgaGVyZSBhcyBpdCB3YXMgdGFrZW4K QEAgLTc1MSw3ICs3NTUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIodW5z aWduZWQgbG9uZyBkYXRhKQogCQkJCXRyYWNlX2k5MTVfZ2VtX3JlcXVlc3Rfb3V0KHJxKTsKIAkJ CQlpOTE1X2dlbV9yZXF1ZXN0X3B1dChycSk7CiAKLQkJCQlleGVjbGlzdF9wb3J0X2NvbXBsZXRl KGVsLCBwb3J0KTsKKwkJCQlwb3J0ID0gZXhlY2xpc3RfcG9ydF9jb21wbGV0ZShlbCwgcG9ydCk7 CiAJCQl9IGVsc2UgewogCQkJCXBvcnRfc2V0KHBvcnQsIHBvcnRfcGFjayhycSwgY291bnQpKTsK IAkJCX0KQEAgLTc2OCw3ICs3NzIsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRs ZXIodW5zaWduZWQgbG9uZyBkYXRhKQogCQl9CiAJfQogCi0JaWYgKGV4ZWNsaXN0c19lbHNwX3Jl YWR5KGVuZ2luZSkpCisJaWYgKGV4ZWNsaXN0c19lbHNwX3JlYWR5KGVsKSkKIAkJZXhlY2xpc3Rz X2RlcXVldWUoZW5naW5lKTsKIAogCWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2 LCBlbC0+ZndfZG9tYWlucyk7CkBAIC03NzgsMTYgKzc4MiwxOCBAQCBzdGF0aWMgdm9pZCBpbnNl cnRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCQkgICBzdHJ1Y3Qg aTkxNV9wcmlvdHJlZSAqcHQsCiAJCQkgICBpbnQgcHJpbykKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2V4ZWNsaXN0ICogY29uc3QgZWwgPSAmZW5naW5lLT5leGVjbGlzdDsKIAlzdHJ1Y3QgaTkx NV9wcmlvbGlzdCAqcCA9IGxvb2t1cF9wcmlvbGlzdChlbmdpbmUsIHB0LCBwcmlvKTsKIAogCWxp c3RfYWRkX3RhaWwoJnB0LT5saW5rLCAmcHRyX21hc2tfYml0cyhwLCAxKS0+cmVxdWVzdHMpOwot CWlmIChwdHJfdW5tYXNrX2JpdHMocCwgMSkgJiYgZXhlY2xpc3RzX2Vsc3BfcmVhZHkoZW5naW5l KSkKLQkJdGFza2xldF9oaV9zY2hlZHVsZSgmZW5naW5lLT5leGVjbGlzdC5pcnFfdGFza2xldCk7 CisJaWYgKHB0cl91bm1hc2tfYml0cyhwLCAxKSAmJiBleGVjbGlzdHNfZWxzcF9yZWFkeShlbCkp CisJCXRhc2tsZXRfaGlfc2NoZWR1bGUoJmVsLT5pcnFfdGFza2xldCk7CiB9CiAKIHN0YXRpYyB2 b2lkIGV4ZWNsaXN0c19zdWJtaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcXVlc3QpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVxdWVzdC0+ ZW5naW5lOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCA9ICZlbmdp bmUtPmV4ZWNsaXN0OwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAKIAkvKiBXaWxsIGJlIGNhbGxl ZCBmcm9tIGlycS1jb250ZXh0IHdoZW4gdXNpbmcgZm9yZWlnbiBmZW5jZXMuICovCkBAIC03OTUs NyArODAxLDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX3N1Ym1pdF9yZXF1ZXN0KHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAogCWluc2VydF9yZXF1ZXN0KGVuZ2luZSwg JnJlcXVlc3QtPnByaW90cmVlLCByZXF1ZXN0LT5wcmlvdHJlZS5wcmlvcml0eSk7CiAKLQlHRU1f QlVHX09OKCFlbmdpbmUtPmV4ZWNsaXN0LmZpcnN0KTsKKwlHRU1fQlVHX09OKCFlbC0+Zmlyc3Qp OwogCUdFTV9CVUdfT04obGlzdF9lbXB0eSgmcmVxdWVzdC0+cHJpb3RyZWUubGluaykpOwogCiAJ c3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZW5naW5lLT50aW1lbGluZS0+bG9jaywgZmxhZ3MpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDk0ZTZjMmEzOGZiNy4u OTkxZjZjMGJkNmMyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBA IC0yNDQsNiArMjQ0LDExIEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3QgewogCXVuc2ln bmVkIGludCBwb3J0X21hc2s7CiAKIAkvKioKKwkgKiBAcG9ydF9oZWFkOiBmaXJzdCB1c2VkIGV4 ZWNsaXN0IHBvcnQKKwkgKi8KKwl1bnNpZ25lZCBpbnQgcG9ydF9oZWFkOworCisJLyoqCiAJICog QHF1ZXVlOiBxdWV1ZSBvZiByZXF1ZXN0cywgaW4gcHJpb3JpdHkgbGlzdHMKIAkgKi8KIAlzdHJ1 Y3QgcmJfcm9vdCBxdWV1ZTsKQEAgLTUyNCwxNiArNTI5LDQ3IEBAIGV4ZWNsaXN0X251bV9wb3J0 cyhjb25zdCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0ICogY29uc3QgZWwpCiAJcmV0dXJu IGVsLT5wb3J0X21hc2sgKyAxOwogfQogCi1zdGF0aWMgaW5saW5lIHZvaWQKKyNkZWZpbmUgX19w b3J0X2lkeChzdGFydCwgaW5kZXgsIG1hc2spICgoKHN0YXJ0KSArIChpbmRleCkpICYgKG1hc2sp KQorCitzdGF0aWMgaW5saW5lIHN0cnVjdCBleGVjbGlzdF9wb3J0ICoKK2V4ZWNsaXN0X3BvcnRf aGVhZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0ICogY29uc3QgZWwpCit7CisJcmV0dXJu ICZlbC0+cG9ydFtlbC0+cG9ydF9oZWFkXTsKK30KKworLyogSW5kZXggc3RhcnRpbmcgZnJvbSBw b3J0X2hlYWQgKi8KK3N0YXRpYyBpbmxpbmUgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKgorZXhlY2xp c3RfcG9ydF9pbmRleChzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0ICogY29uc3QgZWwsCisJ CSAgICBjb25zdCB1bnNpZ25lZCBpbnQgbikKK3sKKwlyZXR1cm4gJmVsLT5wb3J0W19fcG9ydF9p ZHgoZWwtPnBvcnRfaGVhZCwgbiwgZWwtPnBvcnRfbWFzayldOworfQorCitzdGF0aWMgaW5saW5l IHN0cnVjdCBleGVjbGlzdF9wb3J0ICoKK2V4ZWNsaXN0X3BvcnRfdGFpbChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2V4ZWNsaXN0ICogY29uc3QgZWwpCit7CisJcmV0dXJuICZlbC0+cG9ydFtfX3BvcnRf aWR4KGVsLT5wb3J0X2hlYWQsIC0xLCBlbC0+cG9ydF9tYXNrKV07Cit9CisKK3N0YXRpYyBpbmxp bmUgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKgorZXhlY2xpc3RfcG9ydF9uZXh0KHN0cnVjdCBpbnRl bF9lbmdpbmVfZXhlY2xpc3QgKiBjb25zdCBlbCwKKwkJICAgY29uc3Qgc3RydWN0IGV4ZWNsaXN0 X3BvcnQgKiBjb25zdCBwb3J0KQoreworCWNvbnN0IHVuc2lnbmVkIGludCBpID0gcG9ydF9pbmRl eChwb3J0LCBlbCk7CisKKwlyZXR1cm4gJmVsLT5wb3J0W19fcG9ydF9pZHgoaSwgMSwgZWwtPnBv cnRfbWFzayldOworfQorCitzdGF0aWMgaW5saW5lIHN0cnVjdCBleGVjbGlzdF9wb3J0ICoKIGV4 ZWNsaXN0X3BvcnRfY29tcGxldGUoc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdCAqIGNvbnN0 IGVsLAogCQkgICAgICAgc3RydWN0IGV4ZWNsaXN0X3BvcnQgKiBjb25zdCBwb3J0KQogewotCWNv bnN0IHVuc2lnbmVkIGludCBtID0gZWwtPnBvcnRfbWFzazsKKwlHRU1fQlVHX09OKHBvcnRfaW5k ZXgocG9ydCwgZWwpICE9IGVsLT5wb3J0X2hlYWQpOwogCi0JR0VNX0JVR19PTihwb3J0X2luZGV4 KHBvcnQsIGVsKSAhPSAwKTsKKwltZW1zZXQocG9ydCwgMCwgc2l6ZW9mKHN0cnVjdCBleGVjbGlz dF9wb3J0KSk7CisJZWwtPnBvcnRfaGVhZCA9IF9fcG9ydF9pZHgoZWwtPnBvcnRfaGVhZCwgMSwg ZWwtPnBvcnRfbWFzayk7CiAKLQltZW1tb3ZlKHBvcnQsIHBvcnQgKyAxLCBtICogc2l6ZW9mKHN0 cnVjdCBleGVjbGlzdF9wb3J0KSk7Ci0JbWVtc2V0KHBvcnQgKyBtLCAwLCBzaXplb2Yoc3RydWN0 IGV4ZWNsaXN0X3BvcnQpKTsKKwlyZXR1cm4gZXhlY2xpc3RfcG9ydF9oZWFkKGVsKTsKIH0KIAog c3RhdGljIGlubGluZSB1bnNpZ25lZCBpbnQKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==