From: yu.dai@intel.com Subject: [PATCH v2] drm/i915/guc: Decouple GuC engine id from ring id Date: Sat, 23 Jan 2016 11:58:14 -0800 Message-ID: <1453579094-29860-1-git-send-email-yu.dai@intel.com> References: <1453503988-6866-1-git-send-email-yu.dai@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 57D376E3EB for ; Sat, 23 Jan 2016 12:02:27 -0800 (PST) In-Reply-To: <1453503988-6866-1-git-send-email-yu.dai@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@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpQcmV2aW91c2x5IEd1QyB1c2VzIHJp bmcgaWQgYXMgZW5naW5lIGlkIGJlY2F1c2Ugb2Ygc2FtZSBkZWZpbml0aW9uLgpCdXQgdGhpcyBp cyBub3QgdHJ1ZSBzaW5jZSB0aGlzIGNvbW1pdDoKCmNvbW1pdCBkZTFhZGQzNjA1MjJjODc2YzI1 ZWYyYmJiYmFiMWM5NGJkYjUwOWFiCkF1dGhvcjogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1 bGluQGludGVsLmNvbT4KRGF0ZTogICBGcmkgSmFuIDE1IDE1OjEyOjUwIDIwMTYgKzAwMDAKCiAg ICBkcm0vaTkxNTogRGVjb3VwbGUgZXhlY2J1ZiB1QVBJIGZyb20gaW50ZXJuYWwgaW1wbGVtZW50 YXRpb24KCkFkZGVkIEd1QyBlbmdpbmUgaWQgaW50byBHdUMgaW50ZXJmYWNlIHRvIGRlY291cGxl IGl0IGZyb20gcmluZyBpZCB1c2VkCmJ5IGRyaXZlci4KCnYyOiBLZWVwIHJpbmcgbmFtZSBwcmlu dCBvdXQgaW4gZGVidWdmczsgdXNpbmcgZm9yX2VhY2hfcmluZygpIHdoZXJlCiAgICBwb3NzaWJs ZSB0byBrZWVwIGRyaXZlciBjb25zaXN0ZW50LiAoQ2hyaXMgVy4pCgpTaWduZWQtb2ZmLWJ5OiBB bGV4IERhaSA8eXUuZGFpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYyAgICAgICAgfCAxMiArKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2d1Y19zdWJtaXNzaW9uLmMgfCAzOCArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oICAgICAgICAgICB8ICA2ICsrLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oICAgICAgfCAxNyArKysrKysrKyst LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgNSArKysr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggICAgfCAgMSArCiA2IGZp bGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggYzVkYjIzNS4uY2VhMTg0NCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTI0NjMsOSArMjQ2Myw5IEBAIHN0YXRpYyB2b2lkIGk5 MTVfZ3VjX2NsaWVudF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwKIAogCWZvcl9lYWNoX3Jpbmco cmluZywgZGV2X3ByaXYsIGkpIHsKIAkJc2VxX3ByaW50ZihtLCAiXHRTdWJtaXNzaW9uczogJWxs dSAlc1xuIiwKLQkJCQljbGllbnQtPnN1Ym1pc3Npb25zW2ldLAorCQkJCWNsaWVudC0+c3VibWlz c2lvbnNbcmluZy0+Z3VjX2lkXSwKIAkJCQlyaW5nLT5uYW1lKTsKLQkJdG90ICs9IGNsaWVudC0+ c3VibWlzc2lvbnNbaV07CisJCXRvdCArPSBjbGllbnQtPnN1Ym1pc3Npb25zW3JpbmctPmd1Y19p ZF07CiAJfQogCXNlcV9wcmludGYobSwgIlx0VG90YWw6ICVsbHVcbiIsIHRvdCk7CiB9CkBAIC0y NTAyLDEwICsyNTAyLDEwIEBAIHN0YXRpYyBpbnQgaTkxNV9ndWNfaW5mbyhzdHJ1Y3Qgc2VxX2Zp bGUgKm0sIHZvaWQgKmRhdGEpCiAKIAlzZXFfcHJpbnRmKG0sICJcbkd1QyBzdWJtaXNzaW9uczpc biIpOwogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKLQkJc2VxX3ByaW50Ziht LCAiXHQlLTI0czogJTEwbGx1LCBsYXN0IHNlcW5vIDB4JTA4eCAlOWRcbiIsCi0JCQlyaW5nLT5u YW1lLCBndWMuc3VibWlzc2lvbnNbaV0sCi0JCQlndWMubGFzdF9zZXFub1tpXSwgZ3VjLmxhc3Rf c2Vxbm9baV0pOwotCQl0b3RhbCArPSBndWMuc3VibWlzc2lvbnNbaV07CisJCXNlcV9wcmludGYo bSwgIlx0JS0yNHM6ICUxMGxsdSwgbGFzdCBzZXFubyAweCUwOHhcbiIsCisJCQlyaW5nLT5uYW1l LCBndWMuc3VibWlzc2lvbnNbcmluZy0+Z3VjX2lkXSwKKwkJCWd1Yy5sYXN0X3NlcW5vW3Jpbmct Pmd1Y19pZF0pOworCQl0b3RhbCArPSBndWMuc3VibWlzc2lvbnNbcmluZy0+Z3VjX2lkXTsKIAl9 CiAJc2VxX3ByaW50ZihtLCAiXHQlczogJWxsdVxuIiwgIlRvdGFsIiwgdG90YWwpOwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggNTFhZTVjMS4uYjRk YTIwZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv bi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAt Mzc2LDYgKzM3Niw4IEBAIHN0YXRpYyB2b2lkIGd1Y19pbml0X3Byb2NfZGVzYyhzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMsCiBzdGF0aWMgdm9pZCBndWNfaW5pdF9jdHhfZGVzYyhzdHJ1Y3QgaW50ZWxf Z3VjICpndWMsCiAJCQkgICAgICBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCiB7CisJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKKwlz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgg PSBjbGllbnQtPm93bmVyOwogCXN0cnVjdCBndWNfY29udGV4dF9kZXNjIGRlc2M7CiAJc3RydWN0 IHNnX3RhYmxlICpzZzsKQEAgLTM4OCwxMCArMzkwLDggQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRf Y3R4X2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCWRlc2MucHJpb3JpdHkgPSBjbGllbnQt PnByaW9yaXR5OwogCWRlc2MuZGJfaWQgPSBjbGllbnQtPmRvb3JiZWxsX2lkOwogCi0JZm9yIChp ID0gMDsgaSA8IEk5MTVfTlVNX1JJTkdTOyBpKyspIHsKLQkJc3RydWN0IGd1Y19leGVjbGlzdF9j b250ZXh0ICpscmMgPSAmZGVzYy5scmNbaV07Ci0JCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpy aW5nYnVmID0gY3R4LT5lbmdpbmVbaV0ucmluZ2J1ZjsKLQkJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZzsKKwlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7CisJCXN0cnVjdCBn dWNfZXhlY2xpc3RfY29udGV4dCAqbHJjID0gJmRlc2MubHJjW3JpbmctPmd1Y19pZF07CiAJCXN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJCXVpbnQ2NF90IGN0eF9kZXNjOwogCkBA IC00MDYsNyArNDA2LDYgQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfY3R4X2Rlc2Moc3RydWN0IGlu dGVsX2d1YyAqZ3VjLAogCQlpZiAoIW9iaikKIAkJCWJyZWFrOwkvKiBYWFg6IGNvbnRpbnVlPyAq LwogCi0JCXJpbmcgPSByaW5nYnVmLT5yaW5nOwogCQljdHhfZGVzYyA9IGludGVsX2xyX2NvbnRl eHRfZGVzY3JpcHRvcihjdHgsIHJpbmcpOwogCQlscmMtPmNvbnRleHRfZGVzYyA9ICh1MzIpY3R4 X2Rlc2M7CiAKQEAgLTQxNCwxNiArNDEzLDE2IEBAIHN0YXRpYyB2b2lkIGd1Y19pbml0X2N0eF9k ZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJbHJjLT5yaW5nX2xjcmEgPSBpOTE1X2dlbV9v YmpfZ2d0dF9vZmZzZXQob2JqKSArCiAJCQkJTFJDX1NUQVRFX1BOICogUEFHRV9TSVpFOwogCQls cmMtPmNvbnRleHRfaWQgPSAoY2xpZW50LT5jdHhfaW5kZXggPDwgR1VDX0VMQ19DVFhJRF9PRkZT RVQpIHwKLQkJCQkocmluZy0+aWQgPDwgR1VDX0VMQ19FTkdJTkVfT0ZGU0VUKTsKKwkJCQkocmlu Zy0+Z3VjX2lkIDw8IEdVQ19FTENfRU5HSU5FX09GRlNFVCk7CiAKLQkJb2JqID0gcmluZ2J1Zi0+ b2JqOworCQlvYmogPSBjdHgtPmVuZ2luZVtpXS5yaW5nYnVmLT5vYmo7CiAKIAkJbHJjLT5yaW5n X2JlZ2luID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaik7CiAJCWxyYy0+cmluZ19lbmQg PSBscmMtPnJpbmdfYmVnaW4gKyBvYmotPmJhc2Uuc2l6ZSAtIDE7CiAJCWxyYy0+cmluZ19uZXh0 X2ZyZWVfbG9jYXRpb24gPSBscmMtPnJpbmdfYmVnaW47CiAJCWxyYy0+cmluZ19jdXJyZW50X3Rh aWxfcG9pbnRlcl92YWx1ZSA9IDA7CiAKLQkJZGVzYy5lbmdpbmVzX3VzZWQgfD0gKDEgPDwgcmlu Zy0+aWQpOworCQlkZXNjLmVuZ2luZXNfdXNlZCB8PSAoMSA8PCByaW5nLT5ndWNfaWQpOwogCX0K IAogCVdBUk5fT04oZGVzYy5lbmdpbmVzX3VzZWQgPT0gMCk7CkBAIC01MTAsNyArNTA5LDYgQEAg aW50IGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQog c3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQg KmdjLAogCQkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIHsKLQllbnVtIGlu dGVsX3JpbmdfaWQgcmluZ19pZCA9IHJxLT5yaW5nLT5pZDsKIAlzdHJ1Y3QgZ3VjX3dxX2l0ZW0g KndxaTsKIAl2b2lkICpiYXNlOwogCXUzMiB0YWlsLCB3cV9sZW4sIHdxX29mZiwgc3BhY2U7CkBA IC01NDQsNyArNTQyLDcgQEAgc3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVj dCBpOTE1X2d1Y19jbGllbnQgKmdjLAogCXdxX2xlbiA9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0 ZW0pIC8gc2l6ZW9mKHUzMikgLSAxOwogCXdxaS0+aGVhZGVyID0gV1FfVFlQRV9JTk9SREVSIHwK IAkJCSh3cV9sZW4gPDwgV1FfTEVOX1NISUZUKSB8Ci0JCQkocmluZ19pZCA8PCBXUV9UQVJHRVRf U0hJRlQpIHwKKwkJCShycS0+cmluZy0+Z3VjX2lkIDw8IFdRX1RBUkdFVF9TSElGVCkgfAogCQkJ V1FfTk9fV0NGTFVTSF9XQUlUOwogCiAJLyogVGhlIEd1QyB3YW50cyBvbmx5IHRoZSBsb3ctb3Jk ZXIgd29yZCBvZiB0aGUgY29udGV4dCBkZXNjcmlwdG9yICovCkBAIC01OTQsNyArNTkyLDcgQEAg aW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQsCiAJCSAg ICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQogewogCXN0cnVjdCBpbnRlbF9ndWMg Kmd1YyA9IGNsaWVudC0+Z3VjOwotCWVudW0gaW50ZWxfcmluZ19pZCByaW5nX2lkID0gcnEtPnJp bmctPmlkOworCXVuc2lnbmVkIGludCBlbmdpbmVfaWQgPSBycS0+cmluZy0+Z3VjX2lkOwogCWlu dCBxX3JldCwgYl9yZXQ7CiAKIAkvKiBOZWVkIHRoaXMgYmVjYXVzZSBvZiB0aGUgZGVmZXJyZWQg cGluIGN0eCBhbmQgcmluZyAqLwpAQCAtNjA1LDcgKzYwMyw3IEBAIGludCBpOTE1X2d1Y19zdWJt aXQoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50LAogCWlmIChxX3JldCA9PSAwKQogCQli X3JldCA9IGd1Y19yaW5nX2Rvb3JiZWxsKGNsaWVudCk7CiAKLQljbGllbnQtPnN1Ym1pc3Npb25z W3JpbmdfaWRdICs9IDE7CisJY2xpZW50LT5zdWJtaXNzaW9uc1tlbmdpbmVfaWRdICs9IDE7CiAJ aWYgKHFfcmV0KSB7CiAJCWNsaWVudC0+cV9mYWlsICs9IDE7CiAJCWNsaWVudC0+cmV0Y29kZSA9 IHFfcmV0OwpAQCAtNjE1LDggKzYxMyw4IEBAIGludCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGk5 MTVfZ3VjX2NsaWVudCAqY2xpZW50LAogCX0gZWxzZSB7CiAJCWNsaWVudC0+cmV0Y29kZSA9IDA7 CiAJfQotCWd1Yy0+c3VibWlzc2lvbnNbcmluZ19pZF0gKz0gMTsKLQlndWMtPmxhc3Rfc2Vxbm9b cmluZ19pZF0gPSBycS0+c2Vxbm87CisJZ3VjLT5zdWJtaXNzaW9uc1tlbmdpbmVfaWRdICs9IDE7 CisJZ3VjLT5sYXN0X3NlcW5vW2VuZ2luZV9pZF0gPSBycS0+c2Vxbm87CiAKIAlyZXR1cm4gcV9y ZXQ7CiB9CkBAIC04NDgsNyArODQ2LDcgQEAgc3RhdGljIHZvaWQgaW5pdF9ndWNfcG9saWNpZXMo c3RydWN0IGd1Y19wb2xpY2llcyAqcG9saWNpZXMpCiAJcG9saWNpZXMtPm1heF9udW1fd29ya19p dGVtcyA9IFBPTElDWV9NQVhfTlVNX1dJOwogCiAJZm9yIChwID0gMDsgcCA8IEdVQ19DVFhfUFJJ T1JJVFlfTlVNOyBwKyspIHsKLQkJZm9yIChpID0gMDsgaSA8IEk5MTVfTlVNX1JJTkdTOyBpKysp IHsKKwkJZm9yIChpID0gR1VDX1JFTkRFUl9FTkdJTkU7IGkgPCBHVUNfTUFYX0VOR0lORVNfTlVN OyBpKyspIHsKIAkJCXBvbGljeSA9ICZwb2xpY2llcy0+cG9saWN5W3BdW2ldOwogCiAJCQlwb2xp Y3ktPmV4ZWN1dGlvbl9xdWFudHVtID0gMTAwMDAwMDsKQEAgLTkwMCw3ICs4OTgsNyBAQCBzdGF0 aWMgdm9pZCBndWNfY3JlYXRlX2FkcyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJYWRzLT5nb2xk ZW5fY29udGV4dF9scmNhID0gcmluZy0+c3RhdHVzX3BhZ2UuZ2Z4X2FkZHI7CiAKIAlmb3JfZWFj aF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKQotCQlhZHMtPmVuZ19zdGF0ZV9zaXplW2ldID0gaW50 ZWxfbHJfY29udGV4dF9zaXplKHJpbmcpOworCQlhZHMtPmVuZ19zdGF0ZV9zaXplW3JpbmctPmd1 Y19pZF0gPSBpbnRlbF9scl9jb250ZXh0X3NpemUocmluZyk7CiAKIAkvKiBHdUMgc2NoZWR1bGlu ZyBwb2xpY2llcyAqLwogCXBvbGljaWVzID0gKHZvaWQgKilhZHMgKyBzaXplb2Yoc3RydWN0IGd1 Y19hZHMpOwpAQCAtOTEyLDEyICs5MTAsMTIgQEAgc3RhdGljIHZvaWQgZ3VjX2NyZWF0ZV9hZHMo c3RydWN0IGludGVsX2d1YyAqZ3VjKQogCS8qIE1NSU8gcmVnIHN0YXRlICovCiAJcmVnX3N0YXRl ID0gKHZvaWQgKilwb2xpY2llcyArIHNpemVvZihzdHJ1Y3QgZ3VjX3BvbGljaWVzKTsKIAotCWZv ciAoaSA9IDA7IGkgPCBJOTE1X05VTV9SSU5HUzsgaSsrKSB7Ci0JCXJlZ19zdGF0ZS0+bW1pb193 aGl0ZV9saXN0W2ldLm1taW9fc3RhcnQgPQotCQkJZGV2X3ByaXYtPnJpbmdbaV0ubW1pb19iYXNl ICsgR1VDX01NSU9fV0hJVEVfTElTVF9TVEFSVDsKKwlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9w cml2LCBpKSB7CisJCXJlZ19zdGF0ZS0+bW1pb193aGl0ZV9saXN0W3JpbmctPmd1Y19pZF0ubW1p b19zdGFydCA9CisJCQlyaW5nLT5tbWlvX2Jhc2UgKyBHVUNfTU1JT19XSElURV9MSVNUX1NUQVJU OwogCiAJCS8qIE5vdGhpbmcgdG8gYmUgc2F2ZWQgb3IgcmVzdG9yZWQgZm9yIG5vdy4gKi8KLQkJ cmVnX3N0YXRlLT5tbWlvX3doaXRlX2xpc3RbaV0uY291bnQgPSAwOworCQlyZWdfc3RhdGUtPm1t aW9fd2hpdGVfbGlzdFtyaW5nLT5ndWNfaWRdLmNvdW50ID0gMDsKIAl9CiAKIAlhZHMtPnJlZ19z dGF0ZV9hZGRyID0gYWRzLT5zY2hlZHVsZXJfcG9saWNpZXMgKwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWMuaAppbmRleCAwNDViMTQ5Li43MzAwMmU5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaApA QCAtNDYsNyArNDYsNyBAQCBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50IHsKIAl1aW50MzJfdCB3cV9o ZWFkOwogCiAJLyogR3VDIHN1Ym1pc3Npb24gc3RhdGlzdGljcyAmIHN0YXR1cyAqLwotCXVpbnQ2 NF90IHN1Ym1pc3Npb25zW0k5MTVfTlVNX1JJTkdTXTsKKwl1aW50NjRfdCBzdWJtaXNzaW9uc1tH VUNfTUFYX0VOR0lORVNfTlVNXTsKIAl1aW50MzJfdCBxX2ZhaWw7CiAJdWludDMyX3QgYl9mYWls OwogCWludCByZXRjb2RlOwpAQCAtMTA2LDggKzEwNiw4IEBAIHN0cnVjdCBpbnRlbF9ndWMgewog CXVpbnQzMl90IGFjdGlvbl9mYWlsOwkJLyogVG90YWwgbnVtYmVyIG9mIGZhaWx1cmVzCSovCiAJ aW50MzJfdCBhY3Rpb25fZXJyOwkJLyogTGFzdCBlcnJvciBjb2RlCQkqLwogCi0JdWludDY0X3Qg c3VibWlzc2lvbnNbSTkxNV9OVU1fUklOR1NdOwotCXVpbnQzMl90IGxhc3Rfc2Vxbm9bSTkxNV9O VU1fUklOR1NdOworCXVpbnQ2NF90IHN1Ym1pc3Npb25zW0dVQ19NQVhfRU5HSU5FU19OVU1dOwor CXVpbnQzMl90IGxhc3Rfc2Vxbm9bR1VDX01BWF9FTkdJTkVTX05VTV07CiB9OwogCiAvKiBpbnRl bF9ndWNfbG9hZGVyLmMgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19md2lmLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCmluZGV4 IDE4NTZhNDcuLjJkZTU3ZmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19md2lmLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaApA QCAtNDQsNiArNDQsMTMgQEAKICNkZWZpbmUgR1VDX01BWF9HUFVfQ09OVEVYVFMJCTEwMjQKICNk ZWZpbmUJR1VDX0lOVkFMSURfQ1RYX0lECQlHVUNfTUFYX0dQVV9DT05URVhUUwogCisjZGVmaW5l IEdVQ19SRU5ERVJfRU5HSU5FCQkwCisjZGVmaW5lIEdVQ19WSURFT19FTkdJTkUJCTEKKyNkZWZp bmUgR1VDX0JMSVRURVJfRU5HSU5FCQkyCisjZGVmaW5lIEdVQ19WSURFT0VOSEFOQ0VfRU5HSU5F CQkzCisjZGVmaW5lIEdVQ19WSURFT19FTkdJTkUyCQk0CisjZGVmaW5lIEdVQ19NQVhfRU5HSU5F U19OVU0JCShHVUNfVklERU9fRU5HSU5FMiArIDEpCisKIC8qIFdvcmsgcXVldWUgaXRlbSBoZWFk ZXIgZGVmaW5pdGlvbnMgKi8KICNkZWZpbmUgV1FfU1RBVFVTX0FDVElWRQkJMQogI2RlZmluZSBX UV9TVEFUVVNfU1VTUEVOREVECQkyCkBAIC0yODUsNyArMjkyLDcgQEAgc3RydWN0IGd1Y19jb250 ZXh0X2Rlc2MgewogCXU2NCBkYl90cmlnZ2VyX3BoeTsKIAl1MTYgZGJfaWQ7CiAKLQlzdHJ1Y3Qg Z3VjX2V4ZWNsaXN0X2NvbnRleHQgbHJjW0k5MTVfTlVNX1JJTkdTXTsKKwlzdHJ1Y3QgZ3VjX2V4 ZWNsaXN0X2NvbnRleHQgbHJjW0dVQ19NQVhfRU5HSU5FU19OVU1dOwogCiAJdTggYXR0cmlidXRl OwogCkBAIC0zNDQsNyArMzUxLDcgQEAgc3RydWN0IGd1Y19wb2xpY3kgewogfSBfX3BhY2tlZDsK IAogc3RydWN0IGd1Y19wb2xpY2llcyB7Ci0Jc3RydWN0IGd1Y19wb2xpY3kgcG9saWN5W0dVQ19D VFhfUFJJT1JJVFlfTlVNXVtJOTE1X05VTV9SSU5HU107CisJc3RydWN0IGd1Y19wb2xpY3kgcG9s aWN5W0dVQ19DVFhfUFJJT1JJVFlfTlVNXVtHVUNfTUFYX0VOR0lORVNfTlVNXTsKIAogCS8qIElu IG1pY3JvIHNlY29uZHMuIEhvdyBtdWNoIHRpbWUgdG8gYWxsb3cgYmVmb3JlIERQQyBwcm9jZXNz aW5nIGlzCiAJICogY2FsbGVkIGJhY2sgdmlhIGludGVycnVwdCAodG8gcHJldmVudCBEUEMgcXVl dWUgZHJhaW4gc3RhcnZpbmcpLgpAQCAtMzg4LDE0ICszOTUsMTQgQEAgc3RydWN0IGd1Y19tbWlv X3JlZ3NldCB7CiAKIHN0cnVjdCBndWNfbW1pb19yZWdfc3RhdGUgewogCXN0cnVjdCBndWNfbW1p b19yZWdzZXQgZ2xvYmFsX3JlZzsKLQlzdHJ1Y3QgZ3VjX21taW9fcmVnc2V0IGVuZ2luZV9yZWdb STkxNV9OVU1fUklOR1NdOworCXN0cnVjdCBndWNfbW1pb19yZWdzZXQgZW5naW5lX3JlZ1tHVUNf TUFYX0VOR0lORVNfTlVNXTsKIAogCS8qIE1NSU8gcmVnaXN0ZXJzIHRoYXQgYXJlIHNldCBhcyBu b24gcHJpdmlsZWdlZCAqLwogCXN0cnVjdCBfX3BhY2tlZCB7CiAJCXUzMiBtbWlvX3N0YXJ0Owog CQl1MzIgb2Zmc2V0c1tHVUNfTU1JT19XSElURV9MSVNUX01BWF07CiAJCXUzMiBjb3VudDsKLQl9 IG1taW9fd2hpdGVfbGlzdFtJOTE1X05VTV9SSU5HU107CisJfSBtbWlvX3doaXRlX2xpc3RbR1VD X01BWF9FTkdJTkVTX05VTV07CiB9IF9fcGFja2VkOwogCiAvKiBHdUMgQWRkaXRpb25hbCBEYXRh IFN0cnVjdCAqLwpAQCAtNDA2LDcgKzQxMyw3IEBAIHN0cnVjdCBndWNfYWRzIHsKIAl1MzIgZ29s ZGVuX2NvbnRleHRfbHJjYTsKIAl1MzIgc2NoZWR1bGVyX3BvbGljaWVzOwogCXUzMiByZXNlcnZl ZDBbM107Ci0JdTMyIGVuZ19zdGF0ZV9zaXplW0k5MTVfTlVNX1JJTkdTXTsKKwl1MzIgZW5nX3N0 YXRlX3NpemVbR1VDX01BWF9FTkdJTkVTX05VTV07CiAJdTMyIHJlc2VydmVkMls0XTsKIH0gX19w YWNrZWQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNzNkNDM0Ny4uZWZiOTFhZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTIwODYsNiArMjA4Niw3IEBAIHN0YXRpYyBp bnQgbG9naWNhbF9yZW5kZXJfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmlu Zy0+bmFtZSA9ICJyZW5kZXIgcmluZyI7CiAJcmluZy0+aWQgPSBSQ1M7CiAJcmluZy0+ZXhlY19p ZCA9IEk5MTVfRVhFQ19SRU5ERVI7CisJcmluZy0+Z3VjX2lkID0gR1VDX1JFTkRFUl9FTkdJTkU7 CiAJcmluZy0+bW1pb19iYXNlID0gUkVOREVSX1JJTkdfQkFTRTsKIAogCWxvZ2ljYWxfcmluZ19k ZWZhdWx0X2lycXMocmluZywgR0VOOF9SQ1NfSVJRX1NISUZUKTsKQEAgLTIxMzcsNiArMjEzOCw3 IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9ic2RfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJcmluZy0+bmFtZSA9ICJic2QgcmluZyI7CiAJcmluZy0+aWQgPSBWQ1M7CiAJcmluZy0+ ZXhlY19pZCA9IEk5MTVfRVhFQ19CU0Q7CisJcmluZy0+Z3VjX2lkID0gR1VDX1ZJREVPX0VOR0lO RTsKIAlyaW5nLT5tbWlvX2Jhc2UgPSBHRU42X0JTRF9SSU5HX0JBU0U7CiAKIAlsb2dpY2FsX3Jp bmdfZGVmYXVsdF9pcnFzKHJpbmcsIEdFTjhfVkNTMV9JUlFfU0hJRlQpOwpAQCAtMjE1Myw2ICsy MTU1LDcgQEAgc3RhdGljIGludCBsb2dpY2FsX2JzZDJfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJcmluZy0+bmFtZSA9ICJic2QyIHJpbmciOwogCXJpbmctPmlkID0gVkNTMjsK IAlyaW5nLT5leGVjX2lkID0gSTkxNV9FWEVDX0JTRDsKKwlyaW5nLT5ndWNfaWQgPSBHVUNfVklE RU9fRU5HSU5FMjsKIAlyaW5nLT5tbWlvX2Jhc2UgPSBHRU44X0JTRDJfUklOR19CQVNFOwogCiAJ bG9naWNhbF9yaW5nX2RlZmF1bHRfaXJxcyhyaW5nLCBHRU44X1ZDUzJfSVJRX1NISUZUKTsKQEAg LTIxNjksNiArMjE3Miw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9ibHRfcmluZ19pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJcmluZy0+bmFtZSA9ICJibGl0dGVyIHJpbmciOwogCXJpbmct PmlkID0gQkNTOwogCXJpbmctPmV4ZWNfaWQgPSBJOTE1X0VYRUNfQkxUOworCXJpbmctPmd1Y19p ZCA9IEdVQ19CTElUVEVSX0VOR0lORTsKIAlyaW5nLT5tbWlvX2Jhc2UgPSBCTFRfUklOR19CQVNF OwogCiAJbG9naWNhbF9yaW5nX2RlZmF1bHRfaXJxcyhyaW5nLCBHRU44X0JDU19JUlFfU0hJRlQp OwpAQCAtMjE4NSw2ICsyMTg5LDcgQEAgc3RhdGljIGludCBsb2dpY2FsX3ZlYm94X3JpbmdfaW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJpbmctPm5hbWUgPSAidmlkZW8gZW5oYW5jZW1l bnQgcmluZyI7CiAJcmluZy0+aWQgPSBWRUNTOwogCXJpbmctPmV4ZWNfaWQgPSBJOTE1X0VYRUNf VkVCT1g7CisJcmluZy0+Z3VjX2lkID0gR1VDX1ZJREVPRU5IQU5DRV9FTkdJTkU7CiAJcmluZy0+ bW1pb19iYXNlID0gVkVCT1hfUklOR19CQVNFOwogCiAJbG9naWNhbF9yaW5nX2RlZmF1bHRfaXJx cyhyaW5nLCBHRU44X1ZFQ1NfSVJRX1NISUZUKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaAppbmRleCBiMTJmMmFhLi41NjZiMGFlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0xNTgsNiArMTU4LDcgQEAgc3RydWN0ICBpbnRlbF9lbmdp bmVfY3MgewogI2RlZmluZSBJOTE1X05VTV9SSU5HUyA1CiAjZGVmaW5lIF9WQ1MobikgKFZDUyAr IChuKSkKIAl1bnNpZ25lZCBpbnQgZXhlY19pZDsKKwl1bnNpZ25lZCBpbnQgZ3VjX2lkOwogCXUz MgkJbW1pb19iYXNlOwogCXN0cnVjdAkJZHJtX2RldmljZSAqZGV2OwogCXN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpidWZmZXI7Ci0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK