From: John Brooks Subject: [PATCH 7/9] drm/amdgpu: Throttle visible VRAM moves separately Date: Fri, 23 Jun 2017 13:39:38 -0400 Message-ID: <1498239580-17360-8-git-send-email-john@fastquake.com> References: <1498239580-17360-1-git-send-email-john@fastquake.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1498239580-17360-1-git-send-email-john-xq/Ko7C6e2Bl57MIdRCFDg@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, =?UTF-8?q?Michel=20D=C3=A4nzer?= , =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Cc: David Airlie , =?UTF-8?q?Christian=20K=C3=B6nig?= , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org VGhlIEJPIG1vdmUgdGhyb3R0bGluZyBjb2RlIGlzIGRlc2lnbmVkIHRvIGFsbG93IFZSQU0gdG8g ZmlsbCBxdWlja2x5IGlmIGl0CmlzIHJlbGF0aXZlbHkgZW1wdHkuIEhvd2V2ZXIsIHRoaXMgZG9l cyBub3QgdGFrZSBpbnRvIGFjY291bnQgc2l0dWF0aW9ucwp3aGVyZSB0aGUgdmlzaWJsZSBWUkFN IGlzIHNtYWxsZXIgdGhhbiB0b3RhbCBWUkFNLCBhbmQgdG90YWwgVlJBTSBtYXkgbm90CmJlIGNs b3NlIHRvIGZ1bGwgYnV0IHRoZSB2aXNpYmxlIFZSQU0gc2VnbWVudCBpcyB1bmRlciBwcmVzc3Vy ZS4gSW4gc3VjaApzaXR1YXRpb25zLCB2aXNpYmxlIFZSQU0gd291bGQgZXhwZXJpZW5jZSB1bnJl c3RyaWN0ZWQgc3dhcHBpbmcgYW5kCnBlcmZvcm1hbmNlIHdvdWxkIGRyb3AuCgpBZGQgYSBzZXBh cmF0ZSBjb3VudGVyIHNwZWNpZmljYWxseSBmb3IgbW92ZXMgaW52b2x2aW5nIHZpc2libGUgVlJB TSwgYW5kCmNoZWNrIGl0IGJlZm9yZSBtb3ZpbmcgQk9zIHRoZXJlLgoKRml4ZXM6IDk1ODQ0ZDIw YWUwMiAoZHJtL2FtZGdwdTogdGhyb3R0bGUgYnVmZmVyIG1pZ3JhdGlvbnMgYXQgQ1MgdXNpbmcg YSBmaXhlZCBNQnBzIGxpbWl0ICh2MikpClNpZ25lZC1vZmYtYnk6IEpvaG4gQnJvb2tzIDxqb2hu QGZhc3RxdWFrZS5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1Lmgg ICAgICAgIHwgIDYgKystCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYyAg ICAgfCA3NiArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYyB8IDEwICsrLS0KIDMgZmlsZXMgY2hhbmdlZCwgNzAg aW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHUuaAppbmRleCAyNDUyMzRlLi44MWRiYjkzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHUuaApAQCAtMTE2MSw3ICsxMTYxLDkgQEAgc3RydWN0IGFtZGdwdV9jc19wYXJzZXIgewogCXN0 cnVjdCBsaXN0X2hlYWQJCXZhbGlkYXRlZDsKIAlzdHJ1Y3QgZG1hX2ZlbmNlCQkqZmVuY2U7CiAJ dWludDY0X3QJCQlieXRlc19tb3ZlZF90aHJlc2hvbGQ7CisJdWludDY0X3QJCQlieXRlc19tb3Zl ZF92aXNfdGhyZXNob2xkOwogCXVpbnQ2NF90CQkJYnl0ZXNfbW92ZWQ7CisJdWludDY0X3QJCQli eXRlc19tb3ZlZF92aXM7CiAJc3RydWN0IGFtZGdwdV9ib19saXN0X2VudHJ5CSpldmljdGFibGU7 CiAKIAkvKiB1c2VyIGZlbmNlICovCkBAIC0xNTk1LDYgKzE1OTcsNyBAQCBzdHJ1Y3QgYW1kZ3B1 X2RldmljZSB7CiAJCXNwaW5sb2NrX3QJCWxvY2s7CiAJCXM2NAkJCWxhc3RfdXBkYXRlX3VzOwog CQlzNjQJCQlhY2N1bV91czsgLyogYWNjdW11bGF0ZWQgbWljcm9zZWNvbmRzICovCisJCXM2NAkJ CWFjY3VtX3VzX3ZpczsgLyogZm9yIHZpc2libGUgVlJBTSAqLwogCQl1MzIJCQlsb2cyX21heF9N QnBzOwogCX0gbW1fc3RhdHM7CiAKQEAgLTE5MzAsNyArMTkzMyw4IEBAIGJvb2wgYW1kZ3B1X25l ZWRfcG9zdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiB2b2lkIGFtZGdwdV91cGRhdGVf ZGlzcGxheV9wcmlvcml0eShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiAKIGludCBhbWRn cHVfY3NfcGFyc2VyX2luaXQoc3RydWN0IGFtZGdwdV9jc19wYXJzZXIgKnAsIHZvaWQgKmRhdGEp Owotdm9pZCBhbWRncHVfY3NfcmVwb3J0X21vdmVkX2J5dGVzKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2LCB1NjQgbnVtX2J5dGVzKTsKK3ZvaWQgYW1kZ3B1X2NzX3JlcG9ydF9tb3ZlZF9ieXRl cyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdTY0IG51bV9ieXRlcywKKwkJCQkgIHU2NCBu dW1fdmlzX2J5dGVzKTsKIHZvaWQgYW1kZ3B1X3R0bV9wbGFjZW1lbnRfZnJvbV9kb21haW4oc3Ry dWN0IGFtZGdwdV9ibyAqYWJvLCB1MzIgZG9tYWluKTsKIGJvb2wgYW1kZ3B1X3R0bV9ib19pc19h bWRncHVfYm8oc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibyk7CiBpbnQgYW1kZ3B1X3R0bV90 dF9nZXRfdXNlcl9wYWdlcyhzdHJ1Y3QgdHRtX3R0ICp0dG0sIHN0cnVjdCBwYWdlICoqcGFnZXMp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYwppbmRleCA3M2Q2ODgyLi4yNWQ2 ZGY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYwpAQCAtMjIzLDExICsy MjMsMTMgQEAgc3RhdGljIHM2NCBieXRlc190b191cyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwgdTY0IGJ5dGVzKQogICogdGlja3MuIFRoZSBhY2N1bXVsYXRlZCBtaWNyb3NlY29uZHMgKHVz KSBhcmUgY29udmVydGVkIHRvIGJ5dGVzIGFuZAogICogcmV0dXJuZWQuCiAgKi8KLXN0YXRpYyB1 NjQgYW1kZ3B1X2NzX2dldF90aHJlc2hvbGRfZm9yX21vdmVzKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KQorc3RhdGljIHZvaWQgYW1kZ3B1X2NzX2dldF90aHJlc2hvbGRfZm9yX21vdmVzKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAorCQkJCQkgICAgICB1NjQgKm1heF9ieXRlcywKKwkJ CQkJICAgICAgdTY0ICptYXhfdmlzX2J5dGVzKQogewogCXM2NCB0aW1lX3VzLCBpbmNyZW1lbnRf dXM7Ci0JdTY0IG1heF9ieXRlczsKIAl1NjQgZnJlZV92cmFtLCB0b3RhbF92cmFtLCB1c2VkX3Zy YW07CisJdTY0IGZyZWVfdmlzX3ZyYW0sIHRvdGFsX3Zpc192cmFtLCB1c2VkX3Zpc192cmFtOwog CiAJLyogQWxsb3cgYSBtYXhpbXVtIG9mIDIwMCBhY2N1bXVsYXRlZCBtcy4gVGhpcyBpcyBiYXNp Y2FsbHkgcGVyLUlCCiAJICogdGhyb3R0bGluZy4KQEAgLTIzOCwxMyArMjQwLDIxIEBAIHN0YXRp YyB1NjQgYW1kZ3B1X2NzX2dldF90aHJlc2hvbGRfZm9yX21vdmVzKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCSAqLwogCWNvbnN0IHM2NCB1c191cHBlcl9ib3VuZCA9IDIwMDAwMDsKIAot CWlmICghYWRldi0+bW1fc3RhdHMubG9nMl9tYXhfTUJwcykKLQkJcmV0dXJuIDA7CisJaWYgKCFh ZGV2LT5tbV9zdGF0cy5sb2cyX21heF9NQnBzKSB7CisJCSptYXhfYnl0ZXMgPSAwOworCQkqbWF4 X3Zpc19ieXRlcyA9IDA7CisJCXJldHVybjsKKwl9CiAKIAl0b3RhbF92cmFtID0gYWRldi0+bWMu cmVhbF92cmFtX3NpemUgLSBhZGV2LT52cmFtX3Bpbl9zaXplOwogCXVzZWRfdnJhbSA9IGF0b21p YzY0X3JlYWQoJmFkZXYtPnZyYW1fdXNhZ2UpOwogCWZyZWVfdnJhbSA9IHVzZWRfdnJhbSA+PSB0 b3RhbF92cmFtID8gMCA6IHRvdGFsX3ZyYW0gLSB1c2VkX3ZyYW07CiAKKwl0b3RhbF92aXNfdnJh bSA9IGFkZXYtPm1jLnZpc2libGVfdnJhbV9zaXplOworCXVzZWRfdmlzX3ZyYW0gPSBhdG9taWM2 NF9yZWFkKCZhZGV2LT52cmFtX3Zpc191c2FnZSk7CisJZnJlZV92aXNfdnJhbSA9IHVzZWRfdmlz X3ZyYW0gPj0gdG90YWxfdmlzX3ZyYW0gPyAwIDogdG90YWxfdmlzX3ZyYW0gLQorCQkJCQkJCSAg ICAgIHVzZWRfdmlzX3ZyYW07CisKIAlzcGluX2xvY2soJmFkZXYtPm1tX3N0YXRzLmxvY2spOwog CiAJLyogSW5jcmVhc2UgdGhlIGFtb3VudCBvZiBhY2N1bXVsYXRlZCB1cy4gKi8KQEAgLTI1Miw3 ICsyNjIsOSBAQCBzdGF0aWMgdTY0IGFtZGdwdV9jc19nZXRfdGhyZXNob2xkX2Zvcl9tb3Zlcyhz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlpbmNyZW1lbnRfdXMgPSB0aW1lX3VzIC0gYWRl di0+bW1fc3RhdHMubGFzdF91cGRhdGVfdXM7CiAJYWRldi0+bW1fc3RhdHMubGFzdF91cGRhdGVf dXMgPSB0aW1lX3VzOwogCWFkZXYtPm1tX3N0YXRzLmFjY3VtX3VzID0gbWluKGFkZXYtPm1tX3N0 YXRzLmFjY3VtX3VzICsgaW5jcmVtZW50X3VzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1c191cHBlcl9ib3VuZCk7CisJCQkJICAgICAgdXNfdXBwZXJfYm91bmQpOwor CWFkZXYtPm1tX3N0YXRzLmFjY3VtX3VzX3ZpcyA9IG1pbihhZGV2LT5tbV9zdGF0cy5hY2N1bV91 c192aXMgKworCQkJCQkgIGluY3JlbWVudF91cywgdXNfdXBwZXJfYm91bmQpOwogCiAJLyogVGhp cyBwcmV2ZW50cyB0aGUgc2hvcnQgcGVyaW9kIG9mIGxvdyBwZXJmb3JtYW5jZSB3aGVuIHRoZSBW UkFNCiAJICogdXNhZ2UgaXMgbG93IGFuZCB0aGUgZHJpdmVyIGlzIGluIGRlYnQgb3IgZG9lc24n dCBoYXZlIGVub3VnaApAQCAtMjgwLDIzICsyOTIsMzIgQEAgc3RhdGljIHU2NCBhbWRncHVfY3Nf Z2V0X3RocmVzaG9sZF9mb3JfbW92ZXMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCWFk ZXYtPm1tX3N0YXRzLmFjY3VtX3VzID0gbWF4KG1pbl91cywgYWRldi0+bW1fc3RhdHMuYWNjdW1f dXMpOwogCX0KIAotCS8qIFRoaXMgcmV0dXJucyAwIGlmIHRoZSBkcml2ZXIgaXMgaW4gZGVidCB0 byBkaXNhbGxvdyAob3B0aW9uYWwpCisJLyogRG8gdGhlIHNhbWUgZm9yIHZpc2libGUgVlJBTSBp ZiBoYWxmIG9mIGl0IGlzIGZyZWUgKi8KKwlpZiAoZnJlZV92aXNfdnJhbSA+PSB0b3RhbF92aXNf dnJhbSAvIDIpIHsKKwkJYWRldi0+bW1fc3RhdHMuYWNjdW1fdXNfdmlzID0gbWF4KGJ5dGVzX3Rv X3VzKGFkZXYsCisJCQkJCQkgIGZyZWVfdmlzX3ZyYW0gLyAyKSwKKwkJCQkJCSAgYWRldi0+bW1f c3RhdHMuYWNjdW1fdXNfdmlzKTsKKwl9CisKKwkvKiBUaGlzIGlzIHNldCB0byAwIGlmIHRoZSBk cml2ZXIgaXMgaW4gZGVidCB0byBkaXNhbGxvdyAob3B0aW9uYWwpCiAJICogYnVmZmVyIG1vdmVz LgogCSAqLwotCW1heF9ieXRlcyA9IHVzX3RvX2J5dGVzKGFkZXYsIGFkZXYtPm1tX3N0YXRzLmFj Y3VtX3VzKTsKKwkqbWF4X2J5dGVzID0gdXNfdG9fYnl0ZXMoYWRldiwgYWRldi0+bW1fc3RhdHMu YWNjdW1fdXMpOworCSptYXhfdmlzX2J5dGVzID0gdXNfdG9fYnl0ZXMoYWRldiwgYWRldi0+bW1f c3RhdHMuYWNjdW1fdXNfdmlzKTsKIAogCXNwaW5fdW5sb2NrKCZhZGV2LT5tbV9zdGF0cy5sb2Nr KTsKLQlyZXR1cm4gbWF4X2J5dGVzOwogfQogCiAvKiBSZXBvcnQgaG93IG1hbnkgYnl0ZXMgaGF2 ZSByZWFsbHkgYmVlbiBtb3ZlZCBmb3IgdGhlIGxhc3QgY29tbWFuZAogICogc3VibWlzc2lvbi4g VGhpcyBjYW4gcmVzdWx0IGluIGEgZGVidCB0aGF0IGNhbiBzdG9wIGJ1ZmZlciBtaWdyYXRpb25z CiAgKiB0ZW1wb3JhcmlseS4KICAqLwotdm9pZCBhbWRncHVfY3NfcmVwb3J0X21vdmVkX2J5dGVz KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1NjQgbnVtX2J5dGVzKQordm9pZCBhbWRncHVf Y3NfcmVwb3J0X21vdmVkX2J5dGVzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1NjQgbnVt X2J5dGVzLAorCQkJCSAgdTY0IG51bV92aXNfYnl0ZXMpCiB7CiAJc3Bpbl9sb2NrKCZhZGV2LT5t bV9zdGF0cy5sb2NrKTsKIAlhZGV2LT5tbV9zdGF0cy5hY2N1bV91cyAtPSBieXRlc190b191cyhh ZGV2LCBudW1fYnl0ZXMpOworCWFkZXYtPm1tX3N0YXRzLmFjY3VtX3VzX3ZpcyAtPSBieXRlc190 b191cyhhZGV2LCBudW1fdmlzX2J5dGVzKTsKIAlzcGluX3VubG9jaygmYWRldi0+bW1fc3RhdHMu bG9jayk7CiB9CiAKQEAgLTMwNCw3ICszMjUsNyBAQCBzdGF0aWMgaW50IGFtZGdwdV9jc19ib192 YWxpZGF0ZShzdHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAqcCwKIAkJCQkgc3RydWN0IGFtZGdwdV9i byAqYm8pCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBhbWRncHVfdHRtX2FkZXYo Ym8tPnRiby5iZGV2KTsKLQl1NjQgaW5pdGlhbF9ieXRlc19tb3ZlZDsKKwl1NjQgaW5pdGlhbF9i eXRlc19tb3ZlZCwgYnl0ZXNfbW92ZWQ7CiAJdWludDMyX3QgZG9tYWluOwogCXVpbnQzMl90IG9s ZF9tZW07CiAJaW50IHI7CkBAIC0zMTIsMjIgKzMzMywzOSBAQCBzdGF0aWMgaW50IGFtZGdwdV9j c19ib192YWxpZGF0ZShzdHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAqcCwKIAlpZiAoYm8tPnBpbl9j b3VudCkKIAkJcmV0dXJuIDA7CiAKKwlhbWRncHVfYm9fY2xlYXJfY3B1X2FjY2Vzc19yZXF1aXJl ZChibyk7CisKIAkvKiBEb24ndCBtb3ZlIHRoaXMgYnVmZmVyIGlmIHdlIGhhdmUgZGVwbGV0ZWQg b3VyIGFsbG93YW5jZQogCSAqIHRvIG1vdmUgaXQuIERvbid0IG1vdmUgYW55dGhpbmcgaWYgdGhl IHRocmVzaG9sZCBpcyB6ZXJvLgogCSAqLwotCWlmIChwLT5ieXRlc19tb3ZlZCA8IHAtPmJ5dGVz X21vdmVkX3RocmVzaG9sZCkKLQkJZG9tYWluID0gYm8tPnByZWZlcmVkX2RvbWFpbnM7Ci0JZWxz ZQorCWlmIChwLT5ieXRlc19tb3ZlZCA8IHAtPmJ5dGVzX21vdmVkX3RocmVzaG9sZCkgeworCQlp ZiAoYWRldi0+bWMudmlzaWJsZV92cmFtX3NpemUgPCBhZGV2LT5tYy5yZWFsX3ZyYW1fc2l6ZSAm JgorCQkgICAgKGJvLT5mbGFncyAmIEFNREdQVV9HRU1fQ1JFQVRFX0NQVV9BQ0NFU1NfUkVRVUlS RUQpKSB7CisJCQkvKiBBbmQgZG9uJ3QgbW92ZSBhIENQVV9BQ0NFU1NfUkVRVUlSRUQgQk8gdG8g bGltaXRlZAorCQkJICogdmlzaWJsZSBWUkFNIGlmIHdlJ3ZlIGRlcGxldGVkIG91ciBhbGxvd2Fu Y2UgdG8gZG8KKwkJCSAqIHRoYXQuCisJCQkgKi8KKwkJCWlmIChwLT5ieXRlc19tb3ZlZF92aXMg PCBwLT5ieXRlc19tb3ZlZF92aXNfdGhyZXNob2xkKQorCQkJCWRvbWFpbiA9IGJvLT5wcmVmZXJl ZF9kb21haW5zOworCQkJZWxzZQorCQkJCWRvbWFpbiA9IGJvLT5hbGxvd2VkX2RvbWFpbnM7CisJ CX0gZWxzZSB7CisJCQlkb21haW4gPSBiby0+cHJlZmVyZWRfZG9tYWluczsKKwkJfQorCX0gZWxz ZSB7CiAJCWRvbWFpbiA9IGJvLT5hbGxvd2VkX2RvbWFpbnM7CisJfQogCi0JYW1kZ3B1X2JvX2Ns ZWFyX2NwdV9hY2Nlc3NfcmVxdWlyZWQoYm8pOwogcmV0cnk6CiAJYW1kZ3B1X3R0bV9wbGFjZW1l bnRfZnJvbV9kb21haW4oYm8sIGRvbWFpbik7CiAJaW5pdGlhbF9ieXRlc19tb3ZlZCA9IGF0b21p YzY0X3JlYWQoJmFkZXYtPm51bV9ieXRlc19tb3ZlZCk7CiAJb2xkX21lbSA9IGJvLT50Ym8ubWVt Lm1lbV90eXBlOwogCXIgPSB0dG1fYm9fdmFsaWRhdGUoJmJvLT50Ym8sICZiby0+cGxhY2VtZW50 LCB0cnVlLCBmYWxzZSk7Ci0JcC0+Ynl0ZXNfbW92ZWQgKz0gYXRvbWljNjRfcmVhZCgmYWRldi0+ bnVtX2J5dGVzX21vdmVkKSAtCisJYnl0ZXNfbW92ZWQgPSBhdG9taWM2NF9yZWFkKCZhZGV2LT5u dW1fYnl0ZXNfbW92ZWQpIC0KIAkJaW5pdGlhbF9ieXRlc19tb3ZlZDsKKwlwLT5ieXRlc19tb3Zl ZCArPSBieXRlc19tb3ZlZDsKKwlpZiAoYm8tPmZsYWdzICYgQU1ER1BVX0dFTV9DUkVBVEVfQ1BV X0FDQ0VTU19SRVFVSVJFRCkKKwkJcC0+Ynl0ZXNfbW92ZWRfdmlzICs9IGJ5dGVzX21vdmVkOwog CiAJaWYgKHVubGlrZWx5KHIgPT0gLUVOT01FTSkgJiYgZG9tYWluICE9IGJvLT5hbGxvd2VkX2Rv bWFpbnMpIHsKIAkJZG9tYWluID0gYm8tPmFsbG93ZWRfZG9tYWluczsKQEAgLTU2MCw4ICs1OTgs MTAgQEAgc3RhdGljIGludCBhbWRncHVfY3NfcGFyc2VyX2JvcyhzdHJ1Y3QgYW1kZ3B1X2NzX3Bh cnNlciAqcCwKIAkJbGlzdF9zcGxpY2UoJm5lZWRfcGFnZXMsICZwLT52YWxpZGF0ZWQpOwogCX0K IAotCXAtPmJ5dGVzX21vdmVkX3RocmVzaG9sZCA9IGFtZGdwdV9jc19nZXRfdGhyZXNob2xkX2Zv cl9tb3ZlcyhwLT5hZGV2KTsKKwlhbWRncHVfY3NfZ2V0X3RocmVzaG9sZF9mb3JfbW92ZXMocC0+ YWRldiwgJnAtPmJ5dGVzX21vdmVkX3RocmVzaG9sZCwKKwkJCQkJICAmcC0+Ynl0ZXNfbW92ZWRf dmlzX3RocmVzaG9sZCk7CiAJcC0+Ynl0ZXNfbW92ZWQgPSAwOworCXAtPmJ5dGVzX21vdmVkX3Zp cyA9IDA7CiAJcC0+ZXZpY3RhYmxlID0gbGlzdF9sYXN0X2VudHJ5KCZwLT52YWxpZGF0ZWQsCiAJ CQkJICAgICAgIHN0cnVjdCBhbWRncHVfYm9fbGlzdF9lbnRyeSwKIAkJCQkgICAgICAgdHYuaGVh ZCk7CkBAIC01ODUsOCArNjI1LDggQEAgc3RhdGljIGludCBhbWRncHVfY3NfcGFyc2VyX2Jvcyhz dHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAqcCwKIAkJZ290byBlcnJvcl92YWxpZGF0ZTsKIAl9CiAK LQlhbWRncHVfY3NfcmVwb3J0X21vdmVkX2J5dGVzKHAtPmFkZXYsIHAtPmJ5dGVzX21vdmVkKTsK LQorCWFtZGdwdV9jc19yZXBvcnRfbW92ZWRfYnl0ZXMocC0+YWRldiwgcC0+Ynl0ZXNfbW92ZWQs CisJCQkJICAgICBwLT5ieXRlc19tb3ZlZF92aXMpOwogCWZwcml2LT52bS5sYXN0X2V2aWN0aW9u X2NvdW50ZXIgPQogCQlhdG9taWM2NF9yZWFkKCZwLT5hZGV2LT5udW1fZXZpY3Rpb25zKTsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5jCmluZGV4IGE3ZDQ4YTcu LjI3ZDhjNzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9v YmplY3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmMK QEAgLTM0MSw3ICszNDEsNyBAQCBpbnQgYW1kZ3B1X2JvX2NyZWF0ZV9yZXN0cmljdGVkKHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2LAogCXN0cnVjdCBhbWRncHVfYm8gKmJvOwogCWVudW0gdHRt X2JvX3R5cGUgdHlwZTsKIAl1bnNpZ25lZCBsb25nIHBhZ2VfYWxpZ247Ci0JdTY0IGluaXRpYWxf Ynl0ZXNfbW92ZWQ7CisJdTY0IGluaXRpYWxfYnl0ZXNfbW92ZWQsIGJ5dGVzX21vdmVkOwogCXNp emVfdCBhY2Nfc2l6ZTsKIAlpbnQgcjsKIApAQCAtNDE3LDggKzQxNywxMiBAQCBpbnQgYW1kZ3B1 X2JvX2NyZWF0ZV9yZXN0cmljdGVkKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCXIgPSB0 dG1fYm9faW5pdF9yZXNlcnZlZCgmYWRldi0+bW1hbi5iZGV2LCAmYm8tPnRibywgc2l6ZSwgdHlw ZSwKIAkJCQkgJmJvLT5wbGFjZW1lbnQsIHBhZ2VfYWxpZ24sICFrZXJuZWwsIE5VTEwsCiAJCQkJ IGFjY19zaXplLCBzZywgcmVzdiwgJmFtZGdwdV90dG1fYm9fZGVzdHJveSk7Ci0JYW1kZ3B1X2Nz X3JlcG9ydF9tb3ZlZF9ieXRlcyhhZGV2LAotCQlhdG9taWM2NF9yZWFkKCZhZGV2LT5udW1fYnl0 ZXNfbW92ZWQpIC0gaW5pdGlhbF9ieXRlc19tb3ZlZCk7CisJYnl0ZXNfbW92ZWQgPSBhdG9taWM2 NF9yZWFkKCZhZGV2LT5udW1fYnl0ZXNfbW92ZWQpIC0KKwkJaW5pdGlhbF9ieXRlc19tb3ZlZDsK KwlpZiAoYm8tPmZsYWdzICYgQU1ER1BVX0dFTV9DUkVBVEVfQ1BVX0FDQ0VTU19SRVFVSVJFRCkK KwkJYW1kZ3B1X2NzX3JlcG9ydF9tb3ZlZF9ieXRlcyhhZGV2LCBieXRlc19tb3ZlZCwgYnl0ZXNf bW92ZWQpOworCWVsc2UKKwkJYW1kZ3B1X2NzX3JlcG9ydF9tb3ZlZF9ieXRlcyhhZGV2LCBieXRl c19tb3ZlZCwgMCk7CiAKIAlpZiAodW5saWtlbHkociAhPSAwKSkKIAkJcmV0dXJuIHI7Ci0tIAoy LjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1k LWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==