From: Leo Liu Subject: [PATCH 08/21] drm/amdgpu: remove unnecessary JPEG2.0 code from VCN2.0 Date: Tue, 12 Nov 2019 13:03:16 -0500 Message-ID: <20191112180329.3927-9-leo.liu@amd.com> References: <20191112180329.3927-1-leo.liu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191112180329.3927-1-leo.liu-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Leo Liu VGhleSBhcmUgbm8gbG9uZ2VyIG5lZWRlZCwgdXNpbmcgZnJvbSBKUEVHMi4wIGluc3RlYWQuCgpT aWduZWQtb2ZmLWJ5OiBMZW8gTGl1IDxsZW8ubGl1QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvdmNuX3YyXzAuYyB8IDI2MCArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMjU3IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3Zjbl92Ml8wLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS92Y25fdjJfMC5jCmluZGV4IDM4Zjc4N2E1NjBjYi4uZGVkMGFi NTc0ZjRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y25fdjJfMC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3Zjbl92Ml8wLmMKQEAgLTc0LDcgKzc0 LDYgQEAKIAogc3RhdGljIHZvaWQgdmNuX3YyXzBfc2V0X2RlY19yaW5nX2Z1bmNzKHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2KTsKIHN0YXRpYyB2b2lkIHZjbl92Ml8wX3NldF9lbmNfcmluZ19m dW5jcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7Ci1zdGF0aWMgdm9pZCB2Y25fdjJfMF9z ZXRfanBlZ19yaW5nX2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKIHN0YXRpYyB2 b2lkIHZjbl92Ml8wX3NldF9pcnFfZnVuY3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwog c3RhdGljIGludCB2Y25fdjJfMF9zZXRfcG93ZXJnYXRpbmdfc3RhdGUodm9pZCAqaGFuZGxlLAog CQkJCWVudW0gYW1kX3Bvd2VyZ2F0aW5nX3N0YXRlIHN0YXRlKTsKQEAgLTk3LDcgKzk2LDYgQEAg c3RhdGljIGludCB2Y25fdjJfMF9lYXJseV9pbml0KHZvaWQgKmhhbmRsZSkKIAogCXZjbl92Ml8w X3NldF9kZWNfcmluZ19mdW5jcyhhZGV2KTsKIAl2Y25fdjJfMF9zZXRfZW5jX3JpbmdfZnVuY3Mo YWRldik7Ci0JdmNuX3YyXzBfc2V0X2pwZWdfcmluZ19mdW5jcyhhZGV2KTsKIAl2Y25fdjJfMF9z ZXRfaXJxX2Z1bmNzKGFkZXYpOwogCiAJcmV0dXJuIDA7CkBAIC0xMzIsMTIgKzEzMCw2IEBAIHN0 YXRpYyBpbnQgdmNuX3YyXzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJCQlyZXR1cm4gcjsKIAl9 CiAKLQkvKiBWQ04gSlBFRyBUUkFQICovCi0JciA9IGFtZGdwdV9pcnFfYWRkX2lkKGFkZXYsIFNP QzE1X0lIX0NMSUVOVElEX1ZDTiwKLQkJCSAgICAgIFZDTl8yXzBfX1NSQ0lEX19KUEVHX0RFQ09E RSwgJmFkZXYtPnZjbi5pbnN0LT5pcnEpOwotCWlmIChyKQotCQlyZXR1cm4gcjsKLQogCXIgPSBh bWRncHVfdmNuX3N3X2luaXQoYWRldik7CiAJaWYgKHIpCiAJCXJldHVybiByOwpAQCAtMTk0LDE5 ICsxODYsOCBAQCBzdGF0aWMgaW50IHZjbl92Ml8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCQkJ cmV0dXJuIHI7CiAJfQogCi0JcmluZyA9ICZhZGV2LT52Y24uaW5zdC0+cmluZ19qcGVnOwotCXJp bmctPnVzZV9kb29yYmVsbCA9IHRydWU7Ci0JcmluZy0+ZG9vcmJlbGxfaW5kZXggPSAoYWRldi0+ ZG9vcmJlbGxfaW5kZXgudmNuLnZjbl9yaW5nMF8xIDw8IDEpICsgMTsKLQlzcHJpbnRmKHJpbmct Pm5hbWUsICJ2Y25fanBlZyIpOwotCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcsIDUx MiwgJmFkZXYtPnZjbi5pbnN0LT5pcnEsIDApOwotCWlmIChyKQotCQlyZXR1cm4gcjsKLQogCWFk ZXYtPnZjbi5wYXVzZV9kcGdfbW9kZSA9IHZjbl92Ml8wX3BhdXNlX2RwZ19tb2RlOwogCi0JYWRl di0+dmNuLmludGVybmFsLmpwZWdfcGl0Y2ggPSBtbVVWRF9KUEVHX1BJVENIX0lOVEVSTkFMX09G RlNFVDsKLQlhZGV2LT52Y24uaW5zdC0+ZXh0ZXJuYWwuanBlZ19waXRjaCA9IFNPQzE1X1JFR19P RkZTRVQoVVZELCAwLCBtbVVWRF9KUEVHX1BJVENIKTsKLQogCXJldHVybiAwOwogfQogCkBAIC0y NTgsMTEgKzIzOSw2IEBAIHN0YXRpYyBpbnQgdmNuX3YyXzBfaHdfaW5pdCh2b2lkICpoYW5kbGUp CiAJCQlnb3RvIGRvbmU7CiAJfQogCi0JcmluZyA9ICZhZGV2LT52Y24uaW5zdC0+cmluZ19qcGVn OwotCXIgPSBhbWRncHVfcmluZ190ZXN0X2hlbHBlcihyaW5nKTsKLQlpZiAocikKLQkJZ290byBk b25lOwotCiBkb25lOgogCWlmICghcikKIAkJRFJNX0lORk8oIlZDTiBkZWNvZGUgYW5kIGVuY29k ZSBpbml0aWFsaXplZCBzdWNjZXNzZnVsbHkodW5kZXIgJXMpLlxuIiwKQEAgLTI5Niw5ICsyNzIs NiBAQCBzdGF0aWMgaW50IHZjbl92Ml8wX2h3X2Zpbmkodm9pZCAqaGFuZGxlKQogCQlyaW5nLT5z Y2hlZC5yZWFkeSA9IGZhbHNlOwogCX0KIAotCXJpbmcgPSAmYWRldi0+dmNuLmluc3QtPnJpbmdf anBlZzsKLQlyaW5nLT5zY2hlZC5yZWFkeSA9IGZhbHNlOwotCiAJcmV0dXJuIDA7CiB9CiAKQEAg LTM5Myw3ICszNjYsNiBAQCBzdGF0aWMgdm9pZCB2Y25fdjJfMF9tY19yZXN1bWUoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpCiAJV1JFRzMyX1NPQzE1KFVWRCwgMCwgbW1VVkRfVkNQVV9DQUNI RV9TSVpFMiwgQU1ER1BVX1ZDTl9DT05URVhUX1NJWkUpOwogCiAJV1JFRzMyX1NPQzE1KFVWRCwg MCwgbW1VVkRfR0ZYMTBfQUREUl9DT05GSUcsIGFkZXYtPmdmeC5jb25maWcuZ2JfYWRkcl9jb25m aWcpOwotCVdSRUczMl9TT0MxNShVVkQsIDAsIG1tSlBFR19ERUNfR0ZYMTBfQUREUl9DT05GSUcs IGFkZXYtPmdmeC5jb25maWcuZ2JfYWRkcl9jb25maWcpOwogfQogCiBzdGF0aWMgdm9pZCB2Y25f djJfMF9tY19yZXN1bWVfZHBnX21vZGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGJvb2wg aW5kaXJlY3QpCkBAIC02NDcsMTI5ICs2MTksNiBAQCBzdGF0aWMgdm9pZCB2Y25fdjJfMF9jbG9j a19nYXRpbmdfZHBnX21vZGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCVVWRCwgMCwg bW1VVkRfU1VWRF9DR0NfQ1RSTCksIDAsIHNyYW1fc2VsLCBpbmRpcmVjdCk7CiB9CiAKLS8qKgot ICoganBlZ192Ml8wX3N0YXJ0IC0gc3RhcnQgSlBFRyBibG9jawotICoKLSAqIEBhZGV2OiBhbWRn cHVfZGV2aWNlIHBvaW50ZXIKLSAqCi0gKiBTZXR1cCBhbmQgc3RhcnQgdGhlIEpQRUcgYmxvY2sK LSAqLwotc3RhdGljIGludCBqcGVnX3YyXzBfc3RhcnQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYpCi17Ci0Jc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nID0gJmFkZXYtPnZjbi5pbnN0LT5yaW5n X2pwZWc7Ci0JdWludDMyX3QgdG1wOwotCWludCByID0gMDsKLQotCS8qIGRpc2FibGUgcG93ZXIg Z2F0aW5nICovCi0JdG1wID0gMSA8PCBVVkRfUEdGU01fQ09ORklHX19VVkRKX1BXUl9DT05GSUdf X1NISUZUOwotCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKFVWRCwgMCwgbW1VVkRfUEdGU01fQ09O RklHKSwgdG1wKTsKLQotCVNPQzE1X1dBSVRfT05fUlJFRyhWQ04sIDAsCi0JCW1tVVZEX1BHRlNN X1NUQVRVUywgVVZEX1BHRlNNX1NUQVRVU19VVkRKX1BXUl9PTiwKLQkJVVZEX1BHRlNNX1NUQVRV U19fVVZESl9QV1JfU1RBVFVTX01BU0ssIHIpOwotCi0JaWYgKHIpIHsKLQkJRFJNX0VSUk9SKCJh bWRncHU6IEpQRUcgZGlzYWJsZSBwb3dlciBnYXRpbmcgZmFpbGVkXG4iKTsKLQkJcmV0dXJuIHI7 Ci0JfQotCi0JLyogUmVtb3ZpbmcgdGhlIGFudGkgaGFuZyBtZWNoYW5pc20gdG8gaW5kaWNhdGUg dGhlIFVWREogdGlsZSBpcyBPTiAqLwotCXRtcCA9IFJSRUczMihTT0MxNV9SRUdfT0ZGU0VUKFVW RCwgMCwgbW1VVkRfSlBFR19QT1dFUl9TVEFUVVMpKSAmIH4weDE7Ci0JV1JFRzMyKFNPQzE1X1JF R19PRkZTRVQoVVZELCAwLCBtbVVWRF9KUEVHX1BPV0VSX1NUQVRVUyksIHRtcCk7Ci0KLQkvKiBK UEVHIGRpc2FibGUgQ0dDICovCi0JdG1wID0gUlJFRzMyX1NPQzE1KFZDTiwgMCwgbW1KUEVHX0NH Q19DVFJMKTsKLQl0bXAgfD0gMSA8PCBKUEVHX0NHQ19DVFJMX19EWU5fQ0xPQ0tfTU9ERV9fU0hJ RlQ7Ci0JdG1wIHw9IDEgPDwgSlBFR19DR0NfQ1RSTF9fQ0xLX0dBVEVfRExZX1RJTUVSX19TSElG VDsKLQl0bXAgfD0gNCA8PCBKUEVHX0NHQ19DVFJMX19DTEtfT0ZGX0RFTEFZX19TSElGVDsKLQlX UkVHMzJfU09DMTUoVkNOLCAwLCBtbUpQRUdfQ0dDX0NUUkwsIHRtcCk7Ci0KLQl0bXAgPSBSUkVH MzJfU09DMTUoVkNOLCAwLCBtbUpQRUdfQ0dDX0dBVEUpOwotCXRtcCAmPSB+KEpQRUdfQ0dDX0dB VEVfX0pQRUdfREVDX01BU0sKLQkJfCBKUEVHX0NHQ19HQVRFX19KUEVHMl9ERUNfTUFTSwotCQl8 IEpQRUdfQ0dDX0dBVEVfX0pQRUdfRU5DX01BU0sKLQkJfCBKUEVHX0NHQ19HQVRFX19KTUNJRl9N QVNLCi0JCXwgSlBFR19DR0NfR0FURV9fSlJCQk1fTUFTSyk7Ci0JV1JFRzMyX1NPQzE1KFZDTiwg MCwgbW1KUEVHX0NHQ19HQVRFLCB0bXApOwotCi0JLyogZW5hYmxlIEpNSSBjaGFubmVsICovCi0J V1JFRzMyX1AoU09DMTVfUkVHX09GRlNFVChVVkQsIDAsIG1tVVZEX0pNSV9DTlRMKSwgMCwKLQkJ flVWRF9KTUlfQ05UTF9fU09GVF9SRVNFVF9NQVNLKTsKLQotCS8qIGVuYWJsZSBTeXN0ZW0gSW50 ZXJydXB0IGZvciBKUkJDICovCi0JV1JFRzMyX1AoU09DMTVfUkVHX09GRlNFVChWQ04sIDAsIG1t SlBFR19TWVNfSU5UX0VOKSwKLQkJSlBFR19TWVNfSU5UX0VOX19ESlJCQ19NQVNLLAotCQl+SlBF R19TWVNfSU5UX0VOX19ESlJCQ19NQVNLKTsKLQotCVdSRUczMl9TT0MxNShVVkQsIDAsIG1tVVZE X0xNSV9KUkJDX1JCX1ZNSUQsIDApOwotCVdSRUczMl9TT0MxNShVVkQsIDAsIG1tVVZEX0pSQkNf UkJfQ05UTCwgKDB4MDAwMDAwMDFMIHwgMHgwMDAwMDAwMkwpKTsKLQlXUkVHMzJfU09DMTUoVVZE LCAwLCBtbVVWRF9MTUlfSlJCQ19SQl82NEJJVF9CQVJfTE9XLAotCQlsb3dlcl8zMl9iaXRzKHJp bmctPmdwdV9hZGRyKSk7Ci0JV1JFRzMyX1NPQzE1KFVWRCwgMCwgbW1VVkRfTE1JX0pSQkNfUkJf NjRCSVRfQkFSX0hJR0gsCi0JCXVwcGVyXzMyX2JpdHMocmluZy0+Z3B1X2FkZHIpKTsKLQlXUkVH MzJfU09DMTUoVVZELCAwLCBtbVVWRF9KUkJDX1JCX1JQVFIsIDApOwotCVdSRUczMl9TT0MxNShV VkQsIDAsIG1tVVZEX0pSQkNfUkJfV1BUUiwgMCk7Ci0JV1JFRzMyX1NPQzE1KFVWRCwgMCwgbW1V VkRfSlJCQ19SQl9DTlRMLCAweDAwMDAwMDAyTCk7Ci0JV1JFRzMyX1NPQzE1KFVWRCwgMCwgbW1V VkRfSlJCQ19SQl9TSVpFLCByaW5nLT5yaW5nX3NpemUgLyA0KTsKLQlyaW5nLT53cHRyID0gUlJF RzMyX1NPQzE1KFVWRCwgMCwgbW1VVkRfSlJCQ19SQl9XUFRSKTsKLQotCXJldHVybiAwOwotfQot Ci0vKioKLSAqIGpwZWdfdjJfMF9zdG9wIC0gc3RvcCBKUEVHIGJsb2NrCi0gKgotICogQGFkZXY6 IGFtZGdwdV9kZXZpY2UgcG9pbnRlcgotICoKLSAqIHN0b3AgdGhlIEpQRUcgYmxvY2sKLSAqLwot c3RhdGljIGludCBqcGVnX3YyXzBfc3RvcChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKLXsK LQl1aW50MzJfdCB0bXA7Ci0JaW50IHIgPSAwOwotCi0JLyogcmVzZXQgSk1JICovCi0JV1JFRzMy X1AoU09DMTVfUkVHX09GRlNFVChVVkQsIDAsIG1tVVZEX0pNSV9DTlRMKSwKLQkJVVZEX0pNSV9D TlRMX19TT0ZUX1JFU0VUX01BU0ssCi0JCX5VVkRfSk1JX0NOVExfX1NPRlRfUkVTRVRfTUFTSyk7 Ci0KLQkvKiBlbmFibGUgSlBFRyBDR0MgKi8KLQl0bXAgPSBSUkVHMzJfU09DMTUoVkNOLCAwLCBt bUpQRUdfQ0dDX0NUUkwpOwotCXRtcCB8PSAxIDw8IEpQRUdfQ0dDX0NUUkxfX0RZTl9DTE9DS19N T0RFX19TSElGVDsKLQl0bXAgfD0gMSA8PCBKUEVHX0NHQ19DVFJMX19DTEtfR0FURV9ETFlfVElN RVJfX1NISUZUOwotCXRtcCB8PSA0IDw8IEpQRUdfQ0dDX0NUUkxfX0NMS19PRkZfREVMQVlfX1NI SUZUOwotCVdSRUczMl9TT0MxNShWQ04sIDAsIG1tSlBFR19DR0NfQ1RSTCwgdG1wKTsKLQotCi0J dG1wID0gUlJFRzMyX1NPQzE1KFZDTiwgMCwgbW1KUEVHX0NHQ19HQVRFKTsKLQl0bXAgfD0gKEpQ RUdfQ0dDX0dBVEVfX0pQRUdfREVDX01BU0sKLQkJfEpQRUdfQ0dDX0dBVEVfX0pQRUcyX0RFQ19N QVNLCi0JCXxKUEVHX0NHQ19HQVRFX19KUEVHX0VOQ19NQVNLCi0JCXxKUEVHX0NHQ19HQVRFX19K TUNJRl9NQVNLCi0JCXxKUEVHX0NHQ19HQVRFX19KUkJCTV9NQVNLKTsKLQlXUkVHMzJfU09DMTUo VkNOLCAwLCBtbUpQRUdfQ0dDX0dBVEUsIHRtcCk7Ci0KLQkvKiBlbmFibGUgcG93ZXIgZ2F0aW5n ICovCi0JdG1wID0gUlJFRzMyKFNPQzE1X1JFR19PRkZTRVQoVVZELCAwLCBtbVVWRF9KUEVHX1BP V0VSX1NUQVRVUykpOwotCXRtcCAmPSB+VVZEX0pQRUdfUE9XRVJfU1RBVFVTX19KUEVHX1BPV0VS X1NUQVRVU19NQVNLOwotCXRtcCB8PSAgMHgxOyAvL1VWRF9KUEVHX1BPV0VSX1NUQVRVU19fSlBF R19QT1dFUl9TVEFUVVNfVElMRVNfT0ZGOwotCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKFVWRCwg MCwgbW1VVkRfSlBFR19QT1dFUl9TVEFUVVMpLCB0bXApOwotCi0JdG1wID0gMiA8PCBVVkRfUEdG U01fQ09ORklHX19VVkRKX1BXUl9DT05GSUdfX1NISUZUOwotCVdSRUczMihTT0MxNV9SRUdfT0ZG U0VUKFVWRCwgMCwgbW1VVkRfUEdGU01fQ09ORklHKSwgdG1wKTsKLQotCVNPQzE1X1dBSVRfT05f UlJFRyhWQ04sIDAsIG1tVVZEX1BHRlNNX1NUQVRVUywKLQkJKDIgPDwgVVZEX1BHRlNNX1NUQVRV U19fVVZESl9QV1JfU1RBVFVTX19TSElGVCksCi0JCVVWRF9QR0ZTTV9TVEFUVVNfX1VWREpfUFdS X1NUQVRVU19NQVNLLCByKTsKLQotCWlmIChyKSB7Ci0JCURSTV9FUlJPUigiYW1kZ3B1OiBKUEVH IGVuYWJsZSBwb3dlciBnYXRpbmcgZmFpbGVkXG4iKTsKLQkJcmV0dXJuIHI7Ci0JfQotCi0JcmV0 dXJuIHI7Ci19Ci0KIC8qKgogICogdmNuX3YyXzBfZW5hYmxlX2Nsb2NrX2dhdGluZyAtIGVuYWJs ZSBWQ04gY2xvY2sgZ2F0aW5nCiAgKgpAQCAtMTA1MiwxMiArOTAxLDggQEAgc3RhdGljIGludCB2 Y25fdjJfMF9zdGFydChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlpZiAoYWRldi0+cG0u ZHBtX2VuYWJsZWQpCiAJCWFtZGdwdV9kcG1fZW5hYmxlX3V2ZChhZGV2LCB0cnVlKTsKIAotCWlm IChhZGV2LT5wZ19mbGFncyAmIEFNRF9QR19TVVBQT1JUX1ZDTl9EUEcpIHsKLQkJciA9IHZjbl92 Ml8wX3N0YXJ0X2RwZ19tb2RlKGFkZXYsIGFkZXYtPnZjbi5pbmRpcmVjdF9zcmFtKTsKLQkJaWYg KHIpCi0JCQlyZXR1cm4gcjsKLQkJZ290byBqcGVnOwotCX0KKwlpZiAoYWRldi0+cGdfZmxhZ3Mg JiBBTURfUEdfU1VQUE9SVF9WQ05fRFBHKQorCQlyZXR1cm4gdmNuX3YyXzBfc3RhcnRfZHBnX21v ZGUoYWRldiwgYWRldi0+dmNuLmluZGlyZWN0X3NyYW0pOwogCiAJdmNuX3YyXzBfZGlzYWJsZV9z dGF0aWNfcG93ZXJfZ2F0aW5nKGFkZXYpOwogCkBAIC0xMjA5LDEwICsxMDU0LDcgQEAgc3RhdGlj IGludCB2Y25fdjJfMF9zdGFydChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlXUkVHMzJf U09DMTUoVVZELCAwLCBtbVVWRF9SQl9CQVNFX0hJMiwgdXBwZXJfMzJfYml0cyhyaW5nLT5ncHVf YWRkcikpOwogCVdSRUczMl9TT0MxNShVVkQsIDAsIG1tVVZEX1JCX1NJWkUyLCByaW5nLT5yaW5n X3NpemUgLyA0KTsKIAotanBlZzoKLQlyID0ganBlZ192Ml8wX3N0YXJ0KGFkZXYpOwotCi0JcmV0 dXJuIHI7CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQgdmNuX3YyXzBfc3RvcF9kcGdfbW9k ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKQEAgLTEyMzEsOSArMTA3Myw2IEBAIHN0YXRp YyBpbnQgdmNuX3YyXzBfc3RvcF9kcGdfbW9kZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK IAl0bXAgPSBSUkVHMzJfU09DMTUoVVZELCAwLCBtbVVWRF9SQl9XUFRSMik7CiAJU09DMTVfV0FJ VF9PTl9SUkVHKFVWRCwgMCwgbW1VVkRfUkJfUlBUUjIsIHRtcCwgMHhGRkZGRkZGRiwgcmV0X2Nv ZGUpOwogCi0JdG1wID0gUlJFRzMyX1NPQzE1KFVWRCwgMCwgbW1VVkRfSlJCQ19SQl9XUFRSKTsK LQlTT0MxNV9XQUlUX09OX1JSRUcoVVZELCAwLCBtbVVWRF9KUkJDX1JCX1JQVFIsIHRtcCwgMHhG RkZGRkZGRiwgcmV0X2NvZGUpOwotCiAJdG1wID0gUlJFRzMyX1NPQzE1KFVWRCwgMCwgbW1VVkRf UkJDX1JCX1dQVFIpICYgMHg3RkZGRkZGRjsKIAlTT0MxNV9XQUlUX09OX1JSRUcoVVZELCAwLCBt bVVWRF9SQkNfUkJfUlBUUiwgdG1wLCAweEZGRkZGRkZGLCByZXRfY29kZSk7CiAKQEAgLTEyNTIs MTAgKzEwOTEsNiBAQCBzdGF0aWMgaW50IHZjbl92Ml8wX3N0b3Aoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiAJdWludDMyX3QgdG1wOwogCWludCByOwogCi0JciA9IGpwZWdfdjJfMF9zdG9w KGFkZXYpOwotCWlmIChyKQotCQlyZXR1cm4gcjsKLQogCWlmIChhZGV2LT5wZ19mbGFncyAmIEFN RF9QR19TVVBQT1JUX1ZDTl9EUEcpIHsKIAkJciA9IHZjbl92Ml8wX3N0b3BfZHBnX21vZGUoYWRl dik7CiAJCWlmIChyKQpAQCAtMTc4MSw1NiArMTYxNiw2IEBAIHZvaWQgdmNuX3YyXzBfZW5jX3Jp bmdfZW1pdF93cmVnKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgdWludDMyX3QgcmVnLCB1aW50 MzJfCiAJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgdmFsKTsKIH0KIAotLyoqCi0gKiB2Y25fdjJf MF9qcGVnX3JpbmdfZ2V0X3JwdHIgLSBnZXQgcmVhZCBwb2ludGVyCi0gKgotICogQHJpbmc6IGFt ZGdwdV9yaW5nIHBvaW50ZXIKLSAqCi0gKiBSZXR1cm5zIHRoZSBjdXJyZW50IGhhcmR3YXJlIHJl YWQgcG9pbnRlcgotICovCi1zdGF0aWMgdWludDY0X3QgdmNuX3YyXzBfanBlZ19yaW5nX2dldF9y cHRyKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKLXsKLQlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiA9IHJpbmctPmFkZXY7Ci0KLQlyZXR1cm4gUlJFRzMyX1NPQzE1KFVWRCwgMCwgbW1VVkRf SlJCQ19SQl9SUFRSKTsKLX0KLQotLyoqCi0gKiB2Y25fdjJfMF9qcGVnX3JpbmdfZ2V0X3dwdHIg LSBnZXQgd3JpdGUgcG9pbnRlcgotICoKLSAqIEByaW5nOiBhbWRncHVfcmluZyBwb2ludGVyCi0g KgotICogUmV0dXJucyB0aGUgY3VycmVudCBoYXJkd2FyZSB3cml0ZSBwb2ludGVyCi0gKi8KLXN0 YXRpYyB1aW50NjRfdCB2Y25fdjJfMF9qcGVnX3JpbmdfZ2V0X3dwdHIoc3RydWN0IGFtZGdwdV9y aW5nICpyaW5nKQotewotCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcmluZy0+YWRldjsK LQotCWlmIChyaW5nLT51c2VfZG9vcmJlbGwpCi0JCXJldHVybiBhZGV2LT53Yi53YltyaW5nLT53 cHRyX29mZnNdOwotCWVsc2UKLQkJcmV0dXJuIFJSRUczMl9TT0MxNShVVkQsIDAsIG1tVVZEX0pS QkNfUkJfV1BUUik7Ci19Ci0KLS8qKgotICogdmNuX3YyXzBfanBlZ19yaW5nX3NldF93cHRyIC0g c2V0IHdyaXRlIHBvaW50ZXIKLSAqCi0gKiBAcmluZzogYW1kZ3B1X3JpbmcgcG9pbnRlcgotICoK LSAqIENvbW1pdHMgdGhlIHdyaXRlIHBvaW50ZXIgdG8gdGhlIGhhcmR3YXJlCi0gKi8KLXN0YXRp YyB2b2lkIHZjbl92Ml8wX2pwZWdfcmluZ19zZXRfd3B0cihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJp bmcpCi17Ci0Jc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSByaW5nLT5hZGV2OwotCi0JaWYg KHJpbmctPnVzZV9kb29yYmVsbCkgewotCQlhZGV2LT53Yi53YltyaW5nLT53cHRyX29mZnNdID0g bG93ZXJfMzJfYml0cyhyaW5nLT53cHRyKTsKLQkJV0RPT1JCRUxMMzIocmluZy0+ZG9vcmJlbGxf aW5kZXgsIGxvd2VyXzMyX2JpdHMocmluZy0+d3B0cikpOwotCX0gZWxzZSB7Ci0JCVdSRUczMl9T T0MxNShVVkQsIDAsIG1tVVZEX0pSQkNfUkJfV1BUUiwgbG93ZXJfMzJfYml0cyhyaW5nLT53cHRy KSk7Ci0JfQotfQotCiAvKioKICAqIHZjbl92Ml8wX2pwZWdfcmluZ19pbnNlcnRfc3RhcnQgLSBp bnNlcnQgYSBzdGFydCBjb21tYW5kCiAgKgpAQCAtMjA3MSw5ICsxODU2LDYgQEAgc3RhdGljIGlu dCB2Y25fdjJfMF9wcm9jZXNzX2ludGVycnVwdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwK IAljYXNlIFZDTl8yXzBfX1NSQ0lEX19VVkRfRU5DX0xPV19MQVRFTkNZOgogCQlhbWRncHVfZmVu Y2VfcHJvY2VzcygmYWRldi0+dmNuLmluc3QtPnJpbmdfZW5jWzFdKTsKIAkJYnJlYWs7Ci0JY2Fz ZSBWQ05fMl8wX19TUkNJRF9fSlBFR19ERUNPREU6Ci0JCWFtZGdwdV9mZW5jZV9wcm9jZXNzKCZh ZGV2LT52Y24uaW5zdC0+cmluZ19qcGVnKTsKLQkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJRFJNX0VS Uk9SKCJVbmhhbmRsZWQgaW50ZXJydXB0OiAlZCAlZFxuIiwKIAkJCSAgZW50cnktPnNyY19pZCwg ZW50cnktPnNyY19kYXRhWzBdKTsKQEAgLTIyMTksMzYgKzIwMDEsNiBAQCBzdGF0aWMgY29uc3Qg c3RydWN0IGFtZGdwdV9yaW5nX2Z1bmNzIHZjbl92Ml8wX2VuY19yaW5nX3ZtX2Z1bmNzID0gewog CS5lbWl0X3JlZ193cml0ZV9yZWdfd2FpdCA9IGFtZGdwdV9yaW5nX2VtaXRfcmVnX3dyaXRlX3Jl Z193YWl0X2hlbHBlciwKIH07CiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1X3JpbmdfZnVu Y3MgdmNuX3YyXzBfanBlZ19yaW5nX3ZtX2Z1bmNzID0gewotCS50eXBlID0gQU1ER1BVX1JJTkdf VFlQRV9WQ05fSlBFRywKLQkuYWxpZ25fbWFzayA9IDB4ZiwKLQkudm1odWIgPSBBTURHUFVfTU1I VUJfMCwKLQkuZ2V0X3JwdHIgPSB2Y25fdjJfMF9qcGVnX3JpbmdfZ2V0X3JwdHIsCi0JLmdldF93 cHRyID0gdmNuX3YyXzBfanBlZ19yaW5nX2dldF93cHRyLAotCS5zZXRfd3B0ciA9IHZjbl92Ml8w X2pwZWdfcmluZ19zZXRfd3B0ciwKLQkuZW1pdF9mcmFtZV9zaXplID0KLQkJU09DMTVfRkxVU0hf R1BVX1RMQl9OVU1fV1JFRyAqIDYgKwotCQlTT0MxNV9GTFVTSF9HUFVfVExCX05VTV9SRUdfV0FJ VCAqIDggKwotCQk4ICsgLyogdmNuX3YyXzBfanBlZ19yaW5nX2VtaXRfdm1fZmx1c2ggKi8KLQkJ MTggKyAxOCArIC8qIHZjbl92Ml8wX2pwZWdfcmluZ19lbWl0X2ZlbmNlIHgyIHZtIGZlbmNlICov Ci0JCTggKyAxNiwKLQkuZW1pdF9pYl9zaXplID0gMjIsIC8qIHZjbl92Ml8wX2pwZWdfcmluZ19l bWl0X2liICovCi0JLmVtaXRfaWIgPSB2Y25fdjJfMF9qcGVnX3JpbmdfZW1pdF9pYiwKLQkuZW1p dF9mZW5jZSA9IHZjbl92Ml8wX2pwZWdfcmluZ19lbWl0X2ZlbmNlLAotCS5lbWl0X3ZtX2ZsdXNo ID0gdmNuX3YyXzBfanBlZ19yaW5nX2VtaXRfdm1fZmx1c2gsCi0JLnRlc3RfcmluZyA9IGFtZGdw dV92Y25fanBlZ19yaW5nX3Rlc3RfcmluZywKLQkudGVzdF9pYiA9IGFtZGdwdV92Y25fanBlZ19y aW5nX3Rlc3RfaWIsCi0JLmluc2VydF9ub3AgPSB2Y25fdjJfMF9qcGVnX3Jpbmdfbm9wLAotCS5p bnNlcnRfc3RhcnQgPSB2Y25fdjJfMF9qcGVnX3JpbmdfaW5zZXJ0X3N0YXJ0LAotCS5pbnNlcnRf ZW5kID0gdmNuX3YyXzBfanBlZ19yaW5nX2luc2VydF9lbmQsCi0JLnBhZF9pYiA9IGFtZGdwdV9y aW5nX2dlbmVyaWNfcGFkX2liLAotCS5iZWdpbl91c2UgPSBhbWRncHVfdmNuX3JpbmdfYmVnaW5f dXNlLAotCS5lbmRfdXNlID0gYW1kZ3B1X3Zjbl9yaW5nX2VuZF91c2UsCi0JLmVtaXRfd3JlZyA9 IHZjbl92Ml8wX2pwZWdfcmluZ19lbWl0X3dyZWcsCi0JLmVtaXRfcmVnX3dhaXQgPSB2Y25fdjJf MF9qcGVnX3JpbmdfZW1pdF9yZWdfd2FpdCwKLQkuZW1pdF9yZWdfd3JpdGVfcmVnX3dhaXQgPSBh bWRncHVfcmluZ19lbWl0X3JlZ193cml0ZV9yZWdfd2FpdF9oZWxwZXIsCi19OwotCiBzdGF0aWMg dm9pZCB2Y25fdjJfMF9zZXRfZGVjX3JpbmdfZnVuY3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYpCiB7CiAJYWRldi0+dmNuLmluc3QtPnJpbmdfZGVjLmZ1bmNzID0gJnZjbl92Ml8wX2RlY19y aW5nX3ZtX2Z1bmNzOwpAQCAtMjI2NSwxMiArMjAxNyw2IEBAIHN0YXRpYyB2b2lkIHZjbl92Ml8w X3NldF9lbmNfcmluZ19mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlEUk1fSU5G TygiVkNOIGVuY29kZSBpcyBlbmFibGVkIGluIFZNIG1vZGVcbiIpOwogfQogCi1zdGF0aWMgdm9p ZCB2Y25fdjJfMF9zZXRfanBlZ19yaW5nX2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 KQotewotCWFkZXYtPnZjbi5pbnN0LT5yaW5nX2pwZWcuZnVuY3MgPSAmdmNuX3YyXzBfanBlZ19y aW5nX3ZtX2Z1bmNzOwotCURSTV9JTkZPKCJWQ04ganBlZyBkZWNvZGUgaXMgZW5hYmxlZCBpbiBW TSBtb2RlXG4iKTsKLX0KLQogc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfaXJxX3NyY19mdW5j cyB2Y25fdjJfMF9pcnFfZnVuY3MgPSB7CiAJLnNldCA9IHZjbl92Ml8wX3NldF9pbnRlcnJ1cHRf c3RhdGUsCiAJLnByb2Nlc3MgPSB2Y25fdjJfMF9wcm9jZXNzX2ludGVycnVwdCwKLS0gCjIuMTcu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdm eCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4