From: Alex Deucher Subject: [PATCH 5/6] drm/amd/disply/dc: add resource support for DCE8 APUs (v2) Date: Thu, 10 Aug 2017 14:39:51 -0400 Message-ID: <1502390392-29146-5-git-send-email-alexander.deucher@amd.com> References: <1502390392-29146-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1502390392-29146-1-git-send-email-alexander.deucher-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, harry.wentland-5C7GfCeVMHo@public.gmane.org Cc: Alex Deucher QWRkIHRoZSBhcHByb3ByaWF0ZSByZXNvdXJjZXMgZm9yIEFQVXM6CktWOiAgICA0IHBpcGVzLCA3 IGRpZywgMyBQUExMcwpLQi9NTDogMiBwaXBlcywgNiBkaWcsIDIgUFBMTHMKCnYyOiByZWJhc2Ug Y2hhbmdlcwoKU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBh bWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291 cmNlLmMgIHwgICA4ICstCiAuLi4vZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2U4MC9kY2U4MF9y ZXNvdXJjZS5jICB8IDM0MyArKysrKysrKysrKysrKysrKysrKy0KIC4uLi9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2RjZTgwL2RjZTgwX3Jlc291cmNlLmggIHwgICA4ICsKIDMgZmlsZXMgY2hhbmdl ZCwgMzU2IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVzb3VyY2UuYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMKaW5kZXggZTdkOTA0NS4uZjAx MDAzOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNf cmVzb3VyY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19y ZXNvdXJjZS5jCkBAIC0xMDEsOSArMTAxLDE1IEBAIHN0cnVjdCByZXNvdXJjZV9wb29sICpkY19j cmVhdGVfcmVzb3VyY2VfcG9vbCgKIAogCXN3aXRjaCAoZGNfdmVyc2lvbikgewogCWNhc2UgRENF X1ZFUlNJT05fOF8wOgorCQlyZXNfcG9vbCA9IGRjZTgwX2NyZWF0ZV9yZXNvdXJjZV9wb29sKAor CQkJbnVtX3ZpcnR1YWxfbGlua3MsIGRjKTsKKwkJYnJlYWs7CiAJY2FzZSBEQ0VfVkVSU0lPTl84 XzE6CisJCXJlc19wb29sID0gZGNlODFfY3JlYXRlX3Jlc291cmNlX3Bvb2woCisJCQludW1fdmly dHVhbF9saW5rcywgZGMpOworCQlicmVhazsKIAljYXNlIERDRV9WRVJTSU9OXzhfMzoKLQkJcmVz X3Bvb2wgPSBkY2U4MF9jcmVhdGVfcmVzb3VyY2VfcG9vbCgKKwkJcmVzX3Bvb2wgPSBkY2U4M19j cmVhdGVfcmVzb3VyY2VfcG9vbCgKIAkJCW51bV92aXJ0dWFsX2xpbmtzLCBkYyk7CiAJCWJyZWFr OwogCWNhc2UgRENFX1ZFUlNJT05fMTBfMDoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kY2U4MC9kY2U4MF9yZXNvdXJjZS5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjZTgwL2RjZTgwX3Jlc291cmNlLmMKaW5kZXggNDBhOTU5MS4uMTMyMTE3 ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgwL2RjZTgw X3Jlc291cmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgwL2Rj ZTgwX3Jlc291cmNlLmMKQEAgLTM1MCw2ICszNTAsMjAgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBy ZXNvdXJjZV9jYXBzIHJlc19jYXAgPSB7CiAJCS5udW1fcGxsID0gMywKIH07CiAKK3N0YXRpYyBj b25zdCBzdHJ1Y3QgcmVzb3VyY2VfY2FwcyByZXNfY2FwXzgxID0geworCQkubnVtX3RpbWluZ19n ZW5lcmF0b3IgPSA0LAorCQkubnVtX2F1ZGlvID0gNywKKwkJLm51bV9zdHJlYW1fZW5jb2RlciA9 IDcsCisJCS5udW1fcGxsID0gMywKK307CisKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgcmVzb3VyY2Vf Y2FwcyByZXNfY2FwXzgzID0geworCQkubnVtX3RpbWluZ19nZW5lcmF0b3IgPSAyLAorCQkubnVt X2F1ZGlvID0gNiwKKwkJLm51bV9zdHJlYW1fZW5jb2RlciA9IDYsCisJCS5udW1fcGxsID0gMiwK K307CisKICNkZWZpbmUgQ1RYICBjdHgKICNkZWZpbmUgUkVHKHJlZykgbW0gIyMgcmVnCiAKQEAg LTgyOSw3ICs4NDMsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHJlc291cmNlX2Z1bmNzIGRjZTgw X3Jlc19wb29sX2Z1bmNzID0gewogCS52YWxpZGF0ZV9wbGFuZSA9IGRjZTEwMF92YWxpZGF0ZV9w bGFuZQogfTsKIAotc3RhdGljIGJvb2wgY29uc3RydWN0KAorc3RhdGljIGJvb2wgZGNlODBfY29u c3RydWN0KAogCXVpbnQ4X3QgbnVtX3ZpcnR1YWxfbGlua3MsCiAJc3RydWN0IGNvcmVfZGMgKmRj LAogCXN0cnVjdCBkY2UxMTBfcmVzb3VyY2VfcG9vbCAqcG9vbCkKQEAgLTk4NywxMCArMTAwMSwz MzUgQEAgc3RydWN0IHJlc291cmNlX3Bvb2wgKmRjZTgwX2NyZWF0ZV9yZXNvdXJjZV9wb29sKAog CWlmICghcG9vbCkKIAkJcmV0dXJuIE5VTEw7CiAKLQlpZiAoY29uc3RydWN0KG51bV92aXJ0dWFs X2xpbmtzLCBkYywgcG9vbCkpCisJaWYgKGRjZTgwX2NvbnN0cnVjdChudW1fdmlydHVhbF9saW5r cywgZGMsIHBvb2wpKQogCQlyZXR1cm4gJnBvb2wtPmJhc2U7CiAKIAlCUkVBS19UT19ERUJVR0dF UigpOwogCXJldHVybiBOVUxMOwogfQogCitzdGF0aWMgYm9vbCBkY2U4MV9jb25zdHJ1Y3QoCisJ dWludDhfdCBudW1fdmlydHVhbF9saW5rcywKKwlzdHJ1Y3QgY29yZV9kYyAqZGMsCisJc3RydWN0 IGRjZTExMF9yZXNvdXJjZV9wb29sICpwb29sKQoreworCXVuc2lnbmVkIGludCBpOworCXN0cnVj dCBkY19jb250ZXh0ICpjdHggPSBkYy0+Y3R4OworCXN0cnVjdCBkY19maXJtd2FyZV9pbmZvIGlu Zm87CisJc3RydWN0IGRjX2Jpb3MgKmJwOworCXN0cnVjdCBkbV9wcF9zdGF0aWNfY2xvY2tfaW5m byBzdGF0aWNfY2xrX2luZm8gPSB7MH07CisKKwljdHgtPmRjX2Jpb3MtPnJlZ3MgPSAmYmlvc19y ZWdzOworCisJcG9vbC0+YmFzZS5yZXNfY2FwID0gJnJlc19jYXBfODE7CisJcG9vbC0+YmFzZS5m dW5jcyA9ICZkY2U4MF9yZXNfcG9vbF9mdW5jczsKKworCisJLyoqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKwkgKiAgUmVzb3VyY2UgKyBhc2ljIGNhcCBo YXJjb2RpbmcgICAgICAgICAgICAgICAgKgorCSAqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqLworCXBvb2wtPmJhc2UudW5kZXJsYXlfcGlwZV9pbmRleCA9 IE5PX1VOREVSTEFZX1BJUEU7CisJcG9vbC0+YmFzZS5waXBlX2NvdW50ID0gcmVzX2NhcF84MS5u dW1fdGltaW5nX2dlbmVyYXRvcjsKKwlkYy0+cHVibGljLmNhcHMubWF4X2Rvd25zY2FsZV9yYXRp byA9IDIwMDsKKwlkYy0+cHVibGljLmNhcHMuaTJjX3NwZWVkX2luX2toeiA9IDQwOworCWRjLT5w dWJsaWMuY2Fwcy5tYXhfY3Vyc29yX3NpemUgPSAxMjg7CisKKwkvKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorCSAqICBDcmVhdGUgcmVzb3VyY2VzICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAqCisJICoqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKiovCisKKwlicCA9IGN0eC0+ZGNfYmlvczsKKworCWlmICgo YnAtPmZ1bmNzLT5nZXRfZmlybXdhcmVfaW5mbyhicCwgJmluZm8pID09IEJQX1JFU1VMVF9PSykg JiYKKwkJaW5mby5leHRlcm5hbF9jbG9ja19zb3VyY2VfZnJlcXVlbmN5X2Zvcl9kcCAhPSAwKSB7 CisJCXBvb2wtPmJhc2UuZHBfY2xvY2tfc291cmNlID0KKwkJCQlkY2U4MF9jbG9ja19zb3VyY2Vf Y3JlYXRlKGN0eCwgYnAsIENMT0NLX1NPVVJDRV9JRF9FWFRFUk5BTCwgTlVMTCwgdHJ1ZSk7CisK KwkJcG9vbC0+YmFzZS5jbG9ja19zb3VyY2VzWzBdID0KKwkJCQlkY2U4MF9jbG9ja19zb3VyY2Vf Y3JlYXRlKGN0eCwgYnAsIENMT0NLX1NPVVJDRV9JRF9QTEwwLCAmY2xrX3NyY19yZWdzWzBdLCBm YWxzZSk7CisJCXBvb2wtPmJhc2UuY2xvY2tfc291cmNlc1sxXSA9CisJCQkJZGNlODBfY2xvY2tf c291cmNlX2NyZWF0ZShjdHgsIGJwLCBDTE9DS19TT1VSQ0VfSURfUExMMSwgJmNsa19zcmNfcmVn c1sxXSwgZmFsc2UpOworCQlwb29sLT5iYXNlLmNsb2NrX3NvdXJjZXNbMl0gPQorCQkJCWRjZTgw X2Nsb2NrX3NvdXJjZV9jcmVhdGUoY3R4LCBicCwgQ0xPQ0tfU09VUkNFX0lEX1BMTDIsICZjbGtf c3JjX3JlZ3NbMl0sIGZhbHNlKTsKKwkJcG9vbC0+YmFzZS5jbGtfc3JjX2NvdW50ID0gMzsKKwor CX0gZWxzZSB7CisJCXBvb2wtPmJhc2UuZHBfY2xvY2tfc291cmNlID0KKwkJCQlkY2U4MF9jbG9j a19zb3VyY2VfY3JlYXRlKGN0eCwgYnAsIENMT0NLX1NPVVJDRV9JRF9QTEwwLCAmY2xrX3NyY19y ZWdzWzBdLCB0cnVlKTsKKworCQlwb29sLT5iYXNlLmNsb2NrX3NvdXJjZXNbMF0gPQorCQkJCWRj ZTgwX2Nsb2NrX3NvdXJjZV9jcmVhdGUoY3R4LCBicCwgQ0xPQ0tfU09VUkNFX0lEX1BMTDEsICZj bGtfc3JjX3JlZ3NbMV0sIGZhbHNlKTsKKwkJcG9vbC0+YmFzZS5jbG9ja19zb3VyY2VzWzFdID0K KwkJCQlkY2U4MF9jbG9ja19zb3VyY2VfY3JlYXRlKGN0eCwgYnAsIENMT0NLX1NPVVJDRV9JRF9Q TEwyLCAmY2xrX3NyY19yZWdzWzJdLCBmYWxzZSk7CisJCXBvb2wtPmJhc2UuY2xrX3NyY19jb3Vu dCA9IDI7CisJfQorCisJaWYgKHBvb2wtPmJhc2UuZHBfY2xvY2tfc291cmNlID09IE5VTEwpIHsK KwkJZG1fZXJyb3IoIkRDOiBmYWlsZWQgdG8gY3JlYXRlIGRwIGNsb2NrIHNvdXJjZSFcbiIpOwor CQlCUkVBS19UT19ERUJVR0dFUigpOworCQlnb3RvIHJlc19jcmVhdGVfZmFpbDsKKwl9CisKKwlm b3IgKGkgPSAwOyBpIDwgcG9vbC0+YmFzZS5jbGtfc3JjX2NvdW50OyBpKyspIHsKKwkJaWYgKHBv b2wtPmJhc2UuY2xvY2tfc291cmNlc1tpXSA9PSBOVUxMKSB7CisJCQlkbV9lcnJvcigiREM6IGZh aWxlZCB0byBjcmVhdGUgY2xvY2sgc291cmNlcyFcbiIpOworCQkJQlJFQUtfVE9fREVCVUdHRVIo KTsKKwkJCWdvdG8gcmVzX2NyZWF0ZV9mYWlsOworCQl9CisJfQorCisJcG9vbC0+YmFzZS5kaXNw bGF5X2Nsb2NrID0gZGNlX2Rpc3BfY2xrX2NyZWF0ZShjdHgsCisJCQkmZGlzcF9jbGtfcmVncywK KwkJCSZkaXNwX2Nsa19zaGlmdCwKKwkJCSZkaXNwX2Nsa19tYXNrKTsKKwlpZiAocG9vbC0+YmFz ZS5kaXNwbGF5X2Nsb2NrID09IE5VTEwpIHsKKwkJZG1fZXJyb3IoIkRDOiBmYWlsZWQgdG8gY3Jl YXRlIGRpc3BsYXkgY2xvY2shXG4iKTsKKwkJQlJFQUtfVE9fREVCVUdHRVIoKTsKKwkJZ290byBy ZXNfY3JlYXRlX2ZhaWw7CisJfQorCisKKwlpZiAoZG1fcHBfZ2V0X3N0YXRpY19jbG9ja3MoY3R4 LCAmc3RhdGljX2Nsa19pbmZvKSkKKwkJcG9vbC0+YmFzZS5kaXNwbGF5X2Nsb2NrLT5tYXhfY2xr c19zdGF0ZSA9CisJCQkJCXN0YXRpY19jbGtfaW5mby5tYXhfY2xvY2tzX3N0YXRlOworCisJewor CQlzdHJ1Y3QgaXJxX3NlcnZpY2VfaW5pdF9kYXRhIGluaXRfZGF0YTsKKwkJaW5pdF9kYXRhLmN0 eCA9IGRjLT5jdHg7CisJCXBvb2wtPmJhc2UuaXJxcyA9IGRhbF9pcnFfc2VydmljZV9kY2U4MF9j cmVhdGUoJmluaXRfZGF0YSk7CisJCWlmICghcG9vbC0+YmFzZS5pcnFzKQorCQkJZ290byByZXNf Y3JlYXRlX2ZhaWw7CisJfQorCisJZm9yIChpID0gMDsgaSA8IHBvb2wtPmJhc2UucGlwZV9jb3Vu dDsgaSsrKSB7CisJCXBvb2wtPmJhc2UudGltaW5nX2dlbmVyYXRvcnNbaV0gPSBkY2U4MF90aW1p bmdfZ2VuZXJhdG9yX2NyZWF0ZSgKKwkJCQljdHgsIGksICZkY2U4MF90Z19vZmZzZXRzW2ldKTsK KwkJaWYgKHBvb2wtPmJhc2UudGltaW5nX2dlbmVyYXRvcnNbaV0gPT0gTlVMTCkgeworCQkJQlJF QUtfVE9fREVCVUdHRVIoKTsKKwkJCWRtX2Vycm9yKCJEQzogZmFpbGVkIHRvIGNyZWF0ZSB0ZyFc biIpOworCQkJZ290byByZXNfY3JlYXRlX2ZhaWw7CisJCX0KKworCQlwb29sLT5iYXNlLm1pc1tp XSA9IGRjZTgwX21lbV9pbnB1dF9jcmVhdGUoY3R4LCBpKTsKKwkJaWYgKHBvb2wtPmJhc2UubWlz W2ldID09IE5VTEwpIHsKKwkJCUJSRUFLX1RPX0RFQlVHR0VSKCk7CisJCQlkbV9lcnJvcigiREM6 IGZhaWxlZCB0byBjcmVhdGUgbWVtb3J5IGlucHV0IVxuIik7CisJCQlnb3RvIHJlc19jcmVhdGVf ZmFpbDsKKwkJfQorCisJCXBvb2wtPmJhc2UuaXBwc1tpXSA9IGRjZTgwX2lwcF9jcmVhdGUoY3R4 LCBpKTsKKwkJaWYgKHBvb2wtPmJhc2UuaXBwc1tpXSA9PSBOVUxMKSB7CisJCQlCUkVBS19UT19E RUJVR0dFUigpOworCQkJZG1fZXJyb3IoIkRDOiBmYWlsZWQgdG8gY3JlYXRlIGlucHV0IHBpeGVs IHByb2Nlc3NvciFcbiIpOworCQkJZ290byByZXNfY3JlYXRlX2ZhaWw7CisJCX0KKworCQlwb29s LT5iYXNlLnRyYW5zZm9ybXNbaV0gPSBkY2U4MF90cmFuc2Zvcm1fY3JlYXRlKGN0eCwgaSk7CisJ CWlmIChwb29sLT5iYXNlLnRyYW5zZm9ybXNbaV0gPT0gTlVMTCkgeworCQkJQlJFQUtfVE9fREVC VUdHRVIoKTsKKwkJCWRtX2Vycm9yKCJEQzogZmFpbGVkIHRvIGNyZWF0ZSB0cmFuc2Zvcm0hXG4i KTsKKwkJCWdvdG8gcmVzX2NyZWF0ZV9mYWlsOworCQl9CisKKwkJcG9vbC0+YmFzZS5vcHBzW2ld ID0gZGNlODBfb3BwX2NyZWF0ZShjdHgsIGkpOworCQlpZiAocG9vbC0+YmFzZS5vcHBzW2ldID09 IE5VTEwpIHsKKwkJCUJSRUFLX1RPX0RFQlVHR0VSKCk7CisJCQlkbV9lcnJvcigiREM6IGZhaWxl ZCB0byBjcmVhdGUgb3V0cHV0IHBpeGVsIHByb2Nlc3NvciFcbiIpOworCQkJZ290byByZXNfY3Jl YXRlX2ZhaWw7CisJCX0KKwl9CisKKwlkYy0+cHVibGljLmNhcHMubWF4X3BsYW5lcyA9ICBwb29s LT5iYXNlLnBpcGVfY291bnQ7CisKKwlpZiAoIXJlc291cmNlX2NvbnN0cnVjdChudW1fdmlydHVh bF9saW5rcywgZGMsICZwb29sLT5iYXNlLAorCQkJJnJlc19jcmVhdGVfZnVuY3MpKQorCQlnb3Rv IHJlc19jcmVhdGVfZmFpbDsKKworCS8qIENyZWF0ZSBoYXJkd2FyZSBzZXF1ZW5jZXIgKi8KKwlp ZiAoIWRjZTgwX2h3X3NlcXVlbmNlcl9jb25zdHJ1Y3QoZGMpKQorCQlnb3RvIHJlc19jcmVhdGVf ZmFpbDsKKworCXJldHVybiB0cnVlOworCityZXNfY3JlYXRlX2ZhaWw6CisJZGVzdHJ1Y3QocG9v bCk7CisJcmV0dXJuIGZhbHNlOworfQorCitzdHJ1Y3QgcmVzb3VyY2VfcG9vbCAqZGNlODFfY3Jl YXRlX3Jlc291cmNlX3Bvb2woCisJdWludDhfdCBudW1fdmlydHVhbF9saW5rcywKKwlzdHJ1Y3Qg Y29yZV9kYyAqZGMpCit7CisJc3RydWN0IGRjZTExMF9yZXNvdXJjZV9wb29sICpwb29sID0KKwkJ ZG1fYWxsb2Moc2l6ZW9mKHN0cnVjdCBkY2UxMTBfcmVzb3VyY2VfcG9vbCkpOworCisJaWYgKCFw b29sKQorCQlyZXR1cm4gTlVMTDsKKworCWlmIChkY2U4MV9jb25zdHJ1Y3QobnVtX3ZpcnR1YWxf bGlua3MsIGRjLCBwb29sKSkKKwkJcmV0dXJuICZwb29sLT5iYXNlOworCisJQlJFQUtfVE9fREVC VUdHRVIoKTsKKwlyZXR1cm4gTlVMTDsKK30KKworc3RhdGljIGJvb2wgZGNlODNfY29uc3RydWN0 KAorCXVpbnQ4X3QgbnVtX3ZpcnR1YWxfbGlua3MsCisJc3RydWN0IGNvcmVfZGMgKmRjLAorCXN0 cnVjdCBkY2UxMTBfcmVzb3VyY2VfcG9vbCAqcG9vbCkKK3sKKwl1bnNpZ25lZCBpbnQgaTsKKwlz dHJ1Y3QgZGNfY29udGV4dCAqY3R4ID0gZGMtPmN0eDsKKwlzdHJ1Y3QgZGNfZmlybXdhcmVfaW5m byBpbmZvOworCXN0cnVjdCBkY19iaW9zICpicDsKKwlzdHJ1Y3QgZG1fcHBfc3RhdGljX2Nsb2Nr X2luZm8gc3RhdGljX2Nsa19pbmZvID0gezB9OworCisJY3R4LT5kY19iaW9zLT5yZWdzID0gJmJp b3NfcmVnczsKKworCXBvb2wtPmJhc2UucmVzX2NhcCA9ICZyZXNfY2FwXzgzOworCXBvb2wtPmJh c2UuZnVuY3MgPSAmZGNlODBfcmVzX3Bvb2xfZnVuY3M7CisKKworCS8qKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisJICogIFJlc291cmNlICsgYXNpYyBj YXAgaGFyY29kaW5nICAgICAgICAgICAgICAgICoKKwkgKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKi8KKwlwb29sLT5iYXNlLnVuZGVybGF5X3BpcGVfaW5k ZXggPSBOT19VTkRFUkxBWV9QSVBFOworCXBvb2wtPmJhc2UucGlwZV9jb3VudCA9IHJlc19jYXBf ODMubnVtX3RpbWluZ19nZW5lcmF0b3I7CisJZGMtPnB1YmxpYy5jYXBzLm1heF9kb3duc2NhbGVf cmF0aW8gPSAyMDA7CisJZGMtPnB1YmxpYy5jYXBzLmkyY19zcGVlZF9pbl9raHogPSA0MDsKKwlk Yy0+cHVibGljLmNhcHMubWF4X2N1cnNvcl9zaXplID0gMTI4OworCisJLyoqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKwkgKiAgQ3JlYXRlIHJlc291cmNl cyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKgorCSAqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqLworCisJYnAgPSBjdHgtPmRjX2Jpb3M7CisKKwlp ZiAoKGJwLT5mdW5jcy0+Z2V0X2Zpcm13YXJlX2luZm8oYnAsICZpbmZvKSA9PSBCUF9SRVNVTFRf T0spICYmCisJCWluZm8uZXh0ZXJuYWxfY2xvY2tfc291cmNlX2ZyZXF1ZW5jeV9mb3JfZHAgIT0g MCkgeworCQlwb29sLT5iYXNlLmRwX2Nsb2NrX3NvdXJjZSA9CisJCQkJZGNlODBfY2xvY2tfc291 cmNlX2NyZWF0ZShjdHgsIGJwLCBDTE9DS19TT1VSQ0VfSURfRVhURVJOQUwsIE5VTEwsIHRydWUp OworCisJCXBvb2wtPmJhc2UuY2xvY2tfc291cmNlc1swXSA9CisJCQkJZGNlODBfY2xvY2tfc291 cmNlX2NyZWF0ZShjdHgsIGJwLCBDTE9DS19TT1VSQ0VfSURfUExMMSwgJmNsa19zcmNfcmVnc1sw XSwgZmFsc2UpOworCQlwb29sLT5iYXNlLmNsb2NrX3NvdXJjZXNbMV0gPQorCQkJCWRjZTgwX2Ns b2NrX3NvdXJjZV9jcmVhdGUoY3R4LCBicCwgQ0xPQ0tfU09VUkNFX0lEX1BMTDIsICZjbGtfc3Jj X3JlZ3NbMV0sIGZhbHNlKTsKKwkJcG9vbC0+YmFzZS5jbGtfc3JjX2NvdW50ID0gMjsKKworCX0g ZWxzZSB7CisJCXBvb2wtPmJhc2UuZHBfY2xvY2tfc291cmNlID0KKwkJCQlkY2U4MF9jbG9ja19z b3VyY2VfY3JlYXRlKGN0eCwgYnAsIENMT0NLX1NPVVJDRV9JRF9QTEwxLCAmY2xrX3NyY19yZWdz WzBdLCB0cnVlKTsKKworCQlwb29sLT5iYXNlLmNsb2NrX3NvdXJjZXNbMF0gPQorCQkJCWRjZTgw X2Nsb2NrX3NvdXJjZV9jcmVhdGUoY3R4LCBicCwgQ0xPQ0tfU09VUkNFX0lEX1BMTDIsICZjbGtf c3JjX3JlZ3NbMV0sIGZhbHNlKTsKKwkJcG9vbC0+YmFzZS5jbGtfc3JjX2NvdW50ID0gMTsKKwl9 CisKKwlpZiAocG9vbC0+YmFzZS5kcF9jbG9ja19zb3VyY2UgPT0gTlVMTCkgeworCQlkbV9lcnJv cigiREM6IGZhaWxlZCB0byBjcmVhdGUgZHAgY2xvY2sgc291cmNlIVxuIik7CisJCUJSRUFLX1RP X0RFQlVHR0VSKCk7CisJCWdvdG8gcmVzX2NyZWF0ZV9mYWlsOworCX0KKworCWZvciAoaSA9IDA7 IGkgPCBwb29sLT5iYXNlLmNsa19zcmNfY291bnQ7IGkrKykgeworCQlpZiAocG9vbC0+YmFzZS5j bG9ja19zb3VyY2VzW2ldID09IE5VTEwpIHsKKwkJCWRtX2Vycm9yKCJEQzogZmFpbGVkIHRvIGNy ZWF0ZSBjbG9jayBzb3VyY2VzIVxuIik7CisJCQlCUkVBS19UT19ERUJVR0dFUigpOworCQkJZ290 byByZXNfY3JlYXRlX2ZhaWw7CisJCX0KKwl9CisKKwlwb29sLT5iYXNlLmRpc3BsYXlfY2xvY2sg PSBkY2VfZGlzcF9jbGtfY3JlYXRlKGN0eCwKKwkJCSZkaXNwX2Nsa19yZWdzLAorCQkJJmRpc3Bf Y2xrX3NoaWZ0LAorCQkJJmRpc3BfY2xrX21hc2spOworCWlmIChwb29sLT5iYXNlLmRpc3BsYXlf Y2xvY2sgPT0gTlVMTCkgeworCQlkbV9lcnJvcigiREM6IGZhaWxlZCB0byBjcmVhdGUgZGlzcGxh eSBjbG9jayFcbiIpOworCQlCUkVBS19UT19ERUJVR0dFUigpOworCQlnb3RvIHJlc19jcmVhdGVf ZmFpbDsKKwl9CisKKworCWlmIChkbV9wcF9nZXRfc3RhdGljX2Nsb2NrcyhjdHgsICZzdGF0aWNf Y2xrX2luZm8pKQorCQlwb29sLT5iYXNlLmRpc3BsYXlfY2xvY2stPm1heF9jbGtzX3N0YXRlID0K KwkJCQkJc3RhdGljX2Nsa19pbmZvLm1heF9jbG9ja3Nfc3RhdGU7CisKKwl7CisJCXN0cnVjdCBp cnFfc2VydmljZV9pbml0X2RhdGEgaW5pdF9kYXRhOworCQlpbml0X2RhdGEuY3R4ID0gZGMtPmN0 eDsKKwkJcG9vbC0+YmFzZS5pcnFzID0gZGFsX2lycV9zZXJ2aWNlX2RjZTgwX2NyZWF0ZSgmaW5p dF9kYXRhKTsKKwkJaWYgKCFwb29sLT5iYXNlLmlycXMpCisJCQlnb3RvIHJlc19jcmVhdGVfZmFp bDsKKwl9CisKKwlmb3IgKGkgPSAwOyBpIDwgcG9vbC0+YmFzZS5waXBlX2NvdW50OyBpKyspIHsK KwkJcG9vbC0+YmFzZS50aW1pbmdfZ2VuZXJhdG9yc1tpXSA9IGRjZTgwX3RpbWluZ19nZW5lcmF0 b3JfY3JlYXRlKAorCQkJCWN0eCwgaSwgJmRjZTgwX3RnX29mZnNldHNbaV0pOworCQlpZiAocG9v bC0+YmFzZS50aW1pbmdfZ2VuZXJhdG9yc1tpXSA9PSBOVUxMKSB7CisJCQlCUkVBS19UT19ERUJV R0dFUigpOworCQkJZG1fZXJyb3IoIkRDOiBmYWlsZWQgdG8gY3JlYXRlIHRnIVxuIik7CisJCQln b3RvIHJlc19jcmVhdGVfZmFpbDsKKwkJfQorCisJCXBvb2wtPmJhc2UubWlzW2ldID0gZGNlODBf bWVtX2lucHV0X2NyZWF0ZShjdHgsIGkpOworCQlpZiAocG9vbC0+YmFzZS5taXNbaV0gPT0gTlVM TCkgeworCQkJQlJFQUtfVE9fREVCVUdHRVIoKTsKKwkJCWRtX2Vycm9yKCJEQzogZmFpbGVkIHRv IGNyZWF0ZSBtZW1vcnkgaW5wdXQhXG4iKTsKKwkJCWdvdG8gcmVzX2NyZWF0ZV9mYWlsOworCQl9 CisKKwkJcG9vbC0+YmFzZS5pcHBzW2ldID0gZGNlODBfaXBwX2NyZWF0ZShjdHgsIGkpOworCQlp ZiAocG9vbC0+YmFzZS5pcHBzW2ldID09IE5VTEwpIHsKKwkJCUJSRUFLX1RPX0RFQlVHR0VSKCk7 CisJCQlkbV9lcnJvcigiREM6IGZhaWxlZCB0byBjcmVhdGUgaW5wdXQgcGl4ZWwgcHJvY2Vzc29y IVxuIik7CisJCQlnb3RvIHJlc19jcmVhdGVfZmFpbDsKKwkJfQorCisJCXBvb2wtPmJhc2UudHJh bnNmb3Jtc1tpXSA9IGRjZTgwX3RyYW5zZm9ybV9jcmVhdGUoY3R4LCBpKTsKKwkJaWYgKHBvb2wt PmJhc2UudHJhbnNmb3Jtc1tpXSA9PSBOVUxMKSB7CisJCQlCUkVBS19UT19ERUJVR0dFUigpOwor CQkJZG1fZXJyb3IoIkRDOiBmYWlsZWQgdG8gY3JlYXRlIHRyYW5zZm9ybSFcbiIpOworCQkJZ290 byByZXNfY3JlYXRlX2ZhaWw7CisJCX0KKworCQlwb29sLT5iYXNlLm9wcHNbaV0gPSBkY2U4MF9v cHBfY3JlYXRlKGN0eCwgaSk7CisJCWlmIChwb29sLT5iYXNlLm9wcHNbaV0gPT0gTlVMTCkgewor CQkJQlJFQUtfVE9fREVCVUdHRVIoKTsKKwkJCWRtX2Vycm9yKCJEQzogZmFpbGVkIHRvIGNyZWF0 ZSBvdXRwdXQgcGl4ZWwgcHJvY2Vzc29yIVxuIik7CisJCQlnb3RvIHJlc19jcmVhdGVfZmFpbDsK KwkJfQorCX0KKworCWRjLT5wdWJsaWMuY2Fwcy5tYXhfcGxhbmVzID0gIHBvb2wtPmJhc2UucGlw ZV9jb3VudDsKKworCWlmICghcmVzb3VyY2VfY29uc3RydWN0KG51bV92aXJ0dWFsX2xpbmtzLCBk YywgJnBvb2wtPmJhc2UsCisJCQkmcmVzX2NyZWF0ZV9mdW5jcykpCisJCWdvdG8gcmVzX2NyZWF0 ZV9mYWlsOworCisJLyogQ3JlYXRlIGhhcmR3YXJlIHNlcXVlbmNlciAqLworCWlmICghZGNlODBf aHdfc2VxdWVuY2VyX2NvbnN0cnVjdChkYykpCisJCWdvdG8gcmVzX2NyZWF0ZV9mYWlsOworCisJ cmV0dXJuIHRydWU7CisKK3Jlc19jcmVhdGVfZmFpbDoKKwlkZXN0cnVjdChwb29sKTsKKwlyZXR1 cm4gZmFsc2U7Cit9CisKK3N0cnVjdCByZXNvdXJjZV9wb29sICpkY2U4M19jcmVhdGVfcmVzb3Vy Y2VfcG9vbCgKKwl1aW50OF90IG51bV92aXJ0dWFsX2xpbmtzLAorCXN0cnVjdCBjb3JlX2RjICpk YykKK3sKKwlzdHJ1Y3QgZGNlMTEwX3Jlc291cmNlX3Bvb2wgKnBvb2wgPQorCQlkbV9hbGxvYyhz aXplb2Yoc3RydWN0IGRjZTExMF9yZXNvdXJjZV9wb29sKSk7CisKKwlpZiAoIXBvb2wpCisJCXJl dHVybiBOVUxMOworCisJaWYgKGRjZTgzX2NvbnN0cnVjdChudW1fdmlydHVhbF9saW5rcywgZGMs IHBvb2wpKQorCQlyZXR1cm4gJnBvb2wtPmJhc2U7CisKKwlCUkVBS19UT19ERUJVR0dFUigpOwor CXJldHVybiBOVUxMOworfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjZTgwL2RjZTgwX3Jlc291cmNlLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvZGNlODAvZGNlODBfcmVzb3VyY2UuaAppbmRleCAyYTBjZGNjLi4wNGYwY2ZlIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlODAvZGNlODBfcmVzb3VyY2Uu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlODAvZGNlODBfcmVzb3Vy Y2UuaApAQCAtMzUsNSArMzUsMTMgQEAgc3RydWN0IHJlc291cmNlX3Bvb2wgKmRjZTgwX2NyZWF0 ZV9yZXNvdXJjZV9wb29sKAogCXVpbnQ4X3QgbnVtX3ZpcnR1YWxfbGlua3MsCiAJc3RydWN0IGNv cmVfZGMgKmRjKTsKIAorc3RydWN0IHJlc291cmNlX3Bvb2wgKmRjZTgxX2NyZWF0ZV9yZXNvdXJj ZV9wb29sKAorCXVpbnQ4X3QgbnVtX3ZpcnR1YWxfbGlua3MsCisJc3RydWN0IGNvcmVfZGMgKmRj KTsKKworc3RydWN0IHJlc291cmNlX3Bvb2wgKmRjZTgzX2NyZWF0ZV9yZXNvdXJjZV9wb29sKAor CXVpbnQ4X3QgbnVtX3ZpcnR1YWxfbGlua3MsCisJc3RydWN0IGNvcmVfZGMgKmRjKTsKKwogI2Vu ZGlmIC8qIF9fRENfUkVTT1VSQ0VfRENFODBfSF9fICovCiAKLS0gCjIuNS41CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK