From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH] Revert "drm/amdgpu: Only update the CUR_SIZE register when necessary" Date: Wed, 11 Jan 2017 18:36:25 +0900 Message-ID: <20170111093625.10254-1-michel@daenzer.net> 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: Harald Judt , Johannes Hirte RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpUaGlzIHJldmVy dHMgY29tbWl0cyA3YzgzZDdhYmM5OTk3Y2YxZWZhYzJjMGNlMzg0YjVlODQ1M2VlODcwIGFuZAph MWY0OWNjMTc5Y2U2YjdiNzc1OGFlM2ZmNWNkYjEzOGQwZWUwZjU2LgoKVGhleSBjYXVzZWQgdGhl IEhXIGN1cnNvciB0byBkaXNhcHBlYXIgdW5kZXIgdmFyaW91cyBjaXJjdW1zdGFuY2VzIGluCnRo ZSB3aWxkLiBJIHdhc24ndCBhYmxlIHRvIHJlcHJvZHVjZSBhbnkgb2YgdGhlbSwgYW5kIEknbSBu b3Qgc3VyZQp3aGF0J3MgZ29pbmcgb24uIEJ1dCB0aG9zZSBjaGFuZ2VzIGFyZW4ndCBhIGJpZyBk ZWFsIGFueXdheSwgc28gbGV0J3MKanVzdCByZXZlcnQgZm9yIG5vdy4KCkJ1Z3ppbGxhOiBodHRw czovL2J1Z3ppbGxhLmtlcm5lbC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTI5MQpCdWd6aWxsYTog aHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTkxNDMKU2lnbmVk LW9mZi1ieTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZGNlX3YxMF8wLmMgfCAyMiArKysrKysrLS0tLS0tLS0t LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjExXzAuYyB8IDIyICsrKysr KystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92Nl8wLmMg IHwgMjQgKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9kY2VfdjhfMC5jICB8IDIyICsrKysrKystLS0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdl ZCwgMzAgaW5zZXJ0aW9ucygrKSwgNjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvZGNlX3YxMF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9kY2VfdjEwXzAuYwppbmRleCA0ZmExMjkzM2UxZmUuLmRiNmUyOTkyYjQ5YyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZGNlX3YxMF8wLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvZGNlX3YxMF8wLmMKQEAgLTI1MTMsNiArMjUxMyw4IEBAIHN0 YXRpYyBpbnQgZGNlX3YxMF8wX2N1cnNvcl9tb3ZlX2xvY2tlZChzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAKIAlXUkVHMzIobW1DVVJfUE9TSVRJT04gKyBhbWRncHVfY3J0Yy0+Y3J0Y19vZmZzZXQs ICh4IDw8IDE2KSB8IHkpOwogCVdSRUczMihtbUNVUl9IT1RfU1BPVCArIGFtZGdwdV9jcnRjLT5j cnRjX29mZnNldCwgKHhvcmlnaW4gPDwgMTYpIHwgeW9yaWdpbik7CisJV1JFRzMyKG1tQ1VSX1NJ WkUgKyBhbWRncHVfY3J0Yy0+Y3J0Y19vZmZzZXQsCisJICAgICAgICgoYW1kZ3B1X2NydGMtPmN1 cnNvcl93aWR0aCAtIDEpIDw8IDE2KSB8IChhbWRncHVfY3J0Yy0+Y3Vyc29yX2hlaWdodCAtIDEp KTsKIAogCXJldHVybiAwOwogfQpAQCAtMjUzOCw3ICsyNTQwLDYgQEAgc3RhdGljIGludCBkY2Vf djEwXzBfY3J0Y19jdXJzb3Jfc2V0MihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJICAgICAg aW50MzJfdCBob3RfeSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFtZGdwdV9jcnRjID0gdG9f YW1kZ3B1X2NydGMoY3J0Yyk7Ci0Jc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBjcnRjLT5k ZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqOwogCXN0cnVjdCBh bWRncHVfYm8gKmFvYmo7CiAJaW50IHJldDsKQEAgLTI1NzksNyArMjU4MCw5IEBAIHN0YXRpYyBp bnQgZGNlX3YxMF8wX2NydGNfY3Vyc29yX3NldDIoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJ ZGNlX3YxMF8wX2xvY2tfY3Vyc29yKGNydGMsIHRydWUpOwogCi0JaWYgKGhvdF94ICE9IGFtZGdw dV9jcnRjLT5jdXJzb3JfaG90X3ggfHwKKwlpZiAod2lkdGggIT0gYW1kZ3B1X2NydGMtPmN1cnNv cl93aWR0aCB8fAorCSAgICBoZWlnaHQgIT0gYW1kZ3B1X2NydGMtPmN1cnNvcl9oZWlnaHQgfHwK KwkgICAgaG90X3ggIT0gYW1kZ3B1X2NydGMtPmN1cnNvcl9ob3RfeCB8fAogCSAgICBob3RfeSAh PSBhbWRncHVfY3J0Yy0+Y3Vyc29yX2hvdF95KSB7CiAJCWludCB4LCB5OwogCkBAIC0yNTg4LDE2 ICsyNTkxLDEwIEBAIHN0YXRpYyBpbnQgZGNlX3YxMF8wX2NydGNfY3Vyc29yX3NldDIoc3RydWN0 IGRybV9jcnRjICpjcnRjLAogCiAJCWRjZV92MTBfMF9jdXJzb3JfbW92ZV9sb2NrZWQoY3J0Yywg eCwgeSk7CiAKLQkJYW1kZ3B1X2NydGMtPmN1cnNvcl9ob3RfeCA9IGhvdF94OwotCQlhbWRncHVf Y3J0Yy0+Y3Vyc29yX2hvdF95ID0gaG90X3k7Ci0JfQotCi0JaWYgKHdpZHRoICE9IGFtZGdwdV9j cnRjLT5jdXJzb3Jfd2lkdGggfHwKLQkgICAgaGVpZ2h0ICE9IGFtZGdwdV9jcnRjLT5jdXJzb3Jf aGVpZ2h0KSB7Ci0JCVdSRUczMihtbUNVUl9TSVpFICsgYW1kZ3B1X2NydGMtPmNydGNfb2Zmc2V0 LAotCQkgICAgICAgKHdpZHRoIC0gMSkgPDwgMTYgfCAoaGVpZ2h0IC0gMSkpOwogCQlhbWRncHVf Y3J0Yy0+Y3Vyc29yX3dpZHRoID0gd2lkdGg7CiAJCWFtZGdwdV9jcnRjLT5jdXJzb3JfaGVpZ2h0 ID0gaGVpZ2h0OworCQlhbWRncHVfY3J0Yy0+Y3Vyc29yX2hvdF94ID0gaG90X3g7CisJCWFtZGdw dV9jcnRjLT5jdXJzb3JfaG90X3kgPSBob3RfeTsKIAl9CiAKIAlkY2VfdjEwXzBfc2hvd19jdXJz b3IoY3J0Yyk7CkBAIC0yNjIxLDcgKzI2MTgsNiBAQCBzdGF0aWMgaW50IGRjZV92MTBfMF9jcnRj X2N1cnNvcl9zZXQyKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIHN0YXRpYyB2b2lkIGRjZV92MTBf MF9jdXJzb3JfcmVzZXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBhbWRncHVf Y3J0YyAqYW1kZ3B1X2NydGMgPSB0b19hbWRncHVfY3J0YyhjcnRjKTsKLQlzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiA9IGNydGMtPmRldi0+ZGV2X3ByaXZhdGU7CiAKIAlpZiAoYW1kZ3B1X2Ny dGMtPmN1cnNvcl9ibykgewogCQlkY2VfdjEwXzBfbG9ja19jdXJzb3IoY3J0YywgdHJ1ZSk7CkBA IC0yNjI5LDEwICsyNjI1LDYgQEAgc3RhdGljIHZvaWQgZGNlX3YxMF8wX2N1cnNvcl9yZXNldChz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJCWRjZV92MTBfMF9jdXJzb3JfbW92ZV9sb2NrZWQoY3J0 YywgYW1kZ3B1X2NydGMtPmN1cnNvcl94LAogCQkJCQkgICAgIGFtZGdwdV9jcnRjLT5jdXJzb3Jf eSk7CiAKLQkJV1JFRzMyKG1tQ1VSX1NJWkUgKyBhbWRncHVfY3J0Yy0+Y3J0Y19vZmZzZXQsCi0J CSAgICAgICAoYW1kZ3B1X2NydGMtPmN1cnNvcl93aWR0aCAtIDEpIDw8IDE2IHwKLQkJICAgICAg IChhbWRncHVfY3J0Yy0+Y3Vyc29yX2hlaWdodCAtIDEpKTsKLQogCQlkY2VfdjEwXzBfc2hvd19j dXJzb3IoY3J0Yyk7CiAKIAkJZGNlX3YxMF8wX2xvY2tfY3Vyc29yKGNydGMsIGZhbHNlKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92MTFfMC5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvZGNlX3YxMV8wLmMKaW5kZXggMjk3YjFmMjQxZWM5Li44YTEx NmI3MzNmMjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92MTFf MC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92MTFfMC5jCkBAIC0yNTMz LDYgKzI1MzMsOCBAQCBzdGF0aWMgaW50IGRjZV92MTFfMF9jdXJzb3JfbW92ZV9sb2NrZWQoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAogCiAJV1JFRzMyKG1tQ1VSX1BPU0lUSU9OICsgYW1kZ3B1X2Ny dGMtPmNydGNfb2Zmc2V0LCAoeCA8PCAxNikgfCB5KTsKIAlXUkVHMzIobW1DVVJfSE9UX1NQT1Qg KyBhbWRncHVfY3J0Yy0+Y3J0Y19vZmZzZXQsICh4b3JpZ2luIDw8IDE2KSB8IHlvcmlnaW4pOwor CVdSRUczMihtbUNVUl9TSVpFICsgYW1kZ3B1X2NydGMtPmNydGNfb2Zmc2V0LAorCSAgICAgICAo KGFtZGdwdV9jcnRjLT5jdXJzb3Jfd2lkdGggLSAxKSA8PCAxNikgfCAoYW1kZ3B1X2NydGMtPmN1 cnNvcl9oZWlnaHQgLSAxKSk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTI1NTgsNyArMjU2MCw2IEBA IHN0YXRpYyBpbnQgZGNlX3YxMV8wX2NydGNfY3Vyc29yX3NldDIoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCQkJCSAgICAgIGludDMyX3QgaG90X3kpCiB7CiAJc3RydWN0IGFtZGdwdV9jcnRjICph bWRncHVfY3J0YyA9IHRvX2FtZGdwdV9jcnRjKGNydGMpOwotCXN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2ID0gY3J0Yy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg Km9iajsKIAlzdHJ1Y3QgYW1kZ3B1X2JvICphb2JqOwogCWludCByZXQ7CkBAIC0yNTk5LDcgKzI2 MDAsOSBAQCBzdGF0aWMgaW50IGRjZV92MTFfMF9jcnRjX2N1cnNvcl9zZXQyKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAogCWRjZV92MTFfMF9sb2NrX2N1cnNvcihjcnRjLCB0cnVlKTsKIAotCWlm IChob3RfeCAhPSBhbWRncHVfY3J0Yy0+Y3Vyc29yX2hvdF94IHx8CisJaWYgKHdpZHRoICE9IGFt ZGdwdV9jcnRjLT5jdXJzb3Jfd2lkdGggfHwKKwkgICAgaGVpZ2h0ICE9IGFtZGdwdV9jcnRjLT5j dXJzb3JfaGVpZ2h0IHx8CisJICAgIGhvdF94ICE9IGFtZGdwdV9jcnRjLT5jdXJzb3JfaG90X3gg fHwKIAkgICAgaG90X3kgIT0gYW1kZ3B1X2NydGMtPmN1cnNvcl9ob3RfeSkgewogCQlpbnQgeCwg eTsKIApAQCAtMjYwOCwxNiArMjYxMSwxMCBAQCBzdGF0aWMgaW50IGRjZV92MTFfMF9jcnRjX2N1 cnNvcl9zZXQyKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCQlkY2VfdjExXzBfY3Vyc29yX21v dmVfbG9ja2VkKGNydGMsIHgsIHkpOwogCi0JCWFtZGdwdV9jcnRjLT5jdXJzb3JfaG90X3ggPSBo b3RfeDsKLQkJYW1kZ3B1X2NydGMtPmN1cnNvcl9ob3RfeSA9IGhvdF95OwotCX0KLQotCWlmICh3 aWR0aCAhPSBhbWRncHVfY3J0Yy0+Y3Vyc29yX3dpZHRoIHx8Ci0JICAgIGhlaWdodCAhPSBhbWRn cHVfY3J0Yy0+Y3Vyc29yX2hlaWdodCkgewotCQlXUkVHMzIobW1DVVJfU0laRSArIGFtZGdwdV9j cnRjLT5jcnRjX29mZnNldCwKLQkJICAgICAgICh3aWR0aCAtIDEpIDw8IDE2IHwgKGhlaWdodCAt IDEpKTsKIAkJYW1kZ3B1X2NydGMtPmN1cnNvcl93aWR0aCA9IHdpZHRoOwogCQlhbWRncHVfY3J0 Yy0+Y3Vyc29yX2hlaWdodCA9IGhlaWdodDsKKwkJYW1kZ3B1X2NydGMtPmN1cnNvcl9ob3RfeCA9 IGhvdF94OworCQlhbWRncHVfY3J0Yy0+Y3Vyc29yX2hvdF95ID0gaG90X3k7CiAJfQogCiAJZGNl X3YxMV8wX3Nob3dfY3Vyc29yKGNydGMpOwpAQCAtMjY0MSw3ICsyNjM4LDYgQEAgc3RhdGljIGlu dCBkY2VfdjExXzBfY3J0Y19jdXJzb3Jfc2V0MihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiBzdGF0 aWMgdm9pZCBkY2VfdjExXzBfY3Vyc29yX3Jlc2V0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsK IAlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFtZGdwdV9jcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7 Ci0Jc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBjcnRjLT5kZXYtPmRldl9wcml2YXRlOwog CiAJaWYgKGFtZGdwdV9jcnRjLT5jdXJzb3JfYm8pIHsKIAkJZGNlX3YxMV8wX2xvY2tfY3Vyc29y KGNydGMsIHRydWUpOwpAQCAtMjY0OSwxMCArMjY0NSw2IEBAIHN0YXRpYyB2b2lkIGRjZV92MTFf MF9jdXJzb3JfcmVzZXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQlkY2VfdjExXzBfY3Vyc29y X21vdmVfbG9ja2VkKGNydGMsIGFtZGdwdV9jcnRjLT5jdXJzb3JfeCwKIAkJCQkJICAgICBhbWRn cHVfY3J0Yy0+Y3Vyc29yX3kpOwogCi0JCVdSRUczMihtbUNVUl9TSVpFICsgYW1kZ3B1X2NydGMt PmNydGNfb2Zmc2V0LAotCQkgICAgICAgKGFtZGdwdV9jcnRjLT5jdXJzb3Jfd2lkdGggLSAxKSA8 PCAxNiB8Ci0JCSAgICAgICAoYW1kZ3B1X2NydGMtPmN1cnNvcl9oZWlnaHQgLSAxKSk7Ci0KIAkJ ZGNlX3YxMV8wX3Nob3dfY3Vyc29yKGNydGMpOwogCiAJCWRjZV92MTFfMF9sb2NrX2N1cnNvcihj cnRjLCBmYWxzZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2Vf djZfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZGNlX3Y2XzAuYwppbmRleCAyZTdl YjcyYjQ3YWQuLmQ0NTczMTI0M2QwZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZGNlX3Y2XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjZf MC5jCkBAIC0xODU5LDYgKzE4NTksOCBAQCBzdGF0aWMgaW50IGRjZV92Nl8wX2N1cnNvcl9tb3Zl X2xvY2tlZChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYgPSBjcnRjLT5kZXYtPmRldl9wcml2YXRlOwogCWludCB4b3JpZ2luID0gMCwgeW9yaWdpbiA9 IDA7CiAKKwlpbnQgdyA9IGFtZGdwdV9jcnRjLT5jdXJzb3Jfd2lkdGg7CisKIAlhbWRncHVfY3J0 Yy0+Y3Vyc29yX3ggPSB4OwogCWFtZGdwdV9jcnRjLT5jdXJzb3JfeSA9IHk7CiAKQEAgLTE4Nzgs NiArMTg4MCw4IEBAIHN0YXRpYyBpbnQgZGNlX3Y2XzBfY3Vyc29yX21vdmVfbG9ja2VkKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKIAogCVdSRUczMihtbUNVUl9QT1NJVElPTiArIGFtZGdwdV9jcnRj LT5jcnRjX29mZnNldCwgKHggPDwgMTYpIHwgeSk7CiAJV1JFRzMyKG1tQ1VSX0hPVF9TUE9UICsg YW1kZ3B1X2NydGMtPmNydGNfb2Zmc2V0LCAoeG9yaWdpbiA8PCAxNikgfCB5b3JpZ2luKTsKKwlX UkVHMzIobW1DVVJfU0laRSArIGFtZGdwdV9jcnRjLT5jcnRjX29mZnNldCwKKwkgICAgICAgKCh3 IC0gMSkgPDwgMTYpIHwgKGFtZGdwdV9jcnRjLT5jdXJzb3JfaGVpZ2h0IC0gMSkpOwogCiAJcmV0 dXJuIDA7CiB9CkBAIC0xOTAzLDcgKzE5MDcsNiBAQCBzdGF0aWMgaW50IGRjZV92Nl8wX2NydGNf Y3Vyc29yX3NldDIoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCSAgICAgaW50MzJfdCBob3Rf eSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFtZGdwdV9jcnRjID0gdG9fYW1kZ3B1X2NydGMo Y3J0Yyk7Ci0Jc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBjcnRjLT5kZXYtPmRldl9wcml2 YXRlOwogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqOwogCXN0cnVjdCBhbWRncHVfYm8gKmFv Ymo7CiAJaW50IHJldDsKQEAgLTE5NDQsNyArMTk0Nyw5IEBAIHN0YXRpYyBpbnQgZGNlX3Y2XzBf Y3J0Y19jdXJzb3Jfc2V0MihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlkY2VfdjZfMF9sb2Nr X2N1cnNvcihjcnRjLCB0cnVlKTsKIAotCWlmIChob3RfeCAhPSBhbWRncHVfY3J0Yy0+Y3Vyc29y X2hvdF94IHx8CisJaWYgKHdpZHRoICE9IGFtZGdwdV9jcnRjLT5jdXJzb3Jfd2lkdGggfHwKKwkg ICAgaGVpZ2h0ICE9IGFtZGdwdV9jcnRjLT5jdXJzb3JfaGVpZ2h0IHx8CisJICAgIGhvdF94ICE9 IGFtZGdwdV9jcnRjLT5jdXJzb3JfaG90X3ggfHwKIAkgICAgaG90X3kgIT0gYW1kZ3B1X2NydGMt PmN1cnNvcl9ob3RfeSkgewogCQlpbnQgeCwgeTsKIApAQCAtMTk1MywxNiArMTk1OCwxMCBAQCBz dGF0aWMgaW50IGRjZV92Nl8wX2NydGNfY3Vyc29yX3NldDIoc3RydWN0IGRybV9jcnRjICpjcnRj LAogCiAJCWRjZV92Nl8wX2N1cnNvcl9tb3ZlX2xvY2tlZChjcnRjLCB4LCB5KTsKIAotCQlhbWRn cHVfY3J0Yy0+Y3Vyc29yX2hvdF94ID0gaG90X3g7Ci0JCWFtZGdwdV9jcnRjLT5jdXJzb3JfaG90 X3kgPSBob3RfeTsKLQl9Ci0KLQlpZiAod2lkdGggIT0gYW1kZ3B1X2NydGMtPmN1cnNvcl93aWR0 aCB8fAotCSAgICBoZWlnaHQgIT0gYW1kZ3B1X2NydGMtPmN1cnNvcl9oZWlnaHQpIHsKLQkJV1JF RzMyKG1tQ1VSX1NJWkUgKyBhbWRncHVfY3J0Yy0+Y3J0Y19vZmZzZXQsCi0JCSAgICAgICAod2lk dGggLSAxKSA8PCAxNiB8IChoZWlnaHQgLSAxKSk7CiAJCWFtZGdwdV9jcnRjLT5jdXJzb3Jfd2lk dGggPSB3aWR0aDsKIAkJYW1kZ3B1X2NydGMtPmN1cnNvcl9oZWlnaHQgPSBoZWlnaHQ7CisJCWFt ZGdwdV9jcnRjLT5jdXJzb3JfaG90X3ggPSBob3RfeDsKKwkJYW1kZ3B1X2NydGMtPmN1cnNvcl9o b3RfeSA9IGhvdF95OwogCX0KIAogCWRjZV92Nl8wX3Nob3dfY3Vyc29yKGNydGMpOwpAQCAtMTk4 Niw3ICsxOTg1LDYgQEAgc3RhdGljIGludCBkY2VfdjZfMF9jcnRjX2N1cnNvcl9zZXQyKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKIHN0YXRpYyB2b2lkIGRjZV92Nl8wX2N1cnNvcl9yZXNldChzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGFtZGdwdV9jcnRjICphbWRncHVfY3J0YyA9 IHRvX2FtZGdwdV9jcnRjKGNydGMpOwotCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gY3J0 Yy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAogCWlmIChhbWRncHVfY3J0Yy0+Y3Vyc29yX2JvKSB7CiAJ CWRjZV92Nl8wX2xvY2tfY3Vyc29yKGNydGMsIHRydWUpOwpAQCAtMTk5NCwxMCArMTk5Miw2IEBA IHN0YXRpYyB2b2lkIGRjZV92Nl8wX2N1cnNvcl9yZXNldChzdHJ1Y3QgZHJtX2NydGMgKmNydGMp CiAJCWRjZV92Nl8wX2N1cnNvcl9tb3ZlX2xvY2tlZChjcnRjLCBhbWRncHVfY3J0Yy0+Y3Vyc29y X3gsCiAJCQkJCSAgICBhbWRncHVfY3J0Yy0+Y3Vyc29yX3kpOwogCi0JCVdSRUczMihtbUNVUl9T SVpFICsgYW1kZ3B1X2NydGMtPmNydGNfb2Zmc2V0LAotCQkgICAgICAgKGFtZGdwdV9jcnRjLT5j dXJzb3Jfd2lkdGggLSAxKSA8PCAxNiB8Ci0JCSAgICAgICAoYW1kZ3B1X2NydGMtPmN1cnNvcl9o ZWlnaHQgLSAxKSk7Ci0KIAkJZGNlX3Y2XzBfc2hvd19jdXJzb3IoY3J0Yyk7CiAJCWRjZV92Nl8w X2xvY2tfY3Vyc29yKGNydGMsIGZhbHNlKTsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9kY2VfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZGNl X3Y4XzAuYwppbmRleCAyNmRiN2NiMTdiYTIuLmY2ZDE2ZWRjYjdkOSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZGNlX3Y4XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9kY2VfdjhfMC5jCkBAIC0yMzY0LDYgKzIzNjQsOCBAQCBzdGF0aWMgaW50IGRj ZV92OF8wX2N1cnNvcl9tb3ZlX2xvY2tlZChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlXUkVH MzIobW1DVVJfUE9TSVRJT04gKyBhbWRncHVfY3J0Yy0+Y3J0Y19vZmZzZXQsICh4IDw8IDE2KSB8 IHkpOwogCVdSRUczMihtbUNVUl9IT1RfU1BPVCArIGFtZGdwdV9jcnRjLT5jcnRjX29mZnNldCwg KHhvcmlnaW4gPDwgMTYpIHwgeW9yaWdpbik7CisJV1JFRzMyKG1tQ1VSX1NJWkUgKyBhbWRncHVf Y3J0Yy0+Y3J0Y19vZmZzZXQsCisJICAgICAgICgoYW1kZ3B1X2NydGMtPmN1cnNvcl93aWR0aCAt IDEpIDw8IDE2KSB8IChhbWRncHVfY3J0Yy0+Y3Vyc29yX2hlaWdodCAtIDEpKTsKIAogCXJldHVy biAwOwogfQpAQCAtMjM4OSw3ICsyMzkxLDYgQEAgc3RhdGljIGludCBkY2VfdjhfMF9jcnRjX2N1 cnNvcl9zZXQyKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgICAgIGludDMyX3QgaG90X3kp CiB7CiAJc3RydWN0IGFtZGdwdV9jcnRjICphbWRncHVfY3J0YyA9IHRvX2FtZGdwdV9jcnRjKGNy dGMpOwotCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gY3J0Yy0+ZGV2LT5kZXZfcHJpdmF0 ZTsKIAlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iajsKIAlzdHJ1Y3QgYW1kZ3B1X2JvICphb2Jq OwogCWludCByZXQ7CkBAIC0yNDMwLDcgKzI0MzEsOSBAQCBzdGF0aWMgaW50IGRjZV92OF8wX2Ny dGNfY3Vyc29yX3NldDIoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJZGNlX3Y4XzBfbG9ja19j dXJzb3IoY3J0YywgdHJ1ZSk7CiAKLQlpZiAoaG90X3ggIT0gYW1kZ3B1X2NydGMtPmN1cnNvcl9o b3RfeCB8fAorCWlmICh3aWR0aCAhPSBhbWRncHVfY3J0Yy0+Y3Vyc29yX3dpZHRoIHx8CisJICAg IGhlaWdodCAhPSBhbWRncHVfY3J0Yy0+Y3Vyc29yX2hlaWdodCB8fAorCSAgICBob3RfeCAhPSBh bWRncHVfY3J0Yy0+Y3Vyc29yX2hvdF94IHx8CiAJICAgIGhvdF95ICE9IGFtZGdwdV9jcnRjLT5j dXJzb3JfaG90X3kpIHsKIAkJaW50IHgsIHk7CiAKQEAgLTI0MzksMTYgKzI0NDIsMTAgQEAgc3Rh dGljIGludCBkY2VfdjhfMF9jcnRjX2N1cnNvcl9zZXQyKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK IAogCQlkY2VfdjhfMF9jdXJzb3JfbW92ZV9sb2NrZWQoY3J0YywgeCwgeSk7CiAKLQkJYW1kZ3B1 X2NydGMtPmN1cnNvcl9ob3RfeCA9IGhvdF94OwotCQlhbWRncHVfY3J0Yy0+Y3Vyc29yX2hvdF95 ID0gaG90X3k7Ci0JfQotCi0JaWYgKHdpZHRoICE9IGFtZGdwdV9jcnRjLT5jdXJzb3Jfd2lkdGgg fHwKLQkgICAgaGVpZ2h0ICE9IGFtZGdwdV9jcnRjLT5jdXJzb3JfaGVpZ2h0KSB7Ci0JCVdSRUcz MihtbUNVUl9TSVpFICsgYW1kZ3B1X2NydGMtPmNydGNfb2Zmc2V0LAotCQkgICAgICAgKHdpZHRo IC0gMSkgPDwgMTYgfCAoaGVpZ2h0IC0gMSkpOwogCQlhbWRncHVfY3J0Yy0+Y3Vyc29yX3dpZHRo ID0gd2lkdGg7CiAJCWFtZGdwdV9jcnRjLT5jdXJzb3JfaGVpZ2h0ID0gaGVpZ2h0OworCQlhbWRn cHVfY3J0Yy0+Y3Vyc29yX2hvdF94ID0gaG90X3g7CisJCWFtZGdwdV9jcnRjLT5jdXJzb3JfaG90 X3kgPSBob3RfeTsKIAl9CiAKIAlkY2VfdjhfMF9zaG93X2N1cnNvcihjcnRjKTsKQEAgLTI0NzIs NyArMjQ2OSw2IEBAIHN0YXRpYyBpbnQgZGNlX3Y4XzBfY3J0Y19jdXJzb3Jfc2V0MihzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiBzdGF0aWMgdm9pZCBkY2VfdjhfMF9jdXJzb3JfcmVzZXQoc3RydWN0 IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBhbWRncHVfY3J0YyAqYW1kZ3B1X2NydGMgPSB0 b19hbWRncHVfY3J0YyhjcnRjKTsKLQlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGNydGMt PmRldi0+ZGV2X3ByaXZhdGU7CiAKIAlpZiAoYW1kZ3B1X2NydGMtPmN1cnNvcl9ibykgewogCQlk Y2VfdjhfMF9sb2NrX2N1cnNvcihjcnRjLCB0cnVlKTsKQEAgLTI0ODAsMTAgKzI0NzYsNiBAQCBz dGF0aWMgdm9pZCBkY2VfdjhfMF9jdXJzb3JfcmVzZXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQog CQlkY2VfdjhfMF9jdXJzb3JfbW92ZV9sb2NrZWQoY3J0YywgYW1kZ3B1X2NydGMtPmN1cnNvcl94 LAogCQkJCQkgICAgYW1kZ3B1X2NydGMtPmN1cnNvcl95KTsKIAotCQlXUkVHMzIobW1DVVJfU0la RSArIGFtZGdwdV9jcnRjLT5jcnRjX29mZnNldCwKLQkJICAgICAgIChhbWRncHVfY3J0Yy0+Y3Vy c29yX3dpZHRoIC0gMSkgPDwgMTYgfAotCQkgICAgICAgKGFtZGdwdV9jcnRjLT5jdXJzb3JfaGVp Z2h0IC0gMSkpOwotCiAJCWRjZV92OF8wX3Nob3dfY3Vyc29yKGNydGMpOwogCiAJCWRjZV92OF8w X2xvY2tfY3Vyc29yKGNydGMsIGZhbHNlKTsKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==