From: Subject: [PATCH 32/35] drm/amd/display: Make stream commits call into DC only once Date: Wed, 13 Feb 2019 15:05:48 -0500 Message-ID: <1550088351-19449-33-git-send-email-sunpeng.li@amd.com> References: <1550088351-19449-1-git-send-email-sunpeng.li@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1550088351-19449-1-git-send-email-sunpeng.li-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: David Francis RnJvbTogRGF2aWQgRnJhbmNpcyA8RGF2aWQuRnJhbmNpc0BhbWQuY29tPgoKW1doeV0KZGNfY29t bWl0X3VwZGF0ZXNfZm9yX3N0cmVhbSBpcyBjYWxsZWQgdHdpY2UgcGVyIHN0cmVhbTogb25jZQp3 aXRoIHRoZSBmbGlwIGRhdGEgYW5kIG9uY2Ugd2lsbCBhbGwgb3RoZXIgZGF0YS4gVGhpcyBjYXVz ZXMKcHJvYmxlbXMgd2hlbiB0aGVzZSBEQyBjYWxscyBoYXZlIGRpZmZlcmVudCBudW1iZXJzIG9m IHBsYW5lcwoKRm9yIGV4YW1wbGUsIGEgY29tbWl0IHdpdGggYSBwYWdlZmxpcCBvbiBwbGFuZSBB IGFuZCBhCm5vbi1wYWdlZmxpcCBjaGFuZ2Ugb24gcGxhbmUgQiB3aWxsIGZpcnN0IGNhbGwKaW50 byBEQyB3aXRoIGp1c3QgcGxhbmUgQSwgY2F1c2luZyBwbGFuZSBCIHRvIGJlCmRpc2FibGVkLiBU aGVuIGl0IHdpbGwgY2FsbCBpbnRvIERDIHdpdGggYm90aCBwbGFuZXMsCnJlLWVuYWJsaW5nIHBs YW5lIEIKCltIb3ddCk1lcmdlIGZsaXAgYW5kIGZ1bGwgaW50byBhIHNpbmdsZSBidW5kbGUKCkFw YXJ0IGZyb20gdGhlIHNpbmdsZSBEQyBjYWxsLCB0aGUgbG9naWMgc2hvdWxkIG5vdCBiZQpjaGFu Z2VkIGJ5IHRoaXMgcGF0Y2gKClNpZ25lZC1vZmYtYnk6IERhdmlkIEZyYW5jaXMgPERhdmlkLkZy YW5jaXNAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IE5pY2hvbGFzIEthemxhdXNrYXMgPE5pY2hvbGFz LkthemxhdXNrYXNAYW1kLmNvbT4KQWNrZWQtYnk6IExlbyBMaSA8c3VucGVuZy5saUBhbWQuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMg fCAxMjkgKysrKysrKysrLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDU0IGluc2VydGlv bnMoKyksIDc1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCmluZGV4IGZjMzljZDAuLjdmZmE1ODcgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYwpAQCAt NDczMSwzMCArNDczMSwyNSBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fY29tbWl0X3BsYW5lcyhz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJc3RydWN0IGRtX2NydGNfc3RhdGUgKmFj cnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShuZXdfcGNydGNfc3RhdGUpOwogCXN0cnVjdCBk bV9jcnRjX3N0YXRlICpkbV9vbGRfY3J0Y19zdGF0ZSA9CiAJCQl0b19kbV9jcnRjX3N0YXRlKGRy bV9hdG9taWNfZ2V0X29sZF9jcnRjX3N0YXRlKHN0YXRlLCBwY3J0YykpOwotCWludCBmbGlwX2Nv dW50ID0gMCwgcGxhbmVzX2NvdW50ID0gMCwgdnBvcywgaHBvczsKKwlpbnQgcGxhbmVzX2NvdW50 ID0gMCwgdnBvcywgaHBvczsKIAl1bnNpZ25lZCBsb25nIGZsYWdzOwogCXN0cnVjdCBhbWRncHVf Ym8gKmFibzsKIAl1aW50NjRfdCB0aWxpbmdfZmxhZ3MsIGRjY19hZGRyZXNzOwogCXVpbnQzMl90 IHRhcmdldCwgdGFyZ2V0X3ZibGFuazsKLQotCXN0cnVjdCB7Ci0JCXN0cnVjdCBkY19zdXJmYWNl X3VwZGF0ZSBzdXJmYWNlX3VwZGF0ZXNbTUFYX1NVUkZBQ0VTXTsKLQkJc3RydWN0IGRjX2ZsaXBf YWRkcnMgZmxpcF9hZGRyc1tNQVhfU1VSRkFDRVNdOwotCQlzdHJ1Y3QgZGNfc3RyZWFtX3VwZGF0 ZSBzdHJlYW1fdXBkYXRlOwotCX0gKmZsaXA7CisJYm9vbCBwZmxpcF9wcmVzZW50ID0gZmFsc2U7 CiAKIAlzdHJ1Y3QgewogCQlzdHJ1Y3QgZGNfc3VyZmFjZV91cGRhdGUgc3VyZmFjZV91cGRhdGVz W01BWF9TVVJGQUNFU107CiAJCXN0cnVjdCBkY19wbGFuZV9pbmZvIHBsYW5lX2luZm9zW01BWF9T VVJGQUNFU107CiAJCXN0cnVjdCBkY19zY2FsaW5nX2luZm8gc2NhbGluZ19pbmZvc1tNQVhfU1VS RkFDRVNdOworCQlzdHJ1Y3QgZGNfZmxpcF9hZGRycyBmbGlwX2FkZHJzW01BWF9TVVJGQUNFU107 CiAJCXN0cnVjdCBkY19zdHJlYW1fdXBkYXRlIHN0cmVhbV91cGRhdGU7Ci0JfSAqZnVsbDsKKwl9 ICpidW5kbGU7CiAKLQlmbGlwID0ga3phbGxvYyhzaXplb2YoKmZsaXApLCBHRlBfS0VSTkVMKTsK LQlmdWxsID0ga3phbGxvYyhzaXplb2YoKmZ1bGwpLCBHRlBfS0VSTkVMKTsKKwlidW5kbGUgPSBr emFsbG9jKHNpemVvZigqYnVuZGxlKSwgR0ZQX0tFUk5FTCk7CiAKLQlpZiAoIWZsaXAgfHwgIWZ1 bGwpIHsKLQkJZG1fZXJyb3IoIkZhaWxlZCB0byBhbGxvY2F0ZSB1cGRhdGUgYnVuZGxlc1xuIik7 CisJaWYgKCFidW5kbGUpIHsKKwkJZG1fZXJyb3IoIkZhaWxlZCB0byBhbGxvY2F0ZSB1cGRhdGUg YnVuZGxlXG4iKTsKIAkJZ290byBjbGVhbnVwOwogCX0KIApAQCAtNDc2NCw3ICs0NzU5LDcgQEAg c3RhdGljIHZvaWQgYW1kZ3B1X2RtX2NvbW1pdF9wbGFuZXMoc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlLAogCQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlOwogCQlz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IG5ld19wbGFuZV9zdGF0ZS0+ZmI7CiAJCXN0cnVj dCBhbWRncHVfZnJhbWVidWZmZXIgKmFmYiA9IHRvX2FtZGdwdV9mcmFtZWJ1ZmZlcihmYik7Ci0J CWJvb2wgcGZsaXBfbmVlZGVkOworCQlib29sIGZyYW1lYnVmZmVyX2NoYW5nZWQ7CiAJCXN0cnVj dCBkY19wbGFuZV9zdGF0ZSAqZGNfcGxhbmU7CiAJCXN0cnVjdCBkbV9wbGFuZV9zdGF0ZSAqZG1f bmV3X3BsYW5lX3N0YXRlID0gdG9fZG1fcGxhbmVfc3RhdGUobmV3X3BsYW5lX3N0YXRlKTsKIApA QCAtNDc3OSwxMiArNDc3NCwxNCBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fY29tbWl0X3BsYW5l cyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCWlmICghbmV3X2NydGNfc3RhdGUt PmFjdGl2ZSkKIAkJCWNvbnRpbnVlOwogCi0JCXBmbGlwX25lZWRlZCA9IG9sZF9wbGFuZV9zdGF0 ZS0+ZmIgJiYKKwkJZGNfcGxhbmUgPSBkbV9uZXdfcGxhbmVfc3RhdGUtPmRjX3N0YXRlOworCisJ CWZyYW1lYnVmZmVyX2NoYW5nZWQgPSBvbGRfcGxhbmVfc3RhdGUtPmZiICYmCiAJCQlvbGRfcGxh bmVfc3RhdGUtPmZiICE9IG5ld19wbGFuZV9zdGF0ZS0+ZmI7CiAKLQkJZGNfcGxhbmUgPSBkbV9u ZXdfcGxhbmVfc3RhdGUtPmRjX3N0YXRlOworCQlwZmxpcF9wcmVzZW50ID0gcGZsaXBfcHJlc2Vu dCB8fCBmcmFtZWJ1ZmZlcl9jaGFuZ2VkOwogCi0JCWlmIChwZmxpcF9uZWVkZWQpIHsKKwkJaWYg KGZyYW1lYnVmZmVyX2NoYW5nZWQpIHsKIAkJCS8qCiAJCQkgKiBUT0RPIFRoaXMgbWlnaHQgZmFp bCBhbmQgaGVuY2UgYmV0dGVyIG5vdCB1c2VkLCB3YWl0CiAJCQkgKiBleHBsaWNpdGx5IG9uIGZl bmNlcyBpbnN0ZWFkCkBAIC00ODA2LDIyICs0ODAzLDIyIEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9k bV9jb21taXRfcGxhbmVzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAogCQkJYW1k Z3B1X2JvX3VucmVzZXJ2ZShhYm8pOwogCi0JCQlmbGlwLT5mbGlwX2FkZHJzW2ZsaXBfY291bnRd LmFkZHJlc3MuZ3JwaC5hZGRyLmxvd19wYXJ0ID0gbG93ZXJfMzJfYml0cyhhZmItPmFkZHJlc3Mp OwotCQkJZmxpcC0+ZmxpcF9hZGRyc1tmbGlwX2NvdW50XS5hZGRyZXNzLmdycGguYWRkci5oaWdo X3BhcnQgPSB1cHBlcl8zMl9iaXRzKGFmYi0+YWRkcmVzcyk7CisJCQlidW5kbGUtPmZsaXBfYWRk cnNbcGxhbmVzX2NvdW50XS5hZGRyZXNzLmdycGguYWRkci5sb3dfcGFydCA9IGxvd2VyXzMyX2Jp dHMoYWZiLT5hZGRyZXNzKTsKKwkJCWJ1bmRsZS0+ZmxpcF9hZGRyc1twbGFuZXNfY291bnRdLmFk ZHJlc3MuZ3JwaC5hZGRyLmhpZ2hfcGFydCA9IHVwcGVyXzMyX2JpdHMoYWZiLT5hZGRyZXNzKTsK IAogCQkJZGNjX2FkZHJlc3MgPSBnZXRfZGNjX2FkZHJlc3MoYWZiLT5hZGRyZXNzLCB0aWxpbmdf ZmxhZ3MpOwotCQkJZmxpcC0+ZmxpcF9hZGRyc1tmbGlwX2NvdW50XS5hZGRyZXNzLmdycGgubWV0 YV9hZGRyLmxvd19wYXJ0ID0gbG93ZXJfMzJfYml0cyhkY2NfYWRkcmVzcyk7Ci0JCQlmbGlwLT5m bGlwX2FkZHJzW2ZsaXBfY291bnRdLmFkZHJlc3MuZ3JwaC5tZXRhX2FkZHIuaGlnaF9wYXJ0ID0g dXBwZXJfMzJfYml0cyhkY2NfYWRkcmVzcyk7CisJCQlidW5kbGUtPmZsaXBfYWRkcnNbcGxhbmVz X2NvdW50XS5hZGRyZXNzLmdycGgubWV0YV9hZGRyLmxvd19wYXJ0ID0gbG93ZXJfMzJfYml0cyhk Y2NfYWRkcmVzcyk7CisJCQlidW5kbGUtPmZsaXBfYWRkcnNbcGxhbmVzX2NvdW50XS5hZGRyZXNz LmdycGgubWV0YV9hZGRyLmhpZ2hfcGFydCA9IHVwcGVyXzMyX2JpdHMoZGNjX2FkZHJlc3MpOwog Ci0JCQlmbGlwLT5mbGlwX2FkZHJzW2ZsaXBfY291bnRdLmZsaXBfaW1tZWRpYXRlID0KKwkJCWJ1 bmRsZS0+ZmxpcF9hZGRyc1twbGFuZXNfY291bnRdLmZsaXBfaW1tZWRpYXRlID0KIAkJCQkJKGNy dGMtPnN0YXRlLT5wYWdlZmxpcF9mbGFncyAmIERSTV9NT0RFX1BBR0VfRkxJUF9BU1lOQykgIT0g MDsKIAogCQkJdGltZXN0YW1wX25zID0ga3RpbWVfZ2V0X25zKCk7Ci0JCQlmbGlwLT5mbGlwX2Fk ZHJzW2ZsaXBfY291bnRdLmZsaXBfdGltZXN0YW1wX2luX3VzID0gZGl2X3U2NCh0aW1lc3RhbXBf bnMsIDEwMDApOwotCQkJZmxpcC0+c3VyZmFjZV91cGRhdGVzW2ZsaXBfY291bnRdLmZsaXBfYWRk ciA9ICZmbGlwLT5mbGlwX2FkZHJzW2ZsaXBfY291bnRdOwotCQkJZmxpcC0+c3VyZmFjZV91cGRh dGVzW2ZsaXBfY291bnRdLnN1cmZhY2UgPSBkY19wbGFuZTsKKwkJCWJ1bmRsZS0+ZmxpcF9hZGRy c1twbGFuZXNfY291bnRdLmZsaXBfdGltZXN0YW1wX2luX3VzID0gZGl2X3U2NCh0aW1lc3RhbXBf bnMsIDEwMDApOworCQkJYnVuZGxlLT5zdXJmYWNlX3VwZGF0ZXNbcGxhbmVzX2NvdW50XS5mbGlw X2FkZHIgPSAmYnVuZGxlLT5mbGlwX2FkZHJzW3BsYW5lc19jb3VudF07CisJCQlidW5kbGUtPnN1 cmZhY2VfdXBkYXRlc1twbGFuZXNfY291bnRdLnN1cmZhY2UgPSBkY19wbGFuZTsKIAotCQkJaWYg KCFmbGlwLT5zdXJmYWNlX3VwZGF0ZXNbZmxpcF9jb3VudF0uc3VyZmFjZSkgeworCQkJaWYgKCFi dW5kbGUtPnN1cmZhY2VfdXBkYXRlc1twbGFuZXNfY291bnRdLnN1cmZhY2UpIHsKIAkJCQlEUk1f RVJST1IoIk5vIHN1cmZhY2UgZm9yIENSVEM6IGlkPSVkXG4iLAogCQkJCQkJYWNydGNfYXR0YWNo LT5jcnRjX2lkKTsKIAkJCQljb250aW51ZTsKQEAgLTQ4MzMsNTMgKzQ4MzAsNDUgQEAgc3RhdGlj IHZvaWQgYW1kZ3B1X2RtX2NvbW1pdF9wbGFuZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlLAogCQkJCQlhY3J0Y19zdGF0ZSwKIAkJCQkJYWNydGNfc3RhdGUtPnN0cmVhbSwKIAkJCQkJ ZGNfcGxhbmUsCi0JCQkJCWZsaXAtPmZsaXBfYWRkcnNbZmxpcF9jb3VudF0uZmxpcF90aW1lc3Rh bXBfaW5fdXMpOworCQkJCQlidW5kbGUtPmZsaXBfYWRkcnNbcGxhbmVzX2NvdW50XS5mbGlwX3Rp bWVzdGFtcF9pbl91cyk7CiAKIAkJCURSTV9ERUJVR19EUklWRVIoIiVzIEZsaXBwaW5nIHRvIGhp OiAweCV4LCBsb3c6IDB4JXhcbiIsCiAJCQkJCSBfX2Z1bmNfXywKLQkJCQkJIGZsaXAtPmZsaXBf YWRkcnNbZmxpcF9jb3VudF0uYWRkcmVzcy5ncnBoLmFkZHIuaGlnaF9wYXJ0LAotCQkJCQkgZmxp cC0+ZmxpcF9hZGRyc1tmbGlwX2NvdW50XS5hZGRyZXNzLmdycGguYWRkci5sb3dfcGFydCk7Ci0K LQkJCWZsaXBfY291bnQgKz0gMTsKKwkJCQkJIGJ1bmRsZS0+ZmxpcF9hZGRyc1twbGFuZXNfY291 bnRdLmFkZHJlc3MuZ3JwaC5hZGRyLmhpZ2hfcGFydCwKKwkJCQkJIGJ1bmRsZS0+ZmxpcF9hZGRy c1twbGFuZXNfY291bnRdLmFkZHJlc3MuZ3JwaC5hZGRyLmxvd19wYXJ0KTsKIAkJfQogCi0JCWZ1 bGwtPnN1cmZhY2VfdXBkYXRlc1twbGFuZXNfY291bnRdLnN1cmZhY2UgPSBkY19wbGFuZTsKKwkJ YnVuZGxlLT5zdXJmYWNlX3VwZGF0ZXNbcGxhbmVzX2NvdW50XS5zdXJmYWNlID0gZGNfcGxhbmU7 CiAJCWlmIChuZXdfcGNydGNfc3RhdGUtPmNvbG9yX21nbXRfY2hhbmdlZCkgewotCQkJZnVsbC0+ c3VyZmFjZV91cGRhdGVzW3BsYW5lc19jb3VudF0uZ2FtbWEgPSBkY19wbGFuZS0+Z2FtbWFfY29y cmVjdGlvbjsKLQkJCWZ1bGwtPnN1cmZhY2VfdXBkYXRlc1twbGFuZXNfY291bnRdLmluX3RyYW5z ZmVyX2Z1bmMgPSBkY19wbGFuZS0+aW5fdHJhbnNmZXJfZnVuYzsKKwkJCWJ1bmRsZS0+c3VyZmFj ZV91cGRhdGVzW3BsYW5lc19jb3VudF0uZ2FtbWEgPSBkY19wbGFuZS0+Z2FtbWFfY29ycmVjdGlv bjsKKwkJCWJ1bmRsZS0+c3VyZmFjZV91cGRhdGVzW3BsYW5lc19jb3VudF0uaW5fdHJhbnNmZXJf ZnVuYyA9IGRjX3BsYW5lLT5pbl90cmFuc2Zlcl9mdW5jOwogCQl9CiAKIAotCQlmdWxsLT5zY2Fs aW5nX2luZm9zW3BsYW5lc19jb3VudF0uc2NhbGluZ19xdWFsaXR5ID0gZGNfcGxhbmUtPnNjYWxp bmdfcXVhbGl0eTsKLQkJZnVsbC0+c2NhbGluZ19pbmZvc1twbGFuZXNfY291bnRdLnNyY19yZWN0 ID0gZGNfcGxhbmUtPnNyY19yZWN0OwotCQlmdWxsLT5zY2FsaW5nX2luZm9zW3BsYW5lc19jb3Vu dF0uZHN0X3JlY3QgPSBkY19wbGFuZS0+ZHN0X3JlY3Q7Ci0JCWZ1bGwtPnNjYWxpbmdfaW5mb3Nb cGxhbmVzX2NvdW50XS5jbGlwX3JlY3QgPSBkY19wbGFuZS0+Y2xpcF9yZWN0OwotCQlmdWxsLT5z dXJmYWNlX3VwZGF0ZXNbcGxhbmVzX2NvdW50XS5zY2FsaW5nX2luZm8gPSAmZnVsbC0+c2NhbGlu Z19pbmZvc1twbGFuZXNfY291bnRdOworCQlidW5kbGUtPnNjYWxpbmdfaW5mb3NbcGxhbmVzX2Nv dW50XS5zY2FsaW5nX3F1YWxpdHkgPSBkY19wbGFuZS0+c2NhbGluZ19xdWFsaXR5OworCQlidW5k bGUtPnNjYWxpbmdfaW5mb3NbcGxhbmVzX2NvdW50XS5zcmNfcmVjdCA9IGRjX3BsYW5lLT5zcmNf cmVjdDsKKwkJYnVuZGxlLT5zY2FsaW5nX2luZm9zW3BsYW5lc19jb3VudF0uZHN0X3JlY3QgPSBk Y19wbGFuZS0+ZHN0X3JlY3Q7CisJCWJ1bmRsZS0+c2NhbGluZ19pbmZvc1twbGFuZXNfY291bnRd LmNsaXBfcmVjdCA9IGRjX3BsYW5lLT5jbGlwX3JlY3Q7CisJCWJ1bmRsZS0+c3VyZmFjZV91cGRh dGVzW3BsYW5lc19jb3VudF0uc2NhbGluZ19pbmZvID0gJmJ1bmRsZS0+c2NhbGluZ19pbmZvc1tw bGFuZXNfY291bnRdOwogCiAKLQkJZnVsbC0+cGxhbmVfaW5mb3NbcGxhbmVzX2NvdW50XS5jb2xv cl9zcGFjZSA9IGRjX3BsYW5lLT5jb2xvcl9zcGFjZTsKLQkJZnVsbC0+cGxhbmVfaW5mb3NbcGxh bmVzX2NvdW50XS5mb3JtYXQgPSBkY19wbGFuZS0+Zm9ybWF0OwotCQlmdWxsLT5wbGFuZV9pbmZv c1twbGFuZXNfY291bnRdLnBsYW5lX3NpemUgPSBkY19wbGFuZS0+cGxhbmVfc2l6ZTsKLQkJZnVs bC0+cGxhbmVfaW5mb3NbcGxhbmVzX2NvdW50XS5yb3RhdGlvbiA9IGRjX3BsYW5lLT5yb3RhdGlv bjsKLQkJZnVsbC0+cGxhbmVfaW5mb3NbcGxhbmVzX2NvdW50XS5ob3Jpem9udGFsX21pcnJvciA9 IGRjX3BsYW5lLT5ob3Jpem9udGFsX21pcnJvcjsKLQkJZnVsbC0+cGxhbmVfaW5mb3NbcGxhbmVz X2NvdW50XS5zdGVyZW9fZm9ybWF0ID0gZGNfcGxhbmUtPnN0ZXJlb19mb3JtYXQ7Ci0JCWZ1bGwt PnBsYW5lX2luZm9zW3BsYW5lc19jb3VudF0udGlsaW5nX2luZm8gPSBkY19wbGFuZS0+dGlsaW5n X2luZm87Ci0JCWZ1bGwtPnBsYW5lX2luZm9zW3BsYW5lc19jb3VudF0udmlzaWJsZSA9IGRjX3Bs YW5lLT52aXNpYmxlOwotCQlmdWxsLT5wbGFuZV9pbmZvc1twbGFuZXNfY291bnRdLnBlcl9waXhl bF9hbHBoYSA9IGRjX3BsYW5lLT5wZXJfcGl4ZWxfYWxwaGE7Ci0JCWZ1bGwtPnBsYW5lX2luZm9z W3BsYW5lc19jb3VudF0uZGNjID0gZGNfcGxhbmUtPmRjYzsKLQkJZnVsbC0+c3VyZmFjZV91cGRh dGVzW3BsYW5lc19jb3VudF0ucGxhbmVfaW5mbyA9ICZmdWxsLT5wbGFuZV9pbmZvc1twbGFuZXNf Y291bnRdOworCQlidW5kbGUtPnBsYW5lX2luZm9zW3BsYW5lc19jb3VudF0uY29sb3Jfc3BhY2Ug PSBkY19wbGFuZS0+Y29sb3Jfc3BhY2U7CisJCWJ1bmRsZS0+cGxhbmVfaW5mb3NbcGxhbmVzX2Nv dW50XS5mb3JtYXQgPSBkY19wbGFuZS0+Zm9ybWF0OworCQlidW5kbGUtPnBsYW5lX2luZm9zW3Bs YW5lc19jb3VudF0ucGxhbmVfc2l6ZSA9IGRjX3BsYW5lLT5wbGFuZV9zaXplOworCQlidW5kbGUt PnBsYW5lX2luZm9zW3BsYW5lc19jb3VudF0ucm90YXRpb24gPSBkY19wbGFuZS0+cm90YXRpb247 CisJCWJ1bmRsZS0+cGxhbmVfaW5mb3NbcGxhbmVzX2NvdW50XS5ob3Jpem9udGFsX21pcnJvciA9 IGRjX3BsYW5lLT5ob3Jpem9udGFsX21pcnJvcjsKKwkJYnVuZGxlLT5wbGFuZV9pbmZvc1twbGFu ZXNfY291bnRdLnN0ZXJlb19mb3JtYXQgPSBkY19wbGFuZS0+c3RlcmVvX2Zvcm1hdDsKKwkJYnVu ZGxlLT5wbGFuZV9pbmZvc1twbGFuZXNfY291bnRdLnRpbGluZ19pbmZvID0gZGNfcGxhbmUtPnRp bGluZ19pbmZvOworCQlidW5kbGUtPnBsYW5lX2luZm9zW3BsYW5lc19jb3VudF0udmlzaWJsZSA9 IGRjX3BsYW5lLT52aXNpYmxlOworCQlidW5kbGUtPnBsYW5lX2luZm9zW3BsYW5lc19jb3VudF0u cGVyX3BpeGVsX2FscGhhID0gZGNfcGxhbmUtPnBlcl9waXhlbF9hbHBoYTsKKwkJYnVuZGxlLT5w bGFuZV9pbmZvc1twbGFuZXNfY291bnRdLmRjYyA9IGRjX3BsYW5lLT5kY2M7CisJCWJ1bmRsZS0+ c3VyZmFjZV91cGRhdGVzW3BsYW5lc19jb3VudF0ucGxhbmVfaW5mbyA9ICZidW5kbGUtPnBsYW5l X2luZm9zW3BsYW5lc19jb3VudF07CiAKIAkJcGxhbmVzX2NvdW50ICs9IDE7CiAKIAl9CiAKLQkv KgotCSAqIFRPRE86IEZvciBwcm9wZXIgYXRvbWljIGJlaGF2aW91ciwgd2Ugc2hvdWxkIGJlIGNh bGxpbmcgaW50byBEQyBvbmNlIHdpdGgKLQkgKiBhbGwgdGhlIGNoYW5nZXMuICBIb3dldmVyLCBE QyByZWZ1c2VzIHRvIGRvIHBhZ2VmbGlwcyBhbmQgbm9uLXBhZ2VmbGlwCi0JICogY2hhbmdlcyBp biB0aGUgc2FtZSBjYWxsLiAgQ2hhbmdlIERDIHRvIHJlc3BlY3QgYXRvbWljIGJlaGF2aW91ciwK LQkgKiBob3BlZnVsbHkgZWxpbWluYXRpbmcgZGNfKl91cGRhdGUgc3RydWN0cyBpbiB0aGVpciBl bnRpcmV0eS4KLQkgKi8KLQlpZiAoZmxpcF9jb3VudCkgeworCWlmIChwZmxpcF9wcmVzZW50KSB7 CiAJCXRhcmdldCA9ICh1aW50MzJfdClkcm1fY3J0Y192YmxhbmtfY291bnQocGNydGMpICsgd2Fp dF9mb3JfdmJsYW5rOwogCQkvKiBQcmVwYXJlIHdhaXQgZm9yIHRhcmdldCB2YmxhbmsgZWFybHkg LSBiZWZvcmUgdGhlIGZlbmNlLXdhaXRzICovCiAJCXRhcmdldF92YmxhbmsgPSB0YXJnZXQgLSAo dWludDMyX3QpZHJtX2NydGNfdmJsYW5rX2NvdW50KHBjcnRjKSArCkBAIC00OTE0LDQzICs0OTAz LDM0IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9kbV9jb21taXRfcGxhbmVzKHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpzdGF0ZSwKIAkJaWYgKGFjcnRjX3N0YXRlLT5zdHJlYW0pIHsKIAogCQkJaWYg KGFjcnRjX3N0YXRlLT5mcmVlc3luY190aW1pbmdfY2hhbmdlZCkKLQkJCQlmbGlwLT5zdHJlYW1f dXBkYXRlLmFkanVzdCA9CisJCQkJYnVuZGxlLT5zdHJlYW1fdXBkYXRlLmFkanVzdCA9CiAJCQkJ CSZhY3J0Y19zdGF0ZS0+c3RyZWFtLT5hZGp1c3Q7CiAKIAkJCWlmIChhY3J0Y19zdGF0ZS0+ZnJl ZXN5bmNfdnJyX2luZm9fY2hhbmdlZCkKLQkJCQlmbGlwLT5zdHJlYW1fdXBkYXRlLnZycl9pbmZv cGFja2V0ID0KKwkJCQlidW5kbGUtPnN0cmVhbV91cGRhdGUudnJyX2luZm9wYWNrZXQgPQogCQkJ CQkmYWNydGNfc3RhdGUtPnN0cmVhbS0+dnJyX2luZm9wYWNrZXQ7CiAJCX0KLQotCQltdXRleF9s b2NrKCZkbS0+ZGNfbG9jayk7Ci0JCWRjX2NvbW1pdF91cGRhdGVzX2Zvcl9zdHJlYW0oZG0tPmRj LAotCQkJCQkJICAgICBmbGlwLT5zdXJmYWNlX3VwZGF0ZXMsCi0JCQkJCQkgICAgIGZsaXBfY291 bnQsCi0JCQkJCQkgICAgIGFjcnRjX3N0YXRlLT5zdHJlYW0sCi0JCQkJCQkgICAgICZmbGlwLT5z dHJlYW1fdXBkYXRlLAotCQkJCQkJICAgICBkY19zdGF0ZSk7Ci0JCW11dGV4X3VubG9jaygmZG0t PmRjX2xvY2spOwogCX0KIAogCWlmIChwbGFuZXNfY291bnQpIHsKIAkJaWYgKG5ld19wY3J0Y19z dGF0ZS0+bW9kZV9jaGFuZ2VkKSB7Ci0JCQlmdWxsLT5zdHJlYW1fdXBkYXRlLnNyYyA9IGFjcnRj X3N0YXRlLT5zdHJlYW0tPnNyYzsKLQkJCWZ1bGwtPnN0cmVhbV91cGRhdGUuZHN0ID0gYWNydGNf c3RhdGUtPnN0cmVhbS0+ZHN0OworCQkJYnVuZGxlLT5zdHJlYW1fdXBkYXRlLnNyYyA9IGFjcnRj X3N0YXRlLT5zdHJlYW0tPnNyYzsKKwkJCWJ1bmRsZS0+c3RyZWFtX3VwZGF0ZS5kc3QgPSBhY3J0 Y19zdGF0ZS0+c3RyZWFtLT5kc3Q7CiAJCX0KIAogCQlpZiAobmV3X3BjcnRjX3N0YXRlLT5jb2xv cl9tZ210X2NoYW5nZWQpCi0JCQlmdWxsLT5zdHJlYW1fdXBkYXRlLm91dF90cmFuc2Zlcl9mdW5j ID0gYWNydGNfc3RhdGUtPnN0cmVhbS0+b3V0X3RyYW5zZmVyX2Z1bmM7CisJCQlidW5kbGUtPnN0 cmVhbV91cGRhdGUub3V0X3RyYW5zZmVyX2Z1bmMgPSBhY3J0Y19zdGF0ZS0+c3RyZWFtLT5vdXRf dHJhbnNmZXJfZnVuYzsKIAogCQlhY3J0Y19zdGF0ZS0+c3RyZWFtLT5hYm1fbGV2ZWwgPSBhY3J0 Y19zdGF0ZS0+YWJtX2xldmVsOwogCQlpZiAoYWNydGNfc3RhdGUtPmFibV9sZXZlbCAhPSBkbV9v bGRfY3J0Y19zdGF0ZS0+YWJtX2xldmVsKQotCQkJZnVsbC0+c3RyZWFtX3VwZGF0ZS5hYm1fbGV2 ZWwgPSAmYWNydGNfc3RhdGUtPmFibV9sZXZlbDsKKwkJCWJ1bmRsZS0+c3RyZWFtX3VwZGF0ZS5h Ym1fbGV2ZWwgPSAmYWNydGNfc3RhdGUtPmFibV9sZXZlbDsKIAogCQltdXRleF9sb2NrKCZkbS0+ ZGNfbG9jayk7CiAJCWRjX2NvbW1pdF91cGRhdGVzX2Zvcl9zdHJlYW0oZG0tPmRjLAotCQkJCQkJ ICAgICBmdWxsLT5zdXJmYWNlX3VwZGF0ZXMsCisJCQkJCQkgICAgIGJ1bmRsZS0+c3VyZmFjZV91 cGRhdGVzLAogCQkJCQkJICAgICBwbGFuZXNfY291bnQsCiAJCQkJCQkgICAgIGFjcnRjX3N0YXRl LT5zdHJlYW0sCi0JCQkJCQkgICAgICZmdWxsLT5zdHJlYW1fdXBkYXRlLAorCQkJCQkJICAgICAm YnVuZGxlLT5zdHJlYW1fdXBkYXRlLAogCQkJCQkJICAgICBkY19zdGF0ZSk7CiAJCW11dGV4X3Vu bG9jaygmZG0tPmRjX2xvY2spOwogCX0KQEAgLTQ5NjAsOCArNDk0MCw3IEBAIHN0YXRpYyB2b2lk IGFtZGdwdV9kbV9jb21taXRfcGxhbmVzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwK IAkJCWhhbmRsZV9jdXJzb3JfdXBkYXRlKHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUpOwogCiBjbGVh bnVwOgotCWtmcmVlKGZsaXApOwotCWtmcmVlKGZ1bGwpOworCWtmcmVlKGJ1bmRsZSk7CiB9CiAK IC8qCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4