From: Alex Deucher Subject: [PATCH] drm/amdgpu: implement harvesting support for UVD 7.2 (v3) Date: Wed, 25 Jul 2018 16:02:59 -0500 Message-ID: <20180725210259.16581-1-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: Alex Deucher UHJvcGVybHkgaGFuZGxlIGNhc2VzIHdoZXJlIG9uZSBvciBtb3JlIGluc3RhbmNlIG9mIHRoZSBJ UApibG9jayBtYXkgYmUgaGFydmVzdGVkLgoKdjI6IG1ha2Ugc3VyZSBpcF9udW1fcmluZ3MgaXMg aW5pdGlhbGl6ZWQgYW1kZ3B1X3F1ZXVlX21nci5jCnYzOiByZWJhc2Ugb24gQ2hyaXN0aWFuJ3Mg VVZEIGNoYW5nZXMsIGRyb3AgdW51c2VkIHZhcgoKU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVy IDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9rbXMuYyAgICAgICB8IDE3ICsrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfcXVldWVfbWdyLmMgfCAxMyArKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfdXZkLmMgICAgICAgfCAxMSArKysrKy0KIGRyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV91dmQuaCAgICAgICB8ICA0ICsrCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS91dmRfdjdfMC5jICAgICAgICAgfCA1NiArKysrKysrKysrKysrKysrKysrKysr KysrLS0KIDUgZmlsZXMgY2hhbmdlZCwgODkgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jCmluZGV4IGM3ZGNlMTRmZDQ3 ZC4uZGQyMTMyZmEyYjg5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5j CkBAIC0yODYsNyArMjg2LDcgQEAgc3RhdGljIGludCBhbWRncHVfaW5mb19pb2N0bChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUKIAlzdHJ1Y3QgZHJt X2NydGMgKmNydGM7CiAJdWludDMyX3QgdWkzMiA9IDA7CiAJdWludDY0X3QgdWk2NCA9IDA7Ci0J aW50IGksIGZvdW5kOworCWludCBpLCBqLCBmb3VuZDsKIAlpbnQgdWkzMl9zaXplID0gc2l6ZW9m KHVpMzIpOwogCiAJaWYgKCFpbmZvLT5yZXR1cm5fc2l6ZSB8fCAhaW5mby0+cmV0dXJuX3BvaW50 ZXIpCkBAIC0zNDgsNyArMzQ4LDExIEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2luZm9faW9jdGwoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlCiAJCQlicmVh azsKIAkJY2FzZSBBTURHUFVfSFdfSVBfVVZEOgogCQkJdHlwZSA9IEFNRF9JUF9CTE9DS19UWVBF X1VWRDsKLQkJCXJpbmdfbWFzayB8PSBhZGV2LT51dmQuaW5zdFswXS5yaW5nLnJlYWR5OworCQkJ Zm9yIChpID0gMDsgaSA8IGFkZXYtPnV2ZC5udW1fdXZkX2luc3Q7IGkrKykgeworCQkJCWlmIChh ZGV2LT51dmQuaGFydmVzdF9jb25maWcgJiAoMSA8PCBpKSkKKwkJCQkJY29udGludWU7CisJCQkJ cmluZ19tYXNrIHw9IGFkZXYtPnV2ZC5pbnN0W2ldLnJpbmcucmVhZHk7CisJCQl9CiAJCQlpYl9z dGFydF9hbGlnbm1lbnQgPSA2NDsKIAkJCWliX3NpemVfYWxpZ25tZW50ID0gNjQ7CiAJCQlicmVh azsKQEAgLTM2MSw5ICszNjUsMTIgQEAgc3RhdGljIGludCBhbWRncHVfaW5mb19pb2N0bChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUKIAkJCWJyZWFr OwogCQljYXNlIEFNREdQVV9IV19JUF9VVkRfRU5DOgogCQkJdHlwZSA9IEFNRF9JUF9CTE9DS19U WVBFX1VWRDsKLQkJCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51dmQubnVtX2VuY19yaW5nczsgaSsr KQotCQkJCXJpbmdfbWFzayB8PQotCQkJCQlhZGV2LT51dmQuaW5zdFswXS5yaW5nX2VuY1tpXS5y ZWFkeSA8PCBpOworCQkJZm9yIChpID0gMDsgaSA8IGFkZXYtPnV2ZC5udW1fdXZkX2luc3Q7IGkr KykgeworCQkJCWlmIChhZGV2LT51dmQuaGFydmVzdF9jb25maWcgJiAoMSA8PCBpKSkKKwkJCQkJ Y29udGludWU7CisJCQkJZm9yIChqID0gMDsgaiA8IGFkZXYtPnV2ZC5udW1fZW5jX3JpbmdzOyBq KyspCisJCQkJCXJpbmdfbWFzayB8PSBhZGV2LT51dmQuaW5zdFtpXS5yaW5nX2VuY1tqXS5yZWFk eSA8PCBqOworCQkJfQogCQkJaWJfc3RhcnRfYWxpZ25tZW50ID0gNjQ7CiAJCQlpYl9zaXplX2Fs aWdubWVudCA9IDY0OwogCQkJYnJlYWs7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfcXVldWVfbWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfcXVldWVfbWdyLmMKaW5kZXggZDgzNTcyOTBhZDA5Li5hMTcyYmJhMzJiNDUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9xdWV1ZV9tZ3IuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcXVldWVfbWdyLmMKQEAgLTIxNCw3 ICsyMTQsNyBAQCBpbnQgYW1kZ3B1X3F1ZXVlX21ncl9tYXAoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsCiAJCQkgdTMyIGh3X2lwLCB1MzIgaW5zdGFuY2UsIHUzMiByaW5nLAogCQkJIHN0cnVj dCBhbWRncHVfcmluZyAqKm91dF9yaW5nKQogewotCWludCByLCBpcF9udW1fcmluZ3M7CisJaW50 IGksIHIsIGlwX251bV9yaW5ncyA9IDA7CiAJc3RydWN0IGFtZGdwdV9xdWV1ZV9tYXBwZXIgKm1h cHBlciA9ICZtZ3ItPm1hcHBlcltod19pcF07CiAKIAlpZiAoIWFkZXYgfHwgIW1nciB8fCAhb3V0 X3JpbmcpCkBAIC0yNDMsMTQgKzI0MywyMSBAQCBpbnQgYW1kZ3B1X3F1ZXVlX21ncl9tYXAoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCWlwX251bV9yaW5ncyA9IGFkZXYtPnNkbWEubnVt X2luc3RhbmNlczsKIAkJYnJlYWs7CiAJY2FzZSBBTURHUFVfSFdfSVBfVVZEOgotCQlpcF9udW1f cmluZ3MgPSBhZGV2LT51dmQubnVtX3V2ZF9pbnN0OworCQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+ dXZkLm51bV91dmRfaW5zdDsgaSsrKSB7CisJCQlpZiAoIShhZGV2LT51dmQuaGFydmVzdF9jb25m aWcgJiAoMSA8PCBpKSkpCisJCQkJaXBfbnVtX3JpbmdzKys7CisJCX0KIAkJYnJlYWs7CiAJY2Fz ZSBBTURHUFVfSFdfSVBfVkNFOgogCQlpcF9udW1fcmluZ3MgPSBhZGV2LT52Y2UubnVtX3Jpbmdz OwogCQlicmVhazsKIAljYXNlIEFNREdQVV9IV19JUF9VVkRfRU5DOgorCQlmb3IgKGkgPSAwOyBp IDwgYWRldi0+dXZkLm51bV91dmRfaW5zdDsgaSsrKSB7CisJCQlpZiAoIShhZGV2LT51dmQuaGFy dmVzdF9jb25maWcgJiAoMSA8PCBpKSkpCisJCQkJaXBfbnVtX3JpbmdzKys7CisJCX0KIAkJaXBf bnVtX3JpbmdzID0KLQkJCWFkZXYtPnV2ZC5udW1fZW5jX3JpbmdzICogYWRldi0+dXZkLm51bV91 dmRfaW5zdDsKKwkJCWFkZXYtPnV2ZC5udW1fZW5jX3JpbmdzICogaXBfbnVtX3JpbmdzOwogCQli cmVhazsKIAljYXNlIEFNREdQVV9IV19JUF9WQ05fREVDOgogCQlpcF9udW1fcmluZ3MgPSAxOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3V2ZC5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3V2ZC5jCmluZGV4IGZjYTg2ZDcxZmFmYy4u NjMyZmE1OTgwZmY0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfdXZkLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3V2ZC5jCkBA IC0yNTUsNyArMjU1LDggQEAgaW50IGFtZGdwdV91dmRfc3dfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldikKIAkJYm9fc2l6ZSArPSBBTURHUFVfR1BVX1BBR0VfQUxJR04obGUzMl90b19j cHUoaGRyLT51Y29kZV9zaXplX2J5dGVzKSArIDgpOwogCiAJZm9yIChqID0gMDsgaiA8IGFkZXYt PnV2ZC5udW1fdXZkX2luc3Q7IGorKykgewotCisJCWlmIChhZGV2LT51dmQuaGFydmVzdF9jb25m aWcgJiAoMSA8PCBqKSkKKwkJCWNvbnRpbnVlOwogCQlyID0gYW1kZ3B1X2JvX2NyZWF0ZV9rZXJu ZWwoYWRldiwgYm9fc2l6ZSwgUEFHRV9TSVpFLAogCQkJCQkgICAgQU1ER1BVX0dFTV9ET01BSU5f VlJBTSwgJmFkZXYtPnV2ZC5pbnN0W2pdLnZjcHVfYm8sCiAJCQkJCSAgICAmYWRldi0+dXZkLmlu c3Rbal0uZ3B1X2FkZHIsICZhZGV2LT51dmQuaW5zdFtqXS5jcHVfYWRkcik7CkBAIC0zMDgsNiAr MzA5LDggQEAgaW50IGFtZGdwdV91dmRfc3dfZmluaShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl dikKIAlkcm1fc2NoZWRfZW50aXR5X2Rlc3Ryb3koJmFkZXYtPnV2ZC5lbnRpdHkpOwogCiAJZm9y IChqID0gMDsgaiA8IGFkZXYtPnV2ZC5udW1fdXZkX2luc3Q7ICsraikgeworCQlpZiAoYWRldi0+ dXZkLmhhcnZlc3RfY29uZmlnICYgKDEgPDwgaikpCisJCQljb250aW51ZTsKIAkJa2ZyZWUoYWRl di0+dXZkLmluc3Rbal0uc2F2ZWRfYm8pOwogCiAJCWFtZGdwdV9ib19mcmVlX2tlcm5lbCgmYWRl di0+dXZkLmluc3Rbal0udmNwdV9ibywKQEAgLTM0Myw2ICszNDYsOCBAQCBpbnQgYW1kZ3B1X3V2 ZF9zdXNwZW5kKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIAogCWZvciAoaiA9IDA7 IGogPCBhZGV2LT51dmQubnVtX3V2ZF9pbnN0OyArK2opIHsKKwkJaWYgKGFkZXYtPnV2ZC5oYXJ2 ZXN0X2NvbmZpZyAmICgxIDw8IGopKQorCQkJY29udGludWU7CiAJCWlmIChhZGV2LT51dmQuaW5z dFtqXS52Y3B1X2JvID09IE5VTEwpCiAJCQljb250aW51ZTsKIApAQCAtMzY1LDYgKzM3MCw4IEBA IGludCBhbWRncHVfdXZkX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlpbnQg aTsKIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51dmQubnVtX3V2ZF9pbnN0OyBpKyspIHsKKwkJ aWYgKGFkZXYtPnV2ZC5oYXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGkpKQorCQkJY29udGludWU7CiAJ CWlmIChhZGV2LT51dmQuaW5zdFtpXS52Y3B1X2JvID09IE5VTEwpCiAJCQlyZXR1cm4gLUVJTlZB TDsKIApAQCAtMTE1OSw2ICsxMTY2LDggQEAgc3RhdGljIHZvaWQgYW1kZ3B1X3V2ZF9pZGxlX3dv cmtfaGFuZGxlcihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJdW5zaWduZWQgZmVuY2VzID0g MCwgaSwgajsKIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51dmQubnVtX3V2ZF9pbnN0OyArK2kp IHsKKwkJaWYgKGFkZXYtPnV2ZC5oYXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGkpKQorCQkJY29udGlu dWU7CiAJCWZlbmNlcyArPSBhbWRncHVfZmVuY2VfY291bnRfZW1pdHRlZCgmYWRldi0+dXZkLmlu c3RbaV0ucmluZyk7CiAJCWZvciAoaiA9IDA7IGogPCBhZGV2LT51dmQubnVtX2VuY19yaW5nczsg KytqKSB7CiAJCQlmZW5jZXMgKz0gYW1kZ3B1X2ZlbmNlX2NvdW50X2VtaXR0ZWQoJmFkZXYtPnV2 ZC5pbnN0W2ldLnJpbmdfZW5jW2pdKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV91dmQuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV91 dmQuaAppbmRleCA2Njg3MjI4NmFiMTIuLjMzYzVmODA2ZjkyNSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3V2ZC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV91dmQuaApAQCAtNDgsNiArNDgsOSBAQCBzdHJ1Y3QgYW1kZ3B1X3V2 ZF9pbnN0IHsKIAl1aW50MzJfdCAgICAgICAgICAgICAgICBzcmJtX3NvZnRfcmVzZXQ7CiB9Owog CisjZGVmaW5lIEFNREdQVV9VVkRfSEFSVkVTVF9VVkQwICgxIDw8IDApCisjZGVmaW5lIEFNREdQ VV9VVkRfSEFSVkVTVF9VVkQxICgxIDw8IDEpCisKIHN0cnVjdCBhbWRncHVfdXZkIHsKIAljb25z dCBzdHJ1Y3QgZmlybXdhcmUJKmZ3OwkvKiBVVkQgZmlybXdhcmUgKi8KIAl1bnNpZ25lZAkJZndf dmVyc2lvbjsKQEAgLTYxLDYgKzY0LDcgQEAgc3RydWN0IGFtZGdwdV91dmQgewogCWF0b21pY190 CQloYW5kbGVzW0FNREdQVV9NQVhfVVZEX0hBTkRMRVNdOwogCXN0cnVjdCBkcm1fc2NoZWRfZW50 aXR5IGVudGl0eTsKIAlzdHJ1Y3QgZGVsYXllZF93b3JrCWlkbGVfd29yazsKKwl1bnNpZ25lZAkJ aGFydmVzdF9jb25maWc7CiB9OwogCiBpbnQgYW1kZ3B1X3V2ZF9zd19pbml0KHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L3V2ZF92N18wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjdfMC5jCmluZGV4 IGRiNWYzZDc4YWIxMi4uODE3OTMxN2JlNzUwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS91dmRfdjdfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2 ZF92N18wLmMKQEAgLTQxLDYgKzQxLDEyIEBACiAjaW5jbHVkZSAibW1odWIvbW1odWJfMV8wX3No X21hc2suaCIKICNpbmNsdWRlICJpdnNyY2lkL3V2ZC9pcnFzcmNzX3V2ZF83XzAuaCIKIAorI2Rl ZmluZSBtbVVWRF9QRzBfQ0NfVVZEX0hBUlZFU1RJTkcgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDB4MDBjNworI2RlZmlu ZSBtbVVWRF9QRzBfQ0NfVVZEX0hBUlZFU1RJTkdfQkFTRV9JRFggICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEKKy8vVVZEX1BHMF9DQ19V VkRfSEFSVkVTVElORworI2RlZmluZSBVVkRfUEcwX0NDX1VWRF9IQVJWRVNUSU5HX19VVkRfRElT QUJMRV9fU0hJRlQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAweDEKKyNkZWZpbmUgVVZEX1BHMF9DQ19VVkRfSEFSVkVTVElOR19fVVZEX0RJ U0FCTEVfTUFTSyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgMHgwMDAwMDAwMkwKKwogI2RlZmluZSBVVkQ3X01BWF9IV19JTlNUQU5DRVNf VkVHQTIwCQkJMgogCiBzdGF0aWMgdm9pZCB1dmRfdjdfMF9zZXRfcmluZ19mdW5jcyhzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldik7CkBAIC0zNzAsMTAgKzM3NiwyNSBAQCBzdGF0aWMgaW50IHV2 ZF92N18wX2VuY19yaW5nX3Rlc3RfaWIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCBsb25nIHRp bWVvdXQpCiBzdGF0aWMgaW50IHV2ZF92N18wX2Vhcmx5X2luaXQodm9pZCAqaGFuZGxlKQogewog CXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFu ZGxlOwotCWlmIChhZGV2LT5hc2ljX3R5cGUgPT0gQ0hJUF9WRUdBMjApCisKKwlpZiAoYWRldi0+ YXNpY190eXBlID09IENISVBfVkVHQTIwKSB7CisJCXUzMiBoYXJ2ZXN0OworCQlpbnQgaTsKKwog CQlhZGV2LT51dmQubnVtX3V2ZF9pbnN0ID0gVVZEN19NQVhfSFdfSU5TVEFOQ0VTX1ZFR0EyMDsK LQllbHNlCisJCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51dmQubnVtX3V2ZF9pbnN0OyBpKyspIHsK KwkJCWhhcnZlc3QgPSBSUkVHMzJfU09DMTUoVVZELCBpLCBtbVVWRF9QRzBfQ0NfVVZEX0hBUlZF U1RJTkcpOworCQkJaWYgKGhhcnZlc3QgJiBVVkRfUEcwX0NDX1VWRF9IQVJWRVNUSU5HX19VVkRf RElTQUJMRV9NQVNLKSB7CisJCQkJYWRldi0+dXZkLmhhcnZlc3RfY29uZmlnIHw9IDEgPDwgaTsK KwkJCX0KKwkJfQorCQlpZiAoYWRldi0+dXZkLmhhcnZlc3RfY29uZmlnID09IChBTURHUFVfVVZE X0hBUlZFU1RfVVZEMCB8CisJCQkJCQkgQU1ER1BVX1VWRF9IQVJWRVNUX1VWRDEpKQorCQkJLyog Ym90aCBpbnN0YW5jZXMgYXJlIGhhcnZlc3RlZCwgZGlzYWJsZSB0aGUgYmxvY2sgKi8KKwkJCXJl dHVybiAtRU5PRU5UOworCX0gZWxzZSB7CiAJCWFkZXYtPnV2ZC5udW1fdXZkX2luc3QgPSAxOwor CX0KIAogCWlmIChhbWRncHVfc3Jpb3ZfdmYoYWRldikpCiAJCWFkZXYtPnV2ZC5udW1fZW5jX3Jp bmdzID0gMTsKQEAgLTM5Myw2ICs0MTQsOCBAQCBzdGF0aWMgaW50IHV2ZF92N18wX3N3X2luaXQo dm9pZCAqaGFuZGxlKQogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRn cHVfZGV2aWNlICopaGFuZGxlOwogCiAJZm9yIChqID0gMDsgaiA8IGFkZXYtPnV2ZC5udW1fdXZk X2luc3Q7IGorKykgeworCQlpZiAoYWRldi0+dXZkLmhhcnZlc3RfY29uZmlnICYgKDEgPDwgaikp CisJCQljb250aW51ZTsKIAkJLyogVVZEIFRSQVAgKi8KIAkJciA9IGFtZGdwdV9pcnFfYWRkX2lk KGFkZXYsIGFtZGdwdV9paF9jbGllbnRpZF91dmRzW2pdLCBVVkRfN18wX19TUkNJRF9fVVZEX1NZ U1RFTV9NRVNTQUdFX0lOVEVSUlVQVCwgJmFkZXYtPnV2ZC5pbnN0W2pdLmlycSk7CiAJCWlmIChy KQpAQCAtNDI1LDYgKzQ0OCw4IEBAIHN0YXRpYyBpbnQgdXZkX3Y3XzBfc3dfaW5pdCh2b2lkICpo YW5kbGUpCiAJCXJldHVybiByOwogCiAJZm9yIChqID0gMDsgaiA8IGFkZXYtPnV2ZC5udW1fdXZk X2luc3Q7IGorKykgeworCQlpZiAoYWRldi0+dXZkLmhhcnZlc3RfY29uZmlnICYgKDEgPDwgaikp CisJCQljb250aW51ZTsKIAkJaWYgKCFhbWRncHVfc3Jpb3ZfdmYoYWRldikpIHsKIAkJCXJpbmcg PSAmYWRldi0+dXZkLmluc3Rbal0ucmluZzsKIAkJCXNwcmludGYocmluZy0+bmFtZSwgInV2ZDwl ZD4iLCBqKTsKQEAgLTQ3Miw2ICs0OTcsOCBAQCBzdGF0aWMgaW50IHV2ZF92N18wX3N3X2Zpbmko dm9pZCAqaGFuZGxlKQogCQlyZXR1cm4gcjsKIAogCWZvciAoaiA9IDA7IGogPCBhZGV2LT51dmQu bnVtX3V2ZF9pbnN0OyArK2opIHsKKwkJaWYgKGFkZXYtPnV2ZC5oYXJ2ZXN0X2NvbmZpZyAmICgx IDw8IGopKQorCQkJY29udGludWU7CiAJCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51dmQubnVtX2Vu Y19yaW5nczsgKytpKQogCQkJYW1kZ3B1X3JpbmdfZmluaSgmYWRldi0+dXZkLmluc3Rbal0ucmlu Z19lbmNbaV0pOwogCX0KQEAgLTUwMCw2ICs1MjcsOCBAQCBzdGF0aWMgaW50IHV2ZF92N18wX2h3 X2luaXQodm9pZCAqaGFuZGxlKQogCQlnb3RvIGRvbmU7CiAKIAlmb3IgKGogPSAwOyBqIDwgYWRl di0+dXZkLm51bV91dmRfaW5zdDsgKytqKSB7CisJCWlmIChhZGV2LT51dmQuaGFydmVzdF9jb25m aWcgJiAoMSA8PCBqKSkKKwkJCWNvbnRpbnVlOwogCQlyaW5nID0gJmFkZXYtPnV2ZC5pbnN0W2pd LnJpbmc7CiAKIAkJaWYgKCFhbWRncHVfc3Jpb3ZfdmYoYWRldikpIHsKQEAgLTU3OSw4ICs2MDgs MTEgQEAgc3RhdGljIGludCB1dmRfdjdfMF9od19maW5pKHZvaWQgKmhhbmRsZSkKIAkJRFJNX0RF QlVHKCJGb3IgU1JJT1YgY2xpZW50LCBzaG91bGRuJ3QgZG8gYW55dGhpbmcuXG4iKTsKIAl9CiAK LQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZkLm51bV91dmRfaW5zdDsgKytpKQorCWZvciAoaSA9 IDA7IGkgPCBhZGV2LT51dmQubnVtX3V2ZF9pbnN0OyArK2kpIHsKKwkJaWYgKGFkZXYtPnV2ZC5o YXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGkpKQorCQkJY29udGludWU7CiAJCWFkZXYtPnV2ZC5pbnN0 W2ldLnJpbmcucmVhZHkgPSBmYWxzZTsKKwl9CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTYyMyw2ICs2 NTUsOCBAQCBzdGF0aWMgdm9pZCB1dmRfdjdfMF9tY19yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZkLm51bV91dmRf aW5zdDsgKytpKSB7CisJCWlmIChhZGV2LT51dmQuaGFydmVzdF9jb25maWcgJiAoMSA8PCBpKSkK KwkJCWNvbnRpbnVlOwogCQlpZiAoYWRldi0+ZmlybXdhcmUubG9hZF90eXBlID09IEFNREdQVV9G V19MT0FEX1BTUCkgewogCQkJV1JFRzMyX1NPQzE1KFVWRCwgaSwgbW1VVkRfTE1JX1ZDUFVfQ0FD SEVfNjRCSVRfQkFSX0xPVywKIAkJCQlsb3dlcl8zMl9iaXRzKGFkZXYtPmZpcm13YXJlLnVjb2Rl W0FNREdQVV9VQ09ERV9JRF9VVkRdLm1jX2FkZHIpKTsKQEAgLTY5NSw2ICs3MjksOCBAQCBzdGF0 aWMgaW50IHV2ZF92N18wX21tc2NoX3N0YXJ0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAog CVdSRUczMl9TT0MxNShWQ0UsIDAsIG1tVkNFX01NU0NIX1ZGX01BSUxCT1hfUkVTUCwgMCk7CiAK IAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZkLm51bV91dmRfaW5zdDsgKytpKSB7CisJCWlmIChh ZGV2LT51dmQuaGFydmVzdF9jb25maWcgJiAoMSA8PCBpKSkKKwkJCWNvbnRpbnVlOwogCQlXRE9P UkJFTEwzMihhZGV2LT51dmQuaW5zdFtpXS5yaW5nX2VuY1swXS5kb29yYmVsbF9pbmRleCwgMCk7 CiAJCWFkZXYtPndiLndiW2FkZXYtPnV2ZC5pbnN0W2ldLnJpbmdfZW5jWzBdLndwdHJfb2Zmc10g PSAwOwogCQlhZGV2LT51dmQuaW5zdFtpXS5yaW5nX2VuY1swXS53cHRyID0gMDsKQEAgLTc1MSw2 ICs3ODcsOCBAQCBzdGF0aWMgaW50IHV2ZF92N18wX3NyaW92X3N0YXJ0KHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2KQogCQlpbml0X3RhYmxlICs9IGhlYWRlci0+dXZkX3RhYmxlX29mZnNldDsK IAogCQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZkLm51bV91dmRfaW5zdDsgKytpKSB7CisJCQlp ZiAoYWRldi0+dXZkLmhhcnZlc3RfY29uZmlnICYgKDEgPDwgaSkpCisJCQkJY29udGludWU7CiAJ CQlyaW5nID0gJmFkZXYtPnV2ZC5pbnN0W2ldLnJpbmc7CiAJCQlyaW5nLT53cHRyID0gMDsKIAkJ CXNpemUgPSBBTURHUFVfR1BVX1BBR0VfQUxJR04oYWRldi0+dXZkLmZ3LT5zaXplICsgNCk7CkBA IC04OTAsNiArOTI4LDggQEAgc3RhdGljIGludCB1dmRfdjdfMF9zdGFydChzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldikKIAlpbnQgaSwgaiwgaywgcjsKIAogCWZvciAoayA9IDA7IGsgPCBhZGV2 LT51dmQubnVtX3V2ZF9pbnN0OyArK2spIHsKKwkJaWYgKGFkZXYtPnV2ZC5oYXJ2ZXN0X2NvbmZp ZyAmICgxIDw8IGspKQorCQkJY29udGludWU7CiAJCS8qIGRpc2FibGUgRFBHICovCiAJCVdSRUcz Ml9QKFNPQzE1X1JFR19PRkZTRVQoVVZELCBrLCBtbVVWRF9QT1dFUl9TVEFUVVMpLCAwLAogCQkJ CX5VVkRfUE9XRVJfU1RBVFVTX19VVkRfUEdfTU9ERV9NQVNLKTsKQEAgLTkwMiw2ICs5NDIsOCBA QCBzdGF0aWMgaW50IHV2ZF92N18wX3N0YXJ0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQog CXV2ZF92N18wX21jX3Jlc3VtZShhZGV2KTsKIAogCWZvciAoayA9IDA7IGsgPCBhZGV2LT51dmQu bnVtX3V2ZF9pbnN0OyArK2spIHsKKwkJaWYgKGFkZXYtPnV2ZC5oYXJ2ZXN0X2NvbmZpZyAmICgx IDw8IGspKQorCQkJY29udGludWU7CiAJCXJpbmcgPSAmYWRldi0+dXZkLmluc3Rba10ucmluZzsK IAkJLyogZGlzYWJsZSBjbG9jayBnYXRpbmcgKi8KIAkJV1JFRzMyX1AoU09DMTVfUkVHX09GRlNF VChVVkQsIGssIG1tVVZEX0NHQ19DVFJMKSwgMCwKQEAgLTEwNjksNiArMTExMSw4IEBAIHN0YXRp YyB2b2lkIHV2ZF92N18wX3N0b3Aoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJdWludDhf dCBpID0gMDsKIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51dmQubnVtX3V2ZF9pbnN0OyArK2kp IHsKKwkJaWYgKGFkZXYtPnV2ZC5oYXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGkpKQorCQkJY29udGlu dWU7CiAJCS8qIGZvcmNlIFJCQyBpbnRvIGlkbGUgc3RhdGUgKi8KIAkJV1JFRzMyX1NPQzE1KFVW RCwgaSwgbW1VVkRfUkJDX1JCX0NOVEwsIDB4MTEwMTAxMDEpOwogCkBAIC0xNzU2LDYgKzE4MDAs OCBAQCBzdGF0aWMgdm9pZCB1dmRfdjdfMF9zZXRfcmluZ19mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldikKIAlpbnQgaTsKIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51dmQubnVtX3V2 ZF9pbnN0OyBpKyspIHsKKwkJaWYgKGFkZXYtPnV2ZC5oYXJ2ZXN0X2NvbmZpZyAmICgxIDw8IGkp KQorCQkJY29udGludWU7CiAJCWFkZXYtPnV2ZC5pbnN0W2ldLnJpbmcuZnVuY3MgPSAmdXZkX3Y3 XzBfcmluZ192bV9mdW5jczsKIAkJYWRldi0+dXZkLmluc3RbaV0ucmluZy5tZSA9IGk7CiAJCURS TV9JTkZPKCJVVkQoJWQpIGlzIGVuYWJsZWQgaW4gVk0gbW9kZVxuIiwgaSk7CkBAIC0xNzY3LDYg KzE4MTMsOCBAQCBzdGF0aWMgdm9pZCB1dmRfdjdfMF9zZXRfZW5jX3JpbmdfZnVuY3Moc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50IGksIGo7CiAKIAlmb3IgKGogPSAwOyBqIDwgYWRl di0+dXZkLm51bV91dmRfaW5zdDsgaisrKSB7CisJCWlmIChhZGV2LT51dmQuaGFydmVzdF9jb25m aWcgJiAoMSA8PCBqKSkKKwkJCWNvbnRpbnVlOwogCQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZk Lm51bV9lbmNfcmluZ3M7ICsraSkgewogCQkJYWRldi0+dXZkLmluc3Rbal0ucmluZ19lbmNbaV0u ZnVuY3MgPSAmdXZkX3Y3XzBfZW5jX3Jpbmdfdm1fZnVuY3M7CiAJCQlhZGV2LT51dmQuaW5zdFtq XS5yaW5nX2VuY1tpXS5tZSA9IGo7CkBAIC0xNzg2LDYgKzE4MzQsOCBAQCBzdGF0aWMgdm9pZCB1 dmRfdjdfMF9zZXRfaXJxX2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWludCBp OwogCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPnV2ZC5udW1fdXZkX2luc3Q7IGkrKykgeworCQlp ZiAoYWRldi0+dXZkLmhhcnZlc3RfY29uZmlnICYgKDEgPDwgaSkpCisJCQljb250aW51ZTsKIAkJ YWRldi0+dXZkLmluc3RbaV0uaXJxLm51bV90eXBlcyA9IGFkZXYtPnV2ZC5udW1fZW5jX3Jpbmdz ICsgMTsKIAkJYWRldi0+dXZkLmluc3RbaV0uaXJxLmZ1bmNzID0gJnV2ZF92N18wX2lycV9mdW5j czsKIAl9Ci0tIAoyLjEzLjYKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdm eAo=