From: Harry Wentland Subject: [PATCH 04/25] drm/amd/display: Fixing some fallout from dc_target removal Date: Mon, 23 Jan 2017 09:35:52 -0500 Message-ID: <20170123143613.15441-5-harry.wentland@amd.com> References: <20170123143613.15441-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170123143613.15441-1-harry.wentland-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: Leon Elazar RnJvbTogTGVvbiBFbGF6YXIgPGxlb24uZWxhemFyQGFtZC5jb20+CgpBbHNvIGF2b2lkIGFsbG9j YXRpbmcgbWVtb3J5IGRjZTExMF9zZXRfb3V0cHV0X3RyYW5zZmVyX2Z1bmMKaWYgbm90IG5lZWRl ZAoKQ2hhbmdlLUlkOiBJY2EyOWFiMzZkMWJiNDc0NTE1NTBlMmY2ZWUwY2RmODYxN2M0NGE0OApT aWduZWQtb2ZmLWJ5OiBMZW9uIEVsYXphciA8bGVvbi5lbGF6YXJAYW1kLmNvbT4KQWNrZWQtYnk6 IEhhcnJ5IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29tPgpSZXZpZXdlZC1ieTogVG9u eSBDaGVuZyA8VG9ueS5DaGVuZ0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9kYy9jb3JlL2RjX3N0cmVhbS5jICAgIHwgIDYgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kY2UvZGNlX29wcC5jICAgICAgIHwgIDcgKysrKysKIC4uLi9hbWQvZGlz cGxheS9kYy9kY2UxMTAvZGNlMTEwX2h3X3NlcXVlbmNlci5jICAgIHwgMzAgKysrKystLS0tLS0t LS0tLS0tLS0tLQogLi4uL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfb3BwX3JlZ2FtbWFf di5jICAgfCAgNyArKysrKwogLi4uL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTEx MF9vcHBfdi5jICAgfCAgNiArKysrLQogLi4uL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEw L2RjZTExMF9vcHBfdi5oICAgfCAgNCArKysKIC4uLi9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEw L2RjZTExMF9yZXNvdXJjZS5jICAgIHwgMTcgKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvaW5jL2h3L2h3X3NoYXJlZC5oICB8ICAxIC0KIGRyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9pbmMvaHcvb3BwLmggICAgICAgIHwgIDEgKwogOSBmaWxlcyBjaGFu Z2VkLCA0OSBpbnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19zdHJlYW0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N0cmVhbS5jCmluZGV4IGJjMWYzODdkMTk5Mi4u NDc4MTZjNWVlMGUwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv Y29yZS9kY19zdHJlYW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29y ZS9kY19zdHJlYW0uYwpAQCAtMTkyLDcgKzE5Miw4IEBAIGJvb2wgZGNfc3RyZWFtX3NldF9jdXJz b3JfYXR0cmlidXRlcygKIAlmb3IgKGkgPSAwOyBpIDwgTUFYX1BJUEVTOyBpKyspIHsKIAkJc3Ry dWN0IHBpcGVfY3R4ICpwaXBlX2N0eCA9ICZyZXNfY3R4LT5waXBlX2N0eFtpXTsKIAotCQlpZiAo cGlwZV9jdHgtPnN0cmVhbSA9PSBzdHJlYW0pIHsKKwkJaWYgKChwaXBlX2N0eC0+c3RyZWFtID09 IHN0cmVhbSkgJiYKKwkJCShwaXBlX2N0eC0+aXBwICE9IE5VTEwpKSB7CiAJCQlzdHJ1Y3QgaW5w dXRfcGl4ZWxfcHJvY2Vzc29yICppcHAgPSBwaXBlX2N0eC0+aXBwOwogCiAJCQlpZiAoaXBwLT5m dW5jcy0+aXBwX2N1cnNvcl9zZXRfYXR0cmlidXRlcygKQEAgLTIzMSw3ICsyMzIsOCBAQCBib29s IGRjX3N0cmVhbV9zZXRfY3Vyc29yX3Bvc2l0aW9uKAogCWZvciAoaSA9IDA7IGkgPCBNQVhfUElQ RVM7IGkrKykgewogCQlzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4ID0gJnJlc19jdHgtPnBpcGVf Y3R4W2ldOwogCi0JCWlmIChwaXBlX2N0eC0+c3RyZWFtID09IHN0cmVhbSkgeworCQlpZiAoKHBp cGVfY3R4LT5zdHJlYW0gPT0gc3RyZWFtKSAmJgorCQkJCShwaXBlX2N0eC0+aXBwICE9IE5VTEwp KSB7CiAJCQlzdHJ1Y3QgaW5wdXRfcGl4ZWxfcHJvY2Vzc29yICppcHAgPSBwaXBlX2N0eC0+aXBw OwogCQkJc3RydWN0IGRjX2N1cnNvcl9taV9wYXJhbSBwYXJhbSA9IHsKIAkJCQkucGl4ZWxfY2xr X2toeiA9IGRjX3N0cmVhbS0+dGltaW5nLnBpeF9jbGtfa2h6LApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2Vfb3BwLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9vcHAuYwppbmRleCAxNjdmNTIzZGY2NTcuLjA2MWRlOWU4 MjQ5ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2Vf b3BwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2Vfb3BwLmMK QEAgLTk3Myw2ICs5NzMsMTAgQEAgYm9vbCBkY2UxMTBfb3BwX2NvbnN0cnVjdChzdHJ1Y3QgZGNl MTEwX29wcCAqb3BwMTEwLAogCiAJb3BwMTEwLT5iYXNlLmluc3QgPSBpbnN0OwogCisJb3BwMTEw LT5iYXNlLnJlZ2FtbWFfcGFyYW1zID0gZG1fYWxsb2Moc2l6ZW9mKHN0cnVjdCBwd2xfcGFyYW1z KSk7CisJaWYgKG9wcDExMC0+YmFzZS5yZWdhbW1hX3BhcmFtcyA9PSBOVUxMKQorCQlyZXR1cm4g ZmFsc2U7CisKIAlvcHAxMTAtPnJlZ3MgPSByZWdzOwogCW9wcDExMC0+b3BwX3NoaWZ0ID0gb3Bw X3NoaWZ0OwogCW9wcDExMC0+b3BwX21hc2sgPSBvcHBfbWFzazsKQEAgLTk4Miw2ICs5ODYsOSBA QCBib29sIGRjZTExMF9vcHBfY29uc3RydWN0KHN0cnVjdCBkY2UxMTBfb3BwICpvcHAxMTAsCiAK IHZvaWQgZGNlMTEwX29wcF9kZXN0cm95KHN0cnVjdCBvdXRwdXRfcGl4ZWxfcHJvY2Vzc29yICoq b3BwKQogeworCWRtX2ZyZWUoKCpvcHApLT5yZWdhbW1hX3BhcmFtcyk7CisJKCpvcHApLT5yZWdh bW1hX3BhcmFtcyA9IE5VTEw7CisKIAlkbV9mcmVlKEZST01fRENFMTFfT1BQKCpvcHApKTsKIAkq b3BwID0gTlVMTDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9kY2UxMTAvZGNlMTEwX2h3X3NlcXVlbmNlci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2RjZTExMC9kY2UxMTBfaHdfc2VxdWVuY2VyLmMKaW5kZXggNmU3MGNmN2I5OWVmLi4x YTliYTEyN2I3ODEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Y2UxMTAvZGNlMTEwX2h3X3NlcXVlbmNlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9kYy9kY2UxMTAvZGNlMTEwX2h3X3NlcXVlbmNlci5jCkBAIC03MjEsNDMgKzcyMSwyNyBA QCBzdGF0aWMgYm9vbCBkY2UxMTBfc2V0X291dHB1dF90cmFuc2Zlcl9mdW5jKAogCWNvbnN0IHN0 cnVjdCBjb3JlX3N0cmVhbSAqc3RyZWFtKQogewogCXN0cnVjdCBvdXRwdXRfcGl4ZWxfcHJvY2Vz c29yICpvcHAgPSBwaXBlX2N0eC0+b3BwOwotCWNvbnN0IHN0cnVjdCBjb3JlX2dhbW1hICpyYW1w ID0gTlVMTDsKLQlzdHJ1Y3QgcHdsX3BhcmFtcyAqcmVnYW1tYV9wYXJhbXM7Ci0JYm9vbCByZXN1 bHQgPSBmYWxzZTsKLQotCWlmIChzdXJmYWNlLT5wdWJsaWMuZ2FtbWFfY29ycmVjdGlvbikKLQkJ cmFtcCA9IERDX0dBTU1BX1RPX0NPUkUoc3VyZmFjZS0+cHVibGljLmdhbW1hX2NvcnJlY3Rpb24p OwotCi0JcmVnYW1tYV9wYXJhbXMgPSBkbV9hbGxvYyhzaXplb2Yoc3RydWN0IHB3bF9wYXJhbXMp KTsKLQlpZiAocmVnYW1tYV9wYXJhbXMgPT0gTlVMTCkKLQkJZ290byByZWdhbW1hX2FsbG9jX2Zh aWw7Ci0KLQlyZWdhbW1hX3BhcmFtcy0+aHdfcG9pbnRzX251bSA9IEdBTU1BX0hXX1BPSU5UU19O VU07CiAKIAlvcHAtPmZ1bmNzLT5vcHBfcG93ZXJfb25fcmVnYW1tYV9sdXQob3BwLCB0cnVlKTsK KwlvcHAtPnJlZ2FtbWFfcGFyYW1zLT5od19wb2ludHNfbnVtID0gR0FNTUFfSFdfUE9JTlRTX05V TTsKIAogCWlmIChzdHJlYW0tPnB1YmxpYy5vdXRfdHJhbnNmZXJfZnVuYyAmJgotCQkJc3RyZWFt LT5wdWJsaWMub3V0X3RyYW5zZmVyX2Z1bmMtPnR5cGUgPT0KKwkJc3RyZWFtLT5wdWJsaWMub3V0 X3RyYW5zZmVyX2Z1bmMtPnR5cGUgPT0KIAkJCVRGX1RZUEVfUFJFREVGSU5FRCAmJgotCQkJc3Ry ZWFtLT5wdWJsaWMub3V0X3RyYW5zZmVyX2Z1bmMtPnRmID09CisJCXN0cmVhbS0+cHVibGljLm91 dF90cmFuc2Zlcl9mdW5jLT50ZiA9PQogCQkJVFJBTlNGRVJfRlVOQ1RJT05fU1JHQikgewogCQlv cHAtPmZ1bmNzLT5vcHBfc2V0X3JlZ2FtbWFfbW9kZShvcHAsIE9QUF9SRUdBTU1BX1NSR0IpOwog CX0gZWxzZSBpZiAoZGNlMTEwX3RyYW5zbGF0ZV9yZWdhbW1hX3RvX2h3X2Zvcm1hdCgKLQkJCXN0 cmVhbS0+cHVibGljLm91dF90cmFuc2Zlcl9mdW5jLCByZWdhbW1hX3BhcmFtcykpIHsKLQkJb3Bw LT5mdW5jcy0+b3BwX3Byb2dyYW1fcmVnYW1tYV9wd2wob3BwLCByZWdhbW1hX3BhcmFtcyk7Ci0J CW9wcC0+ZnVuY3MtPm9wcF9zZXRfcmVnYW1tYV9tb2RlKG9wcCwgT1BQX1JFR0FNTUFfVVNFUik7 CisJCQkJc3RyZWFtLT5wdWJsaWMub3V0X3RyYW5zZmVyX2Z1bmMsIG9wcC0+cmVnYW1tYV9wYXJh bXMpKSB7CisJCQlvcHAtPmZ1bmNzLT5vcHBfcHJvZ3JhbV9yZWdhbW1hX3B3bChvcHAsIG9wcC0+ cmVnYW1tYV9wYXJhbXMpOworCQkJb3BwLT5mdW5jcy0+b3BwX3NldF9yZWdhbW1hX21vZGUob3Bw LCBPUFBfUkVHQU1NQV9VU0VSKTsKIAl9IGVsc2UgewogCQlvcHAtPmZ1bmNzLT5vcHBfc2V0X3Jl Z2FtbWFfbW9kZShvcHAsIE9QUF9SRUdBTU1BX0JZUEFTUyk7CiAJfQogCiAJb3BwLT5mdW5jcy0+ b3BwX3Bvd2VyX29uX3JlZ2FtbWFfbHV0KG9wcCwgZmFsc2UpOwogCi0JcmVzdWx0ID0gdHJ1ZTsK LQotCWRtX2ZyZWUocmVnYW1tYV9wYXJhbXMpOwotCi1yZWdhbW1hX2FsbG9jX2ZhaWw6Ci0JcmV0 dXJuIHJlc3VsdDsKKwlyZXR1cm4gdHJ1ZTsKIH0KIAogc3RhdGljIGVudW0gZGNfc3RhdHVzIGJp b3NfcGFyc2VyX2NydGNfc291cmNlX3NlbGVjdCgKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX29wcF9yZWdhbW1hX3YuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX29wcF9yZWdhbW1hX3YuYwppbmRl eCA4MTY0YWE2YmNiMDAuLjg3NjQ0NWYxNGM4NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfb3BwX3JlZ2FtbWFfdi5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX29wcF9yZWdhbW1hX3YuYwpA QCAtNTQ4LDMgKzU0OCwxMCBAQCB2b2lkIGRjZTExMF9vcHBfcG93ZXJfb25fcmVnYW1tYV9sdXRf digKIAogCWRtX3dyaXRlX3JlZyhvcHAtPmN0eCwgbW1EQ0ZFVl9NRU1fUFdSX0NUUkwsIHZhbHVl KTsKIH0KKwordm9pZCBkY2UxMTBfb3BwX3NldF9yZWdhbW1hX21vZGVfdigKKwlzdHJ1Y3Qgb3V0 cHV0X3BpeGVsX3Byb2Nlc3NvciAqb3BwLAorCWVudW0gb3BwX3JlZ2FtbWEgbW9kZSkKK3sKKwkv LyBUT0RPOiBuZWVkIHRvIGltcGxlbWVudCB0aGUgZnVuY3Rpb24KK30KZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX29wcF92LmMgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9vcHBfdi5jCmluZGV4IDBh OWIzODQzMDNkMC4uOTViM2QyZWI4NDI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9vcHBfdi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX29wcF92LmMKQEAgLTQyLDcgKzQyLDcgQEAgc3Rh dGljIGNvbnN0IHN0cnVjdCBvcHBfZnVuY3MgZnVuY3MgPSB7CiAJCS5vcHBfc2V0X2NzY19kZWZh dWx0ID0gZGNlMTEwX29wcF92X3NldF9jc2NfZGVmYXVsdCwKIAkJLm9wcF9zZXRfY3NjX2FkanVz dG1lbnQgPSBkY2UxMTBfb3BwX3Zfc2V0X2NzY19hZGp1c3RtZW50LAogCQkub3BwX3NldF9keW5f ZXhwYW5zaW9uID0gZGNlMTEwX29wcF9zZXRfZHluX2V4cGFuc2lvbiwKLQkJLm9wcF9zZXRfcmVn YW1tYV9tb2RlID0gZGNlMTEwX29wcF9zZXRfcmVnYW1tYV9tb2RlLAorCQkub3BwX3NldF9yZWdh bW1hX21vZGUgPSBkY2UxMTBfb3BwX3NldF9yZWdhbW1hX21vZGVfdiwKIAkJLm9wcF9kZXN0cm95 ID0gZGNlMTEwX29wcF9kZXN0cm95LAogCQkub3BwX3Byb2dyYW1fZm10ID0gZGNlMTEwX29wcF9w cm9ncmFtX2ZtdCwKIAkJLm9wcF9wcm9ncmFtX2JpdF9kZXB0aF9yZWR1Y3Rpb24gPQpAQCAtNTYs NiArNTYsMTAgQEAgYm9vbCBkY2UxMTBfb3BwX3ZfY29uc3RydWN0KHN0cnVjdCBkY2UxMTBfb3Bw ICpvcHAxMTAsCiAKIAlvcHAxMTAtPmJhc2UuY3R4ID0gY3R4OwogCisJb3BwMTEwLT5iYXNlLnJl Z2FtbWFfcGFyYW1zID0gZG1fYWxsb2Moc2l6ZW9mKHN0cnVjdCBwd2xfcGFyYW1zKSk7CisJaWYg KG9wcDExMC0+YmFzZS5yZWdhbW1hX3BhcmFtcyA9PSBOVUxMKQorCQlyZXR1cm4gZmFsc2U7CisK IAlyZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2RjZTExMC9kY2UxMTBfb3BwX3YuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9kY2UxMTAvZGNlMTEwX29wcF92LmgKaW5kZXggYWM1OTM3Nzg2Y2UzLi5jYjI2YzUxNWQz MGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNl MTEwX29wcF92LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9k Y2UxMTBfb3BwX3YuaApAQCAtNDksNCArNDksOCBAQCB2b2lkIGRjZTExMF9vcHBfcG93ZXJfb25f cmVnYW1tYV9sdXRfdigKIAlzdHJ1Y3Qgb3V0cHV0X3BpeGVsX3Byb2Nlc3NvciAqb3BwLAogCWJv b2wgcG93ZXJfb24pOwogCit2b2lkIGRjZTExMF9vcHBfc2V0X3JlZ2FtbWFfbW9kZV92KAorCXN0 cnVjdCBvdXRwdXRfcGl4ZWxfcHJvY2Vzc29yICpvcHAsCisJZW51bSBvcHBfcmVnYW1tYSBtb2Rl KTsKKwogI2VuZGlmIC8qIF9fRENfT1BQX0RDRTExMF9WX0hfXyAqLwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfcmVzb3VyY2UuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3Jlc291cmNlLmMKaW5k ZXggY2ZiYjRlZjIxZjhiLi44MmNkZGI2NDI1YTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3Jlc291cmNlLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfcmVzb3VyY2UuYwpAQCAtMTExNCwx NCArMTExNCwyMiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHJlc291cmNlX2Z1bmNzIGRjZTExMF9y ZXNfcG9vbF9mdW5jcyA9IHsKIAkJCWRjZTExMF9yZXNvdXJjZV9idWlsZF9iaXRfZGVwdGhfcmVk dWN0aW9uX3BhcmFtcwogfTsKIAotc3RhdGljIHZvaWQgdW5kZXJsYXlfY3JlYXRlKHN0cnVjdCBk Y19jb250ZXh0ICpjdHgsIHN0cnVjdCByZXNvdXJjZV9wb29sICpwb29sKQorc3RhdGljIGJvb2wg dW5kZXJsYXlfY3JlYXRlKHN0cnVjdCBkY19jb250ZXh0ICpjdHgsIHN0cnVjdCByZXNvdXJjZV9w b29sICpwb29sKQogewogCXN0cnVjdCBkY2UxMTBfdGltaW5nX2dlbmVyYXRvciAqZGNlMTEwX3Rn diA9IGRtX2FsbG9jKHNpemVvZiAoKmRjZTExMF90Z3YpKTsKIAlzdHJ1Y3QgZGNlX3RyYW5zZm9y bSAqZGNlMTEwX3hmbXYgPSBkbV9hbGxvYyhzaXplb2YgKCpkY2UxMTBfeGZtdikpOwogCXN0cnVj dCBkY2UxMTBfbWVtX2lucHV0ICpkY2UxMTBfbWl2ID0gZG1fYWxsb2Moc2l6ZW9mICgqZGNlMTEw X21pdikpOwogCXN0cnVjdCBkY2UxMTBfb3BwICpkY2UxMTBfb3BwdiA9IGRtX2FsbG9jKHNpemVv ZiAoKmRjZTExMF9vcHB2KSk7CiAKLQlkY2UxMTBfb3BwX3ZfY29uc3RydWN0KGRjZTExMF9vcHB2 LCBjdHgpOworCWlmICgoZGNlMTEwX3RndiA9PSBOVUxMKSB8fAorCQkoZGNlMTEwX3hmbXYgPT0g TlVMTCkgfHwKKwkJKGRjZTExMF9taXYgPT0gTlVMTCkgfHwKKwkJKGRjZTExMF9vcHB2ID09IE5V TEwpKQorCQkJcmV0dXJuIGZhbHNlOworCisJaWYgKCFkY2UxMTBfb3BwX3ZfY29uc3RydWN0KGRj ZTExMF9vcHB2LCBjdHgpKQorCQlyZXR1cm4gZmFsc2U7CisKIAlkY2UxMTBfdGltaW5nX2dlbmVy YXRvcl92X2NvbnN0cnVjdChkY2UxMTBfdGd2LCBjdHgpOwogCWRjZTExMF9tZW1faW5wdXRfdl9j b25zdHJ1Y3QoZGNlMTEwX21pdiwgY3R4KTsKIAlkY2UxMTBfdHJhbnNmb3JtX3ZfY29uc3RydWN0 KGRjZTExMF94Zm12LCBjdHgpOwpAQCAtMTEzNSw2ICsxMTQzLDggQEAgc3RhdGljIHZvaWQgdW5k ZXJsYXlfY3JlYXRlKHN0cnVjdCBkY19jb250ZXh0ICpjdHgsIHN0cnVjdCByZXNvdXJjZV9wb29s ICpwb29sKQogCS8qIHVwZGF0ZSB0aGUgcHVibGljIGNhcHMgdG8gaW5kaWNhdGUgYW4gdW5kZXJs YXkgaXMgYXZhaWxhYmxlICovCiAJY3R4LT5kYy0+Y2Fwcy5tYXhfc2xhdmVfcGxhbmVzID0gMTsK IAljdHgtPmRjLT5jYXBzLm1heF9zbGF2ZV9wbGFuZXMgPSAxOworCisJcmV0dXJuIHRydWU7CiB9 CiAKIHN0YXRpYyB2b2lkIGJ3X2NhbGNzX2RhdGFfdXBkYXRlX2Zyb21fcHBsaWIoc3RydWN0IGNv cmVfZGMgKmRjKQpAQCAtMTMzNCw3ICsxMzQ0LDggQEAgc3RhdGljIGJvb2wgY29uc3RydWN0KAog CQl9CiAJfQogCi0JdW5kZXJsYXlfY3JlYXRlKGN0eCwgJnBvb2wtPmJhc2UpOworCWlmICghdW5k ZXJsYXlfY3JlYXRlKGN0eCwgJnBvb2wtPmJhc2UpKQorCQlnb3RvIHJlc19jcmVhdGVfZmFpbDsK IAogCWlmICghcmVzb3VyY2VfY29uc3RydWN0KG51bV92aXJ0dWFsX2xpbmtzLCBkYywgJnBvb2wt PmJhc2UsCiAJCQkmcmVzX2NyZWF0ZV9mdW5jcykpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3L2h3X3NoYXJlZC5oIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2luYy9ody9od19zaGFyZWQuaAppbmRleCAzYjBlNjE2ZjcwNjYuLmI4NzM1 YjI3ZTliYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9o dy9od19zaGFyZWQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3 L2h3X3NoYXJlZC5oCkBAIC02NSw3ICs2NSw2IEBAIHN0cnVjdCBwd2xfcmVzdWx0X2RhdGEgewog fTsKIAogc3RydWN0IHB3bF9wYXJhbXMgewotCXVpbnQzMl90ICpkYXRhOwogCXN0cnVjdCBnYW1t YV9jdXJ2ZSBhcnJfY3VydmVfcG9pbnRzWzE2XTsKIAlzdHJ1Y3QgY3VydmVfcG9pbnRzIGFycl9w b2ludHNbM107CiAJc3RydWN0IHB3bF9yZXN1bHRfZGF0YSByZ2JfcmVzdWx0ZWRbMjU2ICsgM107 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3L29wcC5o IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9ody9vcHAuaAppbmRleCBiZWY1 ZTJjYWNiZTMuLmExMGM0ZTI5Njk2MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2luYy9ody9vcHAuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvaW5jL2h3L29wcC5oCkBAIC0yMDIsNiArMjAyLDcgQEAgZW51bSBvcHBfcmVnYW1tYSB7CiBz dHJ1Y3Qgb3V0cHV0X3BpeGVsX3Byb2Nlc3NvciB7CiAJc3RydWN0IGRjX2NvbnRleHQgKmN0eDsK IAl1aW50MzJfdCBpbnN0OworCXN0cnVjdCBwd2xfcGFyYW1zICpyZWdhbW1hX3BhcmFtczsKIAlj b25zdCBzdHJ1Y3Qgb3BwX2Z1bmNzICpmdW5jczsKIH07CiAKLS0gCjIuOS4zCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK