From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" Subject: [PATCH 2/2] drm/amdgpu: clean up UVD instance handling v2 Date: Wed, 18 Jul 2018 20:44:41 +0200 Message-ID: <20180718184441.75624-2-christian.koenig@amd.com> References: <20180718184441.75624-1-christian.koenig@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180718184441.75624-1-christian.koenig-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 VGhlIHdob2xlIGhhbmRsZSwgZmlscCBhbmQgZW50aXR5IGhhbmRsaW5nIGlzIHN1cGVyZmx1b3Vz IGhlcmUuCgpXZSBzaG91bGQgaGF2ZSByZXZpZXdlZCB0aGF0IG1vcmUgdGhvdWdodGZ1bGx5LiBJ dCBsb29rcyBsaWtlIHNvbWVib2R5Cmp1c3QgbWFkZSB0aGUgY29kZSBpbnN0YW5jZSBhd2FyZSB3 aXRob3V0IGtub3dpbmcgdGhlIGJhY2tncm91bmQuCgp2MjogZml4IG9uZSBtb3JlIG1pc3NlZCBj YXNlIGluIGFtZGdwdV91dmRfc3VzcGVuZAoKU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5p ZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV91dmQuYyB8IDEyMSArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3V2ZC5oIHwgIDEwICstLQogMiBmaWxl cyBjaGFuZ2VkLCA2NCBpbnNlcnRpb25zKCspLCA2NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdXZkLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfdXZkLmMKaW5kZXggZDcwODk3MDI0NGViLi44MGI1YzQ1M2Y4 YzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV91dmQuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdXZkLmMKQEAgLTI2MywyMSAr MjYzLDIwIEBAIGludCBhbWRncHVfdXZkX3N3X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYpCiAJCQlkZXZfZXJyKGFkZXYtPmRldiwgIiglZCkgZmFpbGVkIHRvIGFsbG9jYXRlIFVWRCBi b1xuIiwgcik7CiAJCQlyZXR1cm4gcjsKIAkJfQorCX0KIAotCQlyaW5nID0gJmFkZXYtPnV2ZC5p bnN0W2pdLnJpbmc7Ci0JCXJxID0gJnJpbmctPnNjaGVkLnNjaGVkX3JxW0RSTV9TQ0hFRF9QUklP UklUWV9OT1JNQUxdOwotCQlyID0gZHJtX3NjaGVkX2VudGl0eV9pbml0KCZhZGV2LT51dmQuaW5z dFtqXS5lbnRpdHksICZycSwKLQkJCQkJICAxLCBOVUxMKTsKLQkJaWYgKHIgIT0gMCkgewotCQkJ RFJNX0VSUk9SKCJGYWlsZWQgc2V0dGluZyB1cCBVVkQoJWQpIHJ1biBxdWV1ZS5cbiIsIGopOwot CQkJcmV0dXJuIHI7Ci0JCX0KLQotCQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZkLm1heF9oYW5k bGVzOyArK2kpIHsKLQkJCWF0b21pY19zZXQoJmFkZXYtPnV2ZC5pbnN0W2pdLmhhbmRsZXNbaV0s IDApOwotCQkJYWRldi0+dXZkLmluc3Rbal0uZmlscFtpXSA9IE5VTEw7Ci0JCX0KKwlyaW5nID0g JmFkZXYtPnV2ZC5pbnN0WzBdLnJpbmc7CisJcnEgPSAmcmluZy0+c2NoZWQuc2NoZWRfcnFbRFJN X1NDSEVEX1BSSU9SSVRZX05PUk1BTF07CisJciA9IGRybV9zY2hlZF9lbnRpdHlfaW5pdCgmYWRl di0+dXZkLmVudGl0eSwgJnJxLCAxLCBOVUxMKTsKKwlpZiAocikgeworCQlEUk1fRVJST1IoIkZh aWxlZCBzZXR0aW5nIHVwIFVWRCBrZXJuZWwgZW50aXR5LlxuIik7CisJCXJldHVybiByOwogCX0K Kwlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZkLm1heF9oYW5kbGVzOyArK2kpIHsKKwkJYXRvbWlj X3NldCgmYWRldi0+dXZkLmhhbmRsZXNbaV0sIDApOworCQlhZGV2LT51dmQuZmlscFtpXSA9IE5V TEw7CisJfQorCiAJLyogZnJvbSB1dmQgdjUuMCBIVyBhZGRyZXNzaW5nIGNhcGFjaXR5IGluY3Jl YXNlZCB0byA2NCBiaXRzICovCiAJaWYgKCFhbWRncHVfZGV2aWNlX2lwX2Jsb2NrX3ZlcnNpb25f Y21wKGFkZXYsIEFNRF9JUF9CTE9DS19UWVBFX1VWRCwgNSwgMCkpCiAJCWFkZXYtPnV2ZC5hZGRy ZXNzXzY0X2JpdCA9IHRydWU7CkBAIC0zMDYsMTEgKzMwNSwxMiBAQCBpbnQgYW1kZ3B1X3V2ZF9z d19maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCWludCBpLCBqOwogCisJZHJt X3NjaGVkX2VudGl0eV9kZXN0cm95KCZhZGV2LT51dmQuaW5zdC0+cmluZy5zY2hlZCwKKwkJCQkg JmFkZXYtPnV2ZC5lbnRpdHkpOworCiAJZm9yIChqID0gMDsgaiA8IGFkZXYtPnV2ZC5udW1fdXZk X2luc3Q7ICsraikgewogCQlrZnJlZShhZGV2LT51dmQuaW5zdFtqXS5zYXZlZF9ibyk7CiAKLQkJ ZHJtX3NjaGVkX2VudGl0eV9kZXN0cm95KCZhZGV2LT51dmQuaW5zdFtqXS5yaW5nLnNjaGVkLCAm YWRldi0+dXZkLmluc3Rbal0uZW50aXR5KTsKLQogCQlhbWRncHVfYm9fZnJlZV9rZXJuZWwoJmFk ZXYtPnV2ZC5pbnN0W2pdLnZjcHVfYm8sCiAJCQkJICAgICAgJmFkZXYtPnV2ZC5pbnN0W2pdLmdw dV9hZGRyLAogCQkJCSAgICAgICh2b2lkICoqKSZhZGV2LT51dmQuaW5zdFtqXS5jcHVfYWRkcik7 CkBAIC0zMzMsMjAgKzMzMywyMCBAQCBpbnQgYW1kZ3B1X3V2ZF9zdXNwZW5kKHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2KQogCiAJY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZhZGV2LT51dmQu aWRsZV93b3JrKTsKIAorCS8qIG9ubHkgdmFsaWQgZm9yIHBoeXNpY2FsIG1vZGUgKi8KKwlpZiAo YWRldi0+YXNpY190eXBlIDwgQ0hJUF9QT0xBUklTMTApIHsKKwkJZm9yIChpID0gMDsgaSA8IGFk ZXYtPnV2ZC5tYXhfaGFuZGxlczsgKytpKQorCQkJaWYgKGF0b21pY19yZWFkKCZhZGV2LT51dmQu aGFuZGxlc1tpXSkpCisJCQkJYnJlYWs7CisKKwkJaWYgKGkgPT0gYWRldi0+dXZkLm1heF9oYW5k bGVzKQorCQkJcmV0dXJuIDA7CisJfQorCiAJZm9yIChqID0gMDsgaiA8IGFkZXYtPnV2ZC5udW1f dXZkX2luc3Q7ICsraikgewogCQlpZiAoYWRldi0+dXZkLmluc3Rbal0udmNwdV9ibyA9PSBOVUxM KQogCQkJY29udGludWU7CiAKLQkJLyogb25seSB2YWxpZCBmb3IgcGh5c2ljYWwgbW9kZSAqLwot CQlpZiAoYWRldi0+YXNpY190eXBlIDwgQ0hJUF9QT0xBUklTMTApIHsKLQkJCWZvciAoaSA9IDA7 IGkgPCBhZGV2LT51dmQubWF4X2hhbmRsZXM7ICsraSkKLQkJCQlpZiAoYXRvbWljX3JlYWQoJmFk ZXYtPnV2ZC5pbnN0W2pdLmhhbmRsZXNbaV0pKQotCQkJCQlicmVhazsKLQotCQkJaWYgKGkgPT0g YWRldi0+dXZkLm1heF9oYW5kbGVzKQotCQkJCWNvbnRpbnVlOwotCQl9Ci0KIAkJc2l6ZSA9IGFt ZGdwdV9ib19zaXplKGFkZXYtPnV2ZC5pbnN0W2pdLnZjcHVfYm8pOwogCQlwdHIgPSBhZGV2LT51 dmQuaW5zdFtqXS5jcHVfYWRkcjsKIApAQCAtMzk4LDMwICszOTgsMjcgQEAgaW50IGFtZGdwdV91 dmRfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiB2b2lkIGFtZGdwdV91dmRf ZnJlZV9oYW5kbGVzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUg KmZpbHApCiB7Ci0Jc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nOwotCWludCBpLCBqLCByOwotCi0J Zm9yIChqID0gMDsgaiA8IGFkZXYtPnV2ZC5udW1fdXZkX2luc3Q7IGorKykgewotCQlyaW5nID0g JmFkZXYtPnV2ZC5pbnN0W2pdLnJpbmc7CisJc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nID0gJmFk ZXYtPnV2ZC5pbnN0WzBdLnJpbmc7CisJaW50IGksIHI7CiAKLQkJZm9yIChpID0gMDsgaSA8IGFk ZXYtPnV2ZC5tYXhfaGFuZGxlczsgKytpKSB7Ci0JCQl1aW50MzJfdCBoYW5kbGUgPSBhdG9taWNf cmVhZCgmYWRldi0+dXZkLmluc3Rbal0uaGFuZGxlc1tpXSk7Ci0JCQlpZiAoaGFuZGxlICE9IDAg JiYgYWRldi0+dXZkLmluc3Rbal0uZmlscFtpXSA9PSBmaWxwKSB7Ci0JCQkJc3RydWN0IGRtYV9m ZW5jZSAqZmVuY2U7Ci0KLQkJCQlyID0gYW1kZ3B1X3V2ZF9nZXRfZGVzdHJveV9tc2cocmluZywg aGFuZGxlLAotCQkJCQkJCSAgICAgICBmYWxzZSwgJmZlbmNlKTsKLQkJCQlpZiAocikgewotCQkJ CQlEUk1fRVJST1IoIkVycm9yIGRlc3Ryb3lpbmcgVVZEKCVkKSAlZCFcbiIsIGosIHIpOwotCQkJ CQljb250aW51ZTsKLQkJCQl9CisJZm9yIChpID0gMDsgaSA8IGFkZXYtPnV2ZC5tYXhfaGFuZGxl czsgKytpKSB7CisJCXVpbnQzMl90IGhhbmRsZSA9IGF0b21pY19yZWFkKCZhZGV2LT51dmQuaGFu ZGxlc1tpXSk7CiAKLQkJCQlkbWFfZmVuY2Vfd2FpdChmZW5jZSwgZmFsc2UpOwotCQkJCWRtYV9m ZW5jZV9wdXQoZmVuY2UpOworCQlpZiAoaGFuZGxlICE9IDAgJiYgYWRldi0+dXZkLmZpbHBbaV0g PT0gZmlscCkgeworCQkJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2U7CiAKLQkJCQlhZGV2LT51dmQu aW5zdFtqXS5maWxwW2ldID0gTlVMTDsKLQkJCQlhdG9taWNfc2V0KCZhZGV2LT51dmQuaW5zdFtq XS5oYW5kbGVzW2ldLCAwKTsKKwkJCXIgPSBhbWRncHVfdXZkX2dldF9kZXN0cm95X21zZyhyaW5n LCBoYW5kbGUsIGZhbHNlLAorCQkJCQkJICAgICAgICZmZW5jZSk7CisJCQlpZiAocikgeworCQkJ CURSTV9FUlJPUigiRXJyb3IgZGVzdHJveWluZyBVVkQgJWQhXG4iLCByKTsKKwkJCQljb250aW51 ZTsKIAkJCX0KKworCQkJZG1hX2ZlbmNlX3dhaXQoZmVuY2UsIGZhbHNlKTsKKwkJCWRtYV9mZW5j ZV9wdXQoZmVuY2UpOworCisJCQlhZGV2LT51dmQuZmlscFtpXSA9IE5VTEw7CisJCQlhdG9taWNf c2V0KCZhZGV2LT51dmQuaGFuZGxlc1tpXSwgMCk7CiAJCX0KIAl9CiB9CkBAIC02OTIsMjAgKzY4 OSwxOSBAQCBzdGF0aWMgaW50IGFtZGdwdV91dmRfY3NfbXNnKHN0cnVjdCBhbWRncHVfdXZkX2Nz X2N0eCAqY3R4LAogCQkJICAgICBzdHJ1Y3QgYW1kZ3B1X2JvICpibywgdW5zaWduZWQgb2Zmc2V0 KQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gY3R4LT5wYXJzZXItPmFkZXY7Ci0J dWludDMyX3QgaXBfaW5zdGFuY2UgPSBjdHgtPnBhcnNlci0+cmluZy0+bWU7CiAJaW50MzJfdCAq bXNnLCBtc2dfdHlwZSwgaGFuZGxlOwogCXZvaWQgKnB0cjsKIAlsb25nIHI7CiAJaW50IGk7CiAK IAlpZiAob2Zmc2V0ICYgMHgzRikgewotCQlEUk1fRVJST1IoIlVWRCglZCkgbWVzc2FnZXMgbXVz dCBiZSA2NCBieXRlIGFsaWduZWQhXG4iLCBpcF9pbnN0YW5jZSk7CisJCURSTV9FUlJPUigiVVZE IG1lc3NhZ2VzIG11c3QgYmUgNjQgYnl0ZSBhbGlnbmVkIVxuIik7CiAJCXJldHVybiAtRUlOVkFM OwogCX0KIAogCXIgPSBhbWRncHVfYm9fa21hcChibywgJnB0cik7CiAJaWYgKHIpIHsKLQkJRFJN X0VSUk9SKCJGYWlsZWQgbWFwcGluZyB0aGUgVVZEKCVkKSBtZXNzYWdlICglbGQpIVxuIiwgaXBf aW5zdGFuY2UsIHIpOworCQlEUk1fRVJST1IoIkZhaWxlZCBtYXBwaW5nIHRoZSBVVkQpIG1lc3Nh Z2UgKCVsZCkhXG4iLCByKTsKIAkJcmV0dXJuIHI7CiAJfQogCkBAIC03MTUsNyArNzExLDcgQEAg c3RhdGljIGludCBhbWRncHVfdXZkX2NzX21zZyhzdHJ1Y3QgYW1kZ3B1X3V2ZF9jc19jdHggKmN0 eCwKIAloYW5kbGUgPSBtc2dbMl07CiAKIAlpZiAoaGFuZGxlID09IDApIHsKLQkJRFJNX0VSUk9S KCJJbnZhbGlkIFVWRCglZCkgaGFuZGxlIVxuIiwgaXBfaW5zdGFuY2UpOworCQlEUk1fRVJST1Io IkludmFsaWQgVVZEIGhhbmRsZSFcbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKQEAgLTcy NiwxOCArNzIyLDE5IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3V2ZF9jc19tc2coc3RydWN0IGFtZGdw dV91dmRfY3NfY3R4ICpjdHgsCiAKIAkJLyogdHJ5IHRvIGFsbG9jIGEgbmV3IGhhbmRsZSAqLwog CQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZkLm1heF9oYW5kbGVzOyArK2kpIHsKLQkJCWlmIChh dG9taWNfcmVhZCgmYWRldi0+dXZkLmluc3RbaXBfaW5zdGFuY2VdLmhhbmRsZXNbaV0pID09IGhh bmRsZSkgewotCQkJCURSTV9FUlJPUigiKCVkKUhhbmRsZSAweCV4IGFscmVhZHkgaW4gdXNlIVxu IiwgaXBfaW5zdGFuY2UsIGhhbmRsZSk7CisJCQlpZiAoYXRvbWljX3JlYWQoJmFkZXYtPnV2ZC5o YW5kbGVzW2ldKSA9PSBoYW5kbGUpIHsKKwkJCQlEUk1fRVJST1IoIilIYW5kbGUgMHgleCBhbHJl YWR5IGluIHVzZSFcbiIsCisJCQkJCSAgaGFuZGxlKTsKIAkJCQlyZXR1cm4gLUVJTlZBTDsKIAkJ CX0KIAotCQkJaWYgKCFhdG9taWNfY21weGNoZygmYWRldi0+dXZkLmluc3RbaXBfaW5zdGFuY2Vd LmhhbmRsZXNbaV0sIDAsIGhhbmRsZSkpIHsKLQkJCQlhZGV2LT51dmQuaW5zdFtpcF9pbnN0YW5j ZV0uZmlscFtpXSA9IGN0eC0+cGFyc2VyLT5maWxwOworCQkJaWYgKCFhdG9taWNfY21weGNoZygm YWRldi0+dXZkLmhhbmRsZXNbaV0sIDAsIGhhbmRsZSkpIHsKKwkJCQlhZGV2LT51dmQuZmlscFtp XSA9IGN0eC0+cGFyc2VyLT5maWxwOwogCQkJCXJldHVybiAwOwogCQkJfQogCQl9CiAKLQkJRFJN X0VSUk9SKCJObyBtb3JlIGZyZWUgVVZEKCVkKSBoYW5kbGVzIVxuIiwgaXBfaW5zdGFuY2UpOwor CQlEUk1fRVJST1IoIk5vIG1vcmUgZnJlZSBVVkQgaGFuZGxlcyFcbiIpOwogCQlyZXR1cm4gLUVO T1NQQzsKIAogCWNhc2UgMToKQEAgLTc0OSwyNyArNzQ2LDI3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1 X3V2ZF9jc19tc2coc3RydWN0IGFtZGdwdV91dmRfY3NfY3R4ICpjdHgsCiAKIAkJLyogdmFsaWRh dGUgdGhlIGhhbmRsZSAqLwogCQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZkLm1heF9oYW5kbGVz OyArK2kpIHsKLQkJCWlmIChhdG9taWNfcmVhZCgmYWRldi0+dXZkLmluc3RbaXBfaW5zdGFuY2Vd LmhhbmRsZXNbaV0pID09IGhhbmRsZSkgewotCQkJCWlmIChhZGV2LT51dmQuaW5zdFtpcF9pbnN0 YW5jZV0uZmlscFtpXSAhPSBjdHgtPnBhcnNlci0+ZmlscCkgewotCQkJCQlEUk1fRVJST1IoIlVW RCglZCkgaGFuZGxlIGNvbGxpc2lvbiBkZXRlY3RlZCFcbiIsIGlwX2luc3RhbmNlKTsKKwkJCWlm IChhdG9taWNfcmVhZCgmYWRldi0+dXZkLmhhbmRsZXNbaV0pID09IGhhbmRsZSkgeworCQkJCWlm IChhZGV2LT51dmQuZmlscFtpXSAhPSBjdHgtPnBhcnNlci0+ZmlscCkgeworCQkJCQlEUk1fRVJS T1IoIlVWRCBoYW5kbGUgY29sbGlzaW9uIGRldGVjdGVkIVxuIik7CiAJCQkJCXJldHVybiAtRUlO VkFMOwogCQkJCX0KIAkJCQlyZXR1cm4gMDsKIAkJCX0KIAkJfQogCi0JCURSTV9FUlJPUigiSW52 YWxpZCBVVkQoJWQpIGhhbmRsZSAweCV4IVxuIiwgaXBfaW5zdGFuY2UsIGhhbmRsZSk7CisJCURS TV9FUlJPUigiSW52YWxpZCBVVkQgaGFuZGxlIDB4JXghXG4iLCBoYW5kbGUpOwogCQlyZXR1cm4g LUVOT0VOVDsKIAogCWNhc2UgMjoKIAkJLyogaXQncyBhIGRlc3Ryb3kgbXNnLCBmcmVlIHRoZSBo YW5kbGUgKi8KIAkJZm9yIChpID0gMDsgaSA8IGFkZXYtPnV2ZC5tYXhfaGFuZGxlczsgKytpKQot CQkJYXRvbWljX2NtcHhjaGcoJmFkZXYtPnV2ZC5pbnN0W2lwX2luc3RhbmNlXS5oYW5kbGVzW2ld LCBoYW5kbGUsIDApOworCQkJYXRvbWljX2NtcHhjaGcoJmFkZXYtPnV2ZC5oYW5kbGVzW2ldLCBo YW5kbGUsIDApOwogCQlhbWRncHVfYm9fa3VubWFwKGJvKTsKIAkJcmV0dXJuIDA7CiAKIAlkZWZh dWx0OgotCQlEUk1fRVJST1IoIklsbGVnYWwgVVZEKCVkKSBtZXNzYWdlIHR5cGUgKCVkKSFcbiIs IGlwX2luc3RhbmNlLCBtc2dfdHlwZSk7CisJCURSTV9FUlJPUigiSWxsZWdhbCBVVkQgbWVzc2Fn ZSB0eXBlICglZCkhXG4iLCBtc2dfdHlwZSk7CiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAlCVUco KTsKQEAgLTEwNzEsNyArMTA2OCw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3V2ZF9zZW5kX21zZyhz dHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHN0cnVjdCBhbWRncHVfYm8gKmJvLAogCQlpZiAocikK IAkJCWdvdG8gZXJyX2ZyZWU7CiAKLQkJciA9IGFtZGdwdV9qb2Jfc3VibWl0KGpvYiwgJmFkZXYt PnV2ZC5pbnN0W3JpbmctPm1lXS5lbnRpdHksCisJCXIgPSBhbWRncHVfam9iX3N1Ym1pdChqb2Is ICZhZGV2LT51dmQuZW50aXR5LAogCQkJCSAgICAgIEFNREdQVV9GRU5DRV9PV05FUl9VTkRFRklO RUQsICZmKTsKIAkJaWYgKHIpCiAJCQlnb3RvIGVycl9mcmVlOwpAQCAtMTI3Myw3ICsxMjcwLDcg QEAgdWludDMyX3QgYW1kZ3B1X3V2ZF91c2VkX2hhbmRsZXMoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCiAJCSAqIG5lY2Vzc2FyaWx5IGxpbmVhci4gU28gd2UgbmVlZCB0byBjb3VudAogCQkg KiBhbGwgbm9uLXplcm8gaGFuZGxlcy4KIAkJICovCi0JCWlmIChhdG9taWNfcmVhZCgmYWRldi0+ dXZkLmluc3QtPmhhbmRsZXNbaV0pKQorCQlpZiAoYXRvbWljX3JlYWQoJmFkZXYtPnV2ZC5oYW5k bGVzW2ldKSkKIAkJCXVzZWRfaGFuZGxlcysrOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3V2ZC5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X3V2ZC5oCmluZGV4IGNhZTNmNTI2MjE2Yi4uNjY4NzIyODZhYjEyIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdXZkLmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3V2ZC5oCkBAIC00MiwxMiArNDIsOSBAQCBzdHJ1 Y3QgYW1kZ3B1X3V2ZF9pbnN0IHsKIAl2b2lkCQkJKmNwdV9hZGRyOwogCXVpbnQ2NF90CQlncHVf YWRkcjsKIAl2b2lkCQkJKnNhdmVkX2JvOwotCWF0b21pY190CQloYW5kbGVzW0FNREdQVV9NQVhf VVZEX0hBTkRMRVNdOwotCXN0cnVjdCBkcm1fZmlsZQkJKmZpbHBbQU1ER1BVX01BWF9VVkRfSEFO RExFU107CiAJc3RydWN0IGFtZGdwdV9yaW5nCXJpbmc7CiAJc3RydWN0IGFtZGdwdV9yaW5nCXJp bmdfZW5jW0FNREdQVV9NQVhfVVZEX0VOQ19SSU5HU107CiAJc3RydWN0IGFtZGdwdV9pcnFfc3Jj CWlycTsKLQlzdHJ1Y3QgZHJtX3NjaGVkX2VudGl0eSBlbnRpdHk7CiAJdWludDMyX3QgICAgICAg ICAgICAgICAgc3JibV9zb2Z0X3Jlc2V0OwogfTsKIApAQCAtNTYsMTAgKzUzLDEzIEBAIHN0cnVj dCBhbWRncHVfdXZkIHsKIAl1bnNpZ25lZAkJZndfdmVyc2lvbjsKIAl1bnNpZ25lZAkJbWF4X2hh bmRsZXM7CiAJdW5zaWduZWQJCW51bV9lbmNfcmluZ3M7Ci0JdWludDhfdAkJbnVtX3V2ZF9pbnN0 OworCXVpbnQ4X3QJCQludW1fdXZkX2luc3Q7CiAJYm9vbAkJCWFkZHJlc3NfNjRfYml0OwogCWJv b2wJCQl1c2VfY3R4X2J1ZjsKLQlzdHJ1Y3QgYW1kZ3B1X3V2ZF9pbnN0CQlpbnN0W0FNREdQVV9N QVhfVVZEX0lOU1RBTkNFU107CisJc3RydWN0IGFtZGdwdV91dmRfaW5zdAlpbnN0W0FNREdQVV9N QVhfVVZEX0lOU1RBTkNFU107CisJc3RydWN0IGRybV9maWxlCQkqZmlscFtBTURHUFVfTUFYX1VW RF9IQU5ETEVTXTsKKwlhdG9taWNfdAkJaGFuZGxlc1tBTURHUFVfTUFYX1VWRF9IQU5ETEVTXTsK KwlzdHJ1Y3QgZHJtX3NjaGVkX2VudGl0eSBlbnRpdHk7CiAJc3RydWN0IGRlbGF5ZWRfd29yawlp ZGxlX3dvcms7CiB9OwogCi0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vYW1kLWdmeAo=