From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH v3 2/5] drm/amdgpu: Throttle visible VRAM moves separately Date: Thu, 6 Jul 2017 19:51:27 +0900 Message-ID: <20170706105130.23731-3-michel@daenzer.net> References: <20170706105130.23731-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170706105130.23731-1-michel-otUistvHUpPR7s880joybQ@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: John Brooks RnJvbTogSm9obiBCcm9va3MgPGpvaG5AZmFzdHF1YWtlLmNvbT4KClRoZSBCTyBtb3ZlIHRocm90 dGxpbmcgY29kZSBpcyBkZXNpZ25lZCB0byBhbGxvdyBWUkFNIHRvIGZpbGwgcXVpY2tseSBpZiBp dAppcyByZWxhdGl2ZWx5IGVtcHR5LiBIb3dldmVyLCB0aGlzIGRvZXMgbm90IHRha2UgaW50byBh Y2NvdW50IHNpdHVhdGlvbnMKd2hlcmUgdGhlIHZpc2libGUgVlJBTSBpcyBzbWFsbGVyIHRoYW4g dG90YWwgVlJBTSwgYW5kIHRvdGFsIFZSQU0gbWF5IG5vdApiZSBjbG9zZSB0byBmdWxsIGJ1dCB0 aGUgdmlzaWJsZSBWUkFNIHNlZ21lbnQgaXMgdW5kZXIgcHJlc3N1cmUuIEluIHN1Y2gKc2l0dWF0 aW9ucywgdmlzaWJsZSBWUkFNIHdvdWxkIGV4cGVyaWVuY2UgdW5yZXN0cmljdGVkIHN3YXBwaW5n IGFuZApwZXJmb3JtYW5jZSB3b3VsZCBkcm9wLgoKQWRkIGEgc2VwYXJhdGUgY291bnRlciBzcGVj aWZpY2FsbHkgZm9yIG1vdmVzIGludm9sdmluZyB2aXNpYmxlIFZSQU0sIGFuZApjaGVjayBpdCBi ZWZvcmUgbW92aW5nIEJPcyB0aGVyZS4KCnYyOiBPbmx5IHBlcmZvcm0gY2FsY3VsYXRpb25zIGZv ciBzZXBhcmF0ZSBjb3VudGVyIGlmIHZpc2libGUgVlJBTSBpcwogICAgc21hbGxlciB0aGFuIHRv dGFsIFZSQU0uIChNaWNoZWwgRMOkbnplcikKdjM6IFtNaWNoZWwgRMOkbnplcl0KKiBVc2UgQk8n cyBsb2NhdGlvbiByYXRoZXIgdGhhbiB0aGUgQU1ER1BVX0dFTV9DUkVBVEVfQ1BVX0FDQ0VTU19S RVFVSVJFRAogIGZsYWcgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgdG8gYWNjb3VudCBhIG1vdmUgZm9y IHZpc2libGUgVlJBTSBpbiBtb3N0CiAgY2FzZXMuCiogVXNlIGEgc2luZ2xlCgoJaWYgKGFkZXYt Pm1jLnZpc2libGVfdnJhbV9zaXplIDwgYWRldi0+bWMucmVhbF92cmFtX3NpemUpIHsKCiAgYmxv Y2sgaW4gYW1kZ3B1X2NzX2dldF90aHJlc2hvbGRfZm9yX21vdmVzLgoKRml4ZXM6IDk1ODQ0ZDIw YWUwMiAoZHJtL2FtZGdwdTogdGhyb3R0bGUgYnVmZmVyIG1pZ3JhdGlvbnMgYXQgQ1MgdXNpbmcg YSBmaXhlZCBNQnBzIGxpbWl0ICh2MikpClNpZ25lZC1vZmYtYnk6IEpvaG4gQnJvb2tzIDxqb2hu QGZhc3RxdWFrZS5jb20+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBEw6RuemVyIDxtaWNoZWwuZGFl bnplckBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAg ICAgICB8ICA2ICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYyAgICAg fCA5MiArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9vYmplY3QuYyB8IDEyICsrKy0KIDMgZmlsZXMgY2hhbmdlZCwgODcgaW5z ZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUu aAppbmRleCBiOTVjMTA3NGQ0MmMuLjQ2M2Q2YzI0MTE1NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1LmgKQEAgLTExNjIsNyArMTE2Miw5IEBAIHN0cnVjdCBhbWRncHVfY3NfcGFyc2Vy IHsKIAlzdHJ1Y3QgbGlzdF9oZWFkCQl2YWxpZGF0ZWQ7CiAJc3RydWN0IGRtYV9mZW5jZQkJKmZl bmNlOwogCXVpbnQ2NF90CQkJYnl0ZXNfbW92ZWRfdGhyZXNob2xkOworCXVpbnQ2NF90CQkJYnl0 ZXNfbW92ZWRfdmlzX3RocmVzaG9sZDsKIAl1aW50NjRfdAkJCWJ5dGVzX21vdmVkOworCXVpbnQ2 NF90CQkJYnl0ZXNfbW92ZWRfdmlzOwogCXN0cnVjdCBhbWRncHVfYm9fbGlzdF9lbnRyeQkqZXZp Y3RhYmxlOwogCiAJLyogdXNlciBmZW5jZSAqLwpAQCAtMTU5Niw2ICsxNTk4LDcgQEAgc3RydWN0 IGFtZGdwdV9kZXZpY2UgewogCQlzcGlubG9ja190CQlsb2NrOwogCQlzNjQJCQlsYXN0X3VwZGF0 ZV91czsKIAkJczY0CQkJYWNjdW1fdXM7IC8qIGFjY3VtdWxhdGVkIG1pY3Jvc2Vjb25kcyAqLwor CQlzNjQJCQlhY2N1bV91c192aXM7IC8qIGZvciB2aXNpYmxlIFZSQU0gKi8KIAkJdTMyCQkJbG9n Ml9tYXhfTUJwczsKIAl9IG1tX3N0YXRzOwogCkBAIC0xODkyLDcgKzE4OTUsOCBAQCB2b2lkIGFt ZGdwdV9wY2lfY29uZmlnX3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKIGJvb2wg YW1kZ3B1X25lZWRfcG9zdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiB2b2lkIGFtZGdw dV91cGRhdGVfZGlzcGxheV9wcmlvcml0eShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiAK LXZvaWQgYW1kZ3B1X2NzX3JlcG9ydF9tb3ZlZF9ieXRlcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiwgdTY0IG51bV9ieXRlcyk7Cit2b2lkIGFtZGdwdV9jc19yZXBvcnRfbW92ZWRfYnl0ZXMo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHU2NCBudW1fYnl0ZXMsCisJCQkJICB1NjQgbnVt X3Zpc19ieXRlcyk7CiB2b2lkIGFtZGdwdV90dG1fcGxhY2VtZW50X2Zyb21fZG9tYWluKHN0cnVj dCBhbWRncHVfYm8gKmFibywgdTMyIGRvbWFpbik7CiBib29sIGFtZGdwdV90dG1fYm9faXNfYW1k Z3B1X2JvKHN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8pOwogaW50IGFtZGdwdV90dG1fdHRf Z2V0X3VzZXJfcGFnZXMoc3RydWN0IHR0bV90dCAqdHRtLCBzdHJ1Y3QgcGFnZSAqKnBhZ2VzKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMKaW5kZXggODIxMzFkNzBhMDZiLi40 NGVjMTFkNGQ3MzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCkBAIC0y MjAsMTAgKzIyMCwxMSBAQCBzdGF0aWMgczY0IGJ5dGVzX3RvX3VzKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2LCB1NjQgYnl0ZXMpCiAgKiB0aWNrcy4gVGhlIGFjY3VtdWxhdGVkIG1pY3Jvc2Vj b25kcyAodXMpIGFyZSBjb252ZXJ0ZWQgdG8gYnl0ZXMgYW5kCiAgKiByZXR1cm5lZC4KICAqLwot c3RhdGljIHU2NCBhbWRncHVfY3NfZ2V0X3RocmVzaG9sZF9mb3JfbW92ZXMoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCitzdGF0aWMgdm9pZCBhbWRncHVfY3NfZ2V0X3RocmVzaG9sZF9mb3Jf bW92ZXMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCisJCQkJCSAgICAgIHU2NCAqbWF4X2J5 dGVzLAorCQkJCQkgICAgICB1NjQgKm1heF92aXNfYnl0ZXMpCiB7CiAJczY0IHRpbWVfdXMsIGlu Y3JlbWVudF91czsKLQl1NjQgbWF4X2J5dGVzOwogCXU2NCBmcmVlX3ZyYW0sIHRvdGFsX3ZyYW0s IHVzZWRfdnJhbTsKIAogCS8qIEFsbG93IGEgbWF4aW11bSBvZiAyMDAgYWNjdW11bGF0ZWQgbXMu IFRoaXMgaXMgYmFzaWNhbGx5IHBlci1JQgpAQCAtMjM1LDggKzIzNiwxMSBAQCBzdGF0aWMgdTY0 IGFtZGdwdV9jc19nZXRfdGhyZXNob2xkX2Zvcl9tb3ZlcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIAkgKi8KIAljb25zdCBzNjQgdXNfdXBwZXJfYm91bmQgPSAyMDAwMDA7CiAKLQlpZiAo IWFkZXYtPm1tX3N0YXRzLmxvZzJfbWF4X01CcHMpCi0JCXJldHVybiAwOworCWlmICghYWRldi0+ bW1fc3RhdHMubG9nMl9tYXhfTUJwcykgeworCQkqbWF4X2J5dGVzID0gMDsKKwkJKm1heF92aXNf Ynl0ZXMgPSAwOworCQlyZXR1cm47CisJfQogCiAJdG90YWxfdnJhbSA9IGFkZXYtPm1jLnJlYWxf dnJhbV9zaXplIC0gYWRldi0+dnJhbV9waW5fc2l6ZTsKIAl1c2VkX3ZyYW0gPSBhdG9taWM2NF9y ZWFkKCZhZGV2LT52cmFtX3VzYWdlKTsKQEAgLTI3NywyMyArMjgxLDQ1IEBAIHN0YXRpYyB1NjQg YW1kZ3B1X2NzX2dldF90aHJlc2hvbGRfZm9yX21vdmVzKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KQogCQlhZGV2LT5tbV9zdGF0cy5hY2N1bV91cyA9IG1heChtaW5fdXMsIGFkZXYtPm1tX3N0 YXRzLmFjY3VtX3VzKTsKIAl9CiAKLQkvKiBUaGlzIHJldHVybnMgMCBpZiB0aGUgZHJpdmVyIGlz IGluIGRlYnQgdG8gZGlzYWxsb3cgKG9wdGlvbmFsKQorCS8qIFRoaXMgaXMgc2V0IHRvIDAgaWYg dGhlIGRyaXZlciBpcyBpbiBkZWJ0IHRvIGRpc2FsbG93IChvcHRpb25hbCkKIAkgKiBidWZmZXIg bW92ZXMuCiAJICovCi0JbWF4X2J5dGVzID0gdXNfdG9fYnl0ZXMoYWRldiwgYWRldi0+bW1fc3Rh dHMuYWNjdW1fdXMpOworCSptYXhfYnl0ZXMgPSB1c190b19ieXRlcyhhZGV2LCBhZGV2LT5tbV9z dGF0cy5hY2N1bV91cyk7CisKKwkvKiBEbyB0aGUgc2FtZSBmb3IgdmlzaWJsZSBWUkFNIGlmIGhh bGYgb2YgaXQgaXMgZnJlZSAqLworCWlmIChhZGV2LT5tYy52aXNpYmxlX3ZyYW1fc2l6ZSA8IGFk ZXYtPm1jLnJlYWxfdnJhbV9zaXplKSB7CisJCXU2NCB0b3RhbF92aXNfdnJhbSA9IGFkZXYtPm1j LnZpc2libGVfdnJhbV9zaXplOworCQl1NjQgdXNlZF92aXNfdnJhbSA9IGF0b21pYzY0X3JlYWQo JmFkZXYtPnZyYW1fdmlzX3VzYWdlKTsKKworCQlpZiAodXNlZF92aXNfdnJhbSA8IHRvdGFsX3Zp c192cmFtKSB7CisJCQl1NjQgZnJlZV92aXNfdnJhbSA9IHRvdGFsX3Zpc192cmFtIC0gdXNlZF92 aXNfdnJhbTsKKwkJCWFkZXYtPm1tX3N0YXRzLmFjY3VtX3VzX3ZpcyA9IG1pbihhZGV2LT5tbV9z dGF0cy5hY2N1bV91c192aXMgKworCQkJCQkJCSAgaW5jcmVtZW50X3VzLCB1c191cHBlcl9ib3Vu ZCk7CisKKwkJCWlmIChmcmVlX3Zpc192cmFtID49IHRvdGFsX3Zpc192cmFtIC8gMikKKwkJCQlh ZGV2LT5tbV9zdGF0cy5hY2N1bV91c192aXMgPQorCQkJCQltYXgoYnl0ZXNfdG9fdXMoYWRldiwg ZnJlZV92aXNfdnJhbSAvIDIpLAorCQkJCQkgICAgYWRldi0+bW1fc3RhdHMuYWNjdW1fdXNfdmlz KTsKKwkJfQorCisJCSptYXhfdmlzX2J5dGVzID0gdXNfdG9fYnl0ZXMoYWRldiwgYWRldi0+bW1f c3RhdHMuYWNjdW1fdXNfdmlzKTsKKwl9IGVsc2UgeworCQkqbWF4X3Zpc19ieXRlcyA9IDA7CisJ fQogCiAJc3Bpbl91bmxvY2soJmFkZXYtPm1tX3N0YXRzLmxvY2spOwotCXJldHVybiBtYXhfYnl0 ZXM7CiB9CiAKIC8qIFJlcG9ydCBob3cgbWFueSBieXRlcyBoYXZlIHJlYWxseSBiZWVuIG1vdmVk IGZvciB0aGUgbGFzdCBjb21tYW5kCiAgKiBzdWJtaXNzaW9uLiBUaGlzIGNhbiByZXN1bHQgaW4g YSBkZWJ0IHRoYXQgY2FuIHN0b3AgYnVmZmVyIG1pZ3JhdGlvbnMKICAqIHRlbXBvcmFyaWx5Lgog ICovCi12b2lkIGFtZGdwdV9jc19yZXBvcnRfbW92ZWRfYnl0ZXMoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsIHU2NCBudW1fYnl0ZXMpCit2b2lkIGFtZGdwdV9jc19yZXBvcnRfbW92ZWRfYnl0 ZXMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHU2NCBudW1fYnl0ZXMsCisJCQkJICB1NjQg bnVtX3Zpc19ieXRlcykKIHsKIAlzcGluX2xvY2soJmFkZXYtPm1tX3N0YXRzLmxvY2spOwogCWFk ZXYtPm1tX3N0YXRzLmFjY3VtX3VzIC09IGJ5dGVzX3RvX3VzKGFkZXYsIG51bV9ieXRlcyk7CisJ YWRldi0+bW1fc3RhdHMuYWNjdW1fdXNfdmlzIC09IGJ5dGVzX3RvX3VzKGFkZXYsIG51bV92aXNf Ynl0ZXMpOwogCXNwaW5fdW5sb2NrKCZhZGV2LT5tbV9zdGF0cy5sb2NrKTsKIH0KIApAQCAtMzAx LDcgKzMyNyw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2NzX2JvX3ZhbGlkYXRlKHN0cnVjdCBhbWRn cHVfY3NfcGFyc2VyICpwLAogCQkJCSBzdHJ1Y3QgYW1kZ3B1X2JvICpibykKIHsKIAlzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiA9IGFtZGdwdV90dG1fYWRldihiby0+dGJvLmJkZXYpOwotCXU2 NCBpbml0aWFsX2J5dGVzX21vdmVkOworCXU2NCBpbml0aWFsX2J5dGVzX21vdmVkLCBieXRlc19t b3ZlZDsKIAl1aW50MzJfdCBkb21haW47CiAJaW50IHI7CiAKQEAgLTMxMSwxNyArMzM3LDM1IEBA IHN0YXRpYyBpbnQgYW1kZ3B1X2NzX2JvX3ZhbGlkYXRlKHN0cnVjdCBhbWRncHVfY3NfcGFyc2Vy ICpwLAogCS8qIERvbid0IG1vdmUgdGhpcyBidWZmZXIgaWYgd2UgaGF2ZSBkZXBsZXRlZCBvdXIg YWxsb3dhbmNlCiAJICogdG8gbW92ZSBpdC4gRG9uJ3QgbW92ZSBhbnl0aGluZyBpZiB0aGUgdGhy ZXNob2xkIGlzIHplcm8uCiAJICovCi0JaWYgKHAtPmJ5dGVzX21vdmVkIDwgcC0+Ynl0ZXNfbW92 ZWRfdGhyZXNob2xkKQotCQlkb21haW4gPSBiby0+cHJlZmVyZWRfZG9tYWluczsKLQllbHNlCisJ aWYgKHAtPmJ5dGVzX21vdmVkIDwgcC0+Ynl0ZXNfbW92ZWRfdGhyZXNob2xkKSB7CisJCWlmIChh ZGV2LT5tYy52aXNpYmxlX3ZyYW1fc2l6ZSA8IGFkZXYtPm1jLnJlYWxfdnJhbV9zaXplICYmCisJ CSAgICAoYm8tPmZsYWdzICYgQU1ER1BVX0dFTV9DUkVBVEVfQ1BVX0FDQ0VTU19SRVFVSVJFRCkp IHsKKwkJCS8qIEFuZCBkb24ndCBtb3ZlIGEgQ1BVX0FDQ0VTU19SRVFVSVJFRCBCTyB0byBsaW1p dGVkCisJCQkgKiB2aXNpYmxlIFZSQU0gaWYgd2UndmUgZGVwbGV0ZWQgb3VyIGFsbG93YW5jZSB0 byBkbworCQkJICogdGhhdC4KKwkJCSAqLworCQkJaWYgKHAtPmJ5dGVzX21vdmVkX3ZpcyA8IHAt PmJ5dGVzX21vdmVkX3Zpc190aHJlc2hvbGQpCisJCQkJZG9tYWluID0gYm8tPnByZWZlcmVkX2Rv bWFpbnM7CisJCQllbHNlCisJCQkJZG9tYWluID0gYm8tPmFsbG93ZWRfZG9tYWluczsKKwkJfSBl bHNlIHsKKwkJCWRvbWFpbiA9IGJvLT5wcmVmZXJlZF9kb21haW5zOworCQl9CisJfSBlbHNlIHsK IAkJZG9tYWluID0gYm8tPmFsbG93ZWRfZG9tYWluczsKKwl9CiAKIHJldHJ5OgogCWFtZGdwdV90 dG1fcGxhY2VtZW50X2Zyb21fZG9tYWluKGJvLCBkb21haW4pOwogCWluaXRpYWxfYnl0ZXNfbW92 ZWQgPSBhdG9taWM2NF9yZWFkKCZhZGV2LT5udW1fYnl0ZXNfbW92ZWQpOwogCXIgPSB0dG1fYm9f dmFsaWRhdGUoJmJvLT50Ym8sICZiby0+cGxhY2VtZW50LCB0cnVlLCBmYWxzZSk7Ci0JcC0+Ynl0 ZXNfbW92ZWQgKz0gYXRvbWljNjRfcmVhZCgmYWRldi0+bnVtX2J5dGVzX21vdmVkKSAtCi0JCWlu aXRpYWxfYnl0ZXNfbW92ZWQ7CisJYnl0ZXNfbW92ZWQgPSBhdG9taWM2NF9yZWFkKCZhZGV2LT5u dW1fYnl0ZXNfbW92ZWQpIC0KKwkJICAgICAgaW5pdGlhbF9ieXRlc19tb3ZlZDsKKwlwLT5ieXRl c19tb3ZlZCArPSBieXRlc19tb3ZlZDsKKwlpZiAoYWRldi0+bWMudmlzaWJsZV92cmFtX3NpemUg PCBhZGV2LT5tYy5yZWFsX3ZyYW1fc2l6ZSAmJgorCSAgICBiby0+dGJvLm1lbS5tZW1fdHlwZSA9 PSBUVE1fUExfVlJBTSAmJgorCSAgICBiby0+dGJvLm1lbS5zdGFydCA8IGFkZXYtPm1jLnZpc2li bGVfdnJhbV9zaXplID4+IFBBR0VfU0hJRlQpCisJCXAtPmJ5dGVzX21vdmVkX3ZpcyArPSBieXRl c19tb3ZlZDsKIAogCWlmICh1bmxpa2VseShyID09IC1FTk9NRU0pICYmIGRvbWFpbiAhPSBiby0+ YWxsb3dlZF9kb21haW5zKSB7CiAJCWRvbWFpbiA9IGJvLT5hbGxvd2VkX2RvbWFpbnM7CkBAIC0z NDcsNyArMzkxLDggQEAgc3RhdGljIGJvb2wgYW1kZ3B1X2NzX3RyeV9ldmljdChzdHJ1Y3QgYW1k Z3B1X2NzX3BhcnNlciAqcCwKIAkJc3RydWN0IGFtZGdwdV9ib19saXN0X2VudHJ5ICpjYW5kaWRh dGUgPSBwLT5ldmljdGFibGU7CiAJCXN0cnVjdCBhbWRncHVfYm8gKmJvID0gY2FuZGlkYXRlLT5y b2JqOwogCQlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGFtZGdwdV90dG1fYWRldihiby0+ dGJvLmJkZXYpOwotCQl1NjQgaW5pdGlhbF9ieXRlc19tb3ZlZDsKKwkJdTY0IGluaXRpYWxfYnl0 ZXNfbW92ZWQsIGJ5dGVzX21vdmVkOworCQlib29sIHVwZGF0ZV9ieXRlc19tb3ZlZF92aXM7CiAJ CXVpbnQzMl90IG90aGVyOwogCiAJCS8qIElmIHdlIHJlYWNoZWQgb3VyIGN1cnJlbnQgQk8gd2Ug Y2FuIGZvcmdldCBpdCAqLwpAQCAtMzY3LDEwICs0MTIsMTcgQEAgc3RhdGljIGJvb2wgYW1kZ3B1 X2NzX3RyeV9ldmljdChzdHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAqcCwKIAogCQkvKiBHb29kIHdl IGNhbiB0cnkgdG8gbW92ZSB0aGlzIEJPIHNvbWV3aGVyZSBlbHNlICovCiAJCWFtZGdwdV90dG1f cGxhY2VtZW50X2Zyb21fZG9tYWluKGJvLCBvdGhlcik7CisJCXVwZGF0ZV9ieXRlc19tb3ZlZF92 aXMgPQorCQkJYWRldi0+bWMudmlzaWJsZV92cmFtX3NpemUgPCBhZGV2LT5tYy5yZWFsX3ZyYW1f c2l6ZSAmJgorCQkJYm8tPnRiby5tZW0ubWVtX3R5cGUgPT0gVFRNX1BMX1ZSQU0gJiYKKwkJCWJv LT50Ym8ubWVtLnN0YXJ0IDwgYWRldi0+bWMudmlzaWJsZV92cmFtX3NpemUgPj4gUEFHRV9TSElG VDsKIAkJaW5pdGlhbF9ieXRlc19tb3ZlZCA9IGF0b21pYzY0X3JlYWQoJmFkZXYtPm51bV9ieXRl c19tb3ZlZCk7CiAJCXIgPSB0dG1fYm9fdmFsaWRhdGUoJmJvLT50Ym8sICZiby0+cGxhY2VtZW50 LCB0cnVlLCBmYWxzZSk7Ci0JCXAtPmJ5dGVzX21vdmVkICs9IGF0b21pYzY0X3JlYWQoJmFkZXYt Pm51bV9ieXRlc19tb3ZlZCkgLQorCQlieXRlc19tb3ZlZCA9IGF0b21pYzY0X3JlYWQoJmFkZXYt Pm51bV9ieXRlc19tb3ZlZCkgLQogCQkJaW5pdGlhbF9ieXRlc19tb3ZlZDsKKwkJcC0+Ynl0ZXNf bW92ZWQgKz0gYnl0ZXNfbW92ZWQ7CisJCWlmICh1cGRhdGVfYnl0ZXNfbW92ZWRfdmlzKQorCQkJ cC0+Ynl0ZXNfbW92ZWRfdmlzICs9IGJ5dGVzX21vdmVkOwogCiAJCWlmICh1bmxpa2VseShyKSkK IAkJCWJyZWFrOwpAQCAtNTUwLDggKzYwMiwxMCBAQCBzdGF0aWMgaW50IGFtZGdwdV9jc19wYXJz ZXJfYm9zKHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwLAogCQlsaXN0X3NwbGljZSgmbmVlZF9w YWdlcywgJnAtPnZhbGlkYXRlZCk7CiAJfQogCi0JcC0+Ynl0ZXNfbW92ZWRfdGhyZXNob2xkID0g YW1kZ3B1X2NzX2dldF90aHJlc2hvbGRfZm9yX21vdmVzKHAtPmFkZXYpOworCWFtZGdwdV9jc19n ZXRfdGhyZXNob2xkX2Zvcl9tb3ZlcyhwLT5hZGV2LCAmcC0+Ynl0ZXNfbW92ZWRfdGhyZXNob2xk LAorCQkJCQkgICZwLT5ieXRlc19tb3ZlZF92aXNfdGhyZXNob2xkKTsKIAlwLT5ieXRlc19tb3Zl ZCA9IDA7CisJcC0+Ynl0ZXNfbW92ZWRfdmlzID0gMDsKIAlwLT5ldmljdGFibGUgPSBsaXN0X2xh c3RfZW50cnkoJnAtPnZhbGlkYXRlZCwKIAkJCQkgICAgICAgc3RydWN0IGFtZGdwdV9ib19saXN0 X2VudHJ5LAogCQkJCSAgICAgICB0di5oZWFkKTsKQEAgLTU3NSw4ICs2MjksOCBAQCBzdGF0aWMg aW50IGFtZGdwdV9jc19wYXJzZXJfYm9zKHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwLAogCQln b3RvIGVycm9yX3ZhbGlkYXRlOwogCX0KIAotCWFtZGdwdV9jc19yZXBvcnRfbW92ZWRfYnl0ZXMo cC0+YWRldiwgcC0+Ynl0ZXNfbW92ZWQpOwotCisJYW1kZ3B1X2NzX3JlcG9ydF9tb3ZlZF9ieXRl cyhwLT5hZGV2LCBwLT5ieXRlc19tb3ZlZCwKKwkJCQkgICAgIHAtPmJ5dGVzX21vdmVkX3Zpcyk7 CiAJZnByaXYtPnZtLmxhc3RfZXZpY3Rpb25fY291bnRlciA9CiAJCWF0b21pYzY0X3JlYWQoJnAt PmFkZXYtPm51bV9ldmljdGlvbnMpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfb2JqZWN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfb2JqZWN0LmMKaW5kZXggYTg1ZTc1MzI3NDU2Li5lNDI5ODI5YWU5M2QgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmMKQEAgLTMyMiw3ICszMjIsNyBAQCBp bnQgYW1kZ3B1X2JvX2NyZWF0ZV9yZXN0cmljdGVkKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LAogCXN0cnVjdCBhbWRncHVfYm8gKmJvOwogCWVudW0gdHRtX2JvX3R5cGUgdHlwZTsKIAl1bnNp Z25lZCBsb25nIHBhZ2VfYWxpZ247Ci0JdTY0IGluaXRpYWxfYnl0ZXNfbW92ZWQ7CisJdTY0IGlu aXRpYWxfYnl0ZXNfbW92ZWQsIGJ5dGVzX21vdmVkOwogCXNpemVfdCBhY2Nfc2l6ZTsKIAlpbnQg cjsKIApAQCAtMzk4LDggKzM5OCwxNCBAQCBpbnQgYW1kZ3B1X2JvX2NyZWF0ZV9yZXN0cmljdGVk KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCXIgPSB0dG1fYm9faW5pdF9yZXNlcnZlZCgm YWRldi0+bW1hbi5iZGV2LCAmYm8tPnRibywgc2l6ZSwgdHlwZSwKIAkJCQkgJmJvLT5wbGFjZW1l bnQsIHBhZ2VfYWxpZ24sICFrZXJuZWwsIE5VTEwsCiAJCQkJIGFjY19zaXplLCBzZywgcmVzdiwg JmFtZGdwdV90dG1fYm9fZGVzdHJveSk7Ci0JYW1kZ3B1X2NzX3JlcG9ydF9tb3ZlZF9ieXRlcyhh ZGV2LAotCQlhdG9taWM2NF9yZWFkKCZhZGV2LT5udW1fYnl0ZXNfbW92ZWQpIC0gaW5pdGlhbF9i eXRlc19tb3ZlZCk7CisJYnl0ZXNfbW92ZWQgPSBhdG9taWM2NF9yZWFkKCZhZGV2LT5udW1fYnl0 ZXNfbW92ZWQpIC0KKwkJICAgICAgaW5pdGlhbF9ieXRlc19tb3ZlZDsKKwlpZiAoYWRldi0+bWMu dmlzaWJsZV92cmFtX3NpemUgPCBhZGV2LT5tYy5yZWFsX3ZyYW1fc2l6ZSAmJgorCSAgICBiby0+ dGJvLm1lbS5tZW1fdHlwZSA9PSBUVE1fUExfVlJBTSAmJgorCSAgICBiby0+dGJvLm1lbS5zdGFy dCA8IGFkZXYtPm1jLnZpc2libGVfdnJhbV9zaXplID4+IFBBR0VfU0hJRlQpCisJCWFtZGdwdV9j c19yZXBvcnRfbW92ZWRfYnl0ZXMoYWRldiwgYnl0ZXNfbW92ZWQsIGJ5dGVzX21vdmVkKTsKKwll bHNlCisJCWFtZGdwdV9jc19yZXBvcnRfbW92ZWRfYnl0ZXMoYWRldiwgYnl0ZXNfbW92ZWQsIDAp OwogCiAJaWYgKHVubGlrZWx5KHIgIT0gMCkpCiAJCXJldHVybiByOwotLSAKMi4xMy4yCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxp bmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK