From: Matt Roper Subject: [PATCH 1/4] drm/i915: Make atomic use in-flight state for CRTC active value Date: Wed, 8 Apr 2015 18:56:51 -0700 Message-ID: <1428544614-28082-2-git-send-email-matthew.d.roper@intel.com> References: <1428544614-28082-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DC956E2AB for ; Wed, 8 Apr 2015 18:57:22 -0700 (PDT) In-Reply-To: <1428544614-28082-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T3VyIGF0b21pYyBwbGFuZSBjb2RlIGN1cnJlbnRseSB1c2VzIGludGVsX2NydGMtPmFjdGl2ZSB0 byBkZXRlcm1pbmUKaG93L3doZW4gdG8gdXBkYXRlIHNvbWUgZGVyaXZlZCBzdGF0ZSB2YWx1ZXMu ICBUaGlzIHdvcmtzIGZpbmUgZm9yIHB1cmUKcGxhbmUgdXBkYXRlcyBhdCB0aGUgbW9tZW50IHNp bmNlIHRoZSBDUlRDIHN0YXRlIGl0c2VsZiBpc24ndCBjaGFuZ2VkIGFzCnBhcnQgb2YgdGhlIG9w ZXJhdGlvbi4gIEhvd2V2ZXIgYXMgd2UgY29udmVydCBtb3JlIG9mIG91ciBkcml2ZXIKaW50ZXJu YWxzIG92ZXIgdG8gYXRvbWljIG1vZGVzZXR0aW5nLCB3ZSBuZWVkIHRvIGxvb2sgYXQgd2hldGhl ciB0aGUKQ1JUQyB3aWxsIGJlIGFjdGl2ZSBhdCB0aGUgKmVuZCogb2YgdGhlIGF0b21pYyB0cmFu c2FjdGlvbiAod2hpY2ggbWF5Cm5vdCBtYXRjaCB0aGUgY3VycmVudGx5IGNvbW1pdHRlZCBzdGF0 ZSkuCgpUaGUgaW4tZmxpZ2h0IHZhbHVlIHdlIHdhbnQgdG8gdXNlIGlzIGdlbmVyYWxseSBpbiBh IGNydGNfc3RhdGUgb2JqZWN0CmFzc29jaWF0ZWQgd2l0aCBvdXIgdG9wLWxldmVsIGF0b21pYyB0 cmFuc2FjdGlvbi4gIEhvd2V2ZXIgdGhlcmUgYXJlIGEKZmV3IGNhc2VzIHdoZXJlIHRoaXMgaXNu J3QgdGhlIGNhc2U6CgogKiBXaGlsZSB1c2luZyB0cmFuc2l0aW9uYWwgYXRvbWljIGhlbHBlcnMg KGFzIHdlIGFyZSBhdCB0aGUgbW9tZW50KSwKICAgU2V0UGxhbmUoKSBjYWxscyB3aWxsIG9wZXJh dGUgb24gb3JwaGFuZWQgcGxhbmUgc3RhdGVzIHRoYXQgYXJlbid0CiAgIHBhcnQgb2YgYSB0b3At bGV2ZWwgYXRvbWljIHRyYW5zYWN0aW9uLiAgSW4gdGhpcyBjYXNlLCB3ZSdyZSBub3QKICAgdG91 Y2hpbmcgdGhlIENSVEMgc3RhdGUsIHNvIGl0J3MgZmluZSB0byB1c2UgdGhlIGFscmVhZHktY29t bWl0dGVkCiAgIHZhbHVlIGZyb20gY3J0Yy0+c3RhdGUuCgogKiBXaGlsZSB1cGRhdGluZyBwcm9w ZXJ0aWVzIG9mIGEgZGlzYWJsZWQgcGxhbmUsIHdlJ2xsIGhhdmUgYSB0b3AtbGV2ZWwKICAgYXRv bWljIHN0YXRlLCBidXQgaXQgbWF5IG5vdCBjb250YWluIHRoZSBDUlRDIHN0YXRlIHdlJ3JlIGxv b2tpbmcKICAgZm9yLiAgT25jZSBhZ2FpbiwgdGhpcyBtZWFucyB3ZSdyZSBub3QgYWN0dWFsbHkg dG91Y2hpbmcgYW55IENSVEMKICAgc3RhdGUgc28gaXQncyBzYWZlIHRvIHVzZSB0aGUgdmFsdWUg ZnJvbSBjcnRjLT5zdGF0ZSBkaXJlY3RseS4KClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1h dHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljX3BsYW5lLmMgfCAxMSArKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jICAgICAgfCA3MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgICAgICB8ICAzICsrCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgICAgICB8IDE2ICsrKysrLS0KIDQgZmlsZXMgY2hhbmdl ZCwgOTMgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9hdG9taWNfcGxhbmUuYwppbmRleCA5NzZiODkxLi45MGM0YTgyIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtMTExLDEyICsxMTEsMTcgQEAg c3RhdGljIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsCiB7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmNydGM7CiAJc3RydWN0IGlu dGVsX2NydGMgKmludGVsX2NydGM7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2Ny dGNfc3RhdGU7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3Bs YW5lKHBsYW5lKTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3N0YXRlID0gdG9f aW50ZWxfcGxhbmVfc3RhdGUoc3RhdGUpOworCWJvb2wgYWN0aXZlOwogCiAJY3J0YyA9IGNydGMg PyBjcnRjIDogcGxhbmUtPmNydGM7CiAJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7 CiAKKwlpbnRlbF9jcnRjX3N0YXRlID0gaW50ZWxfY3J0Y19zdGF0ZV9mb3JfcGxhbmUoaW50ZWxf c3RhdGUpOworCWFjdGl2ZSA9IGludGVsX2NydGNfc3RhdGUtPmJhc2UuZW5hYmxlOworCiAJLyoK IAkgKiBCb3RoIGNydGMgYW5kIHBsYW5lLT5jcnRjIGNvdWxkIGJlIE5VTEwgaWYgd2UncmUgdXBk YXRpbmcgYQogCSAqIHByb3BlcnR5IHdoaWxlIHRoZSBwbGFuZSBpcyBkaXNhYmxlZC4gIFdlIGRv bid0IGFjdHVhbGx5IGhhdmUKQEAgLTE0MywxMCArMTQ4LDggQEAgc3RhdGljIGludCBpbnRlbF9w bGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJLyogQ2xpcCBhbGwg cGxhbmVzIHRvIENSVEMgc2l6ZSwgb3IgMHgwIGlmIENSVEMgaXMgZGlzYWJsZWQgKi8KIAlpbnRl bF9zdGF0ZS0+Y2xpcC54MSA9IDA7CiAJaW50ZWxfc3RhdGUtPmNsaXAueTEgPSAwOwotCWludGVs X3N0YXRlLT5jbGlwLngyID0KLQkJaW50ZWxfY3J0Yy0+YWN0aXZlID8gaW50ZWxfY3J0Yy0+Y29u ZmlnLT5waXBlX3NyY193IDogMDsKLQlpbnRlbF9zdGF0ZS0+Y2xpcC55MiA9Ci0JCWludGVsX2Ny dGMtPmFjdGl2ZSA/IGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCA6IDA7CisJaW50ZWxf c3RhdGUtPmNsaXAueDIgPSBhY3RpdmUgPyBpbnRlbF9jcnRjX3N0YXRlLT5waXBlX3NyY193IDog MDsKKwlpbnRlbF9zdGF0ZS0+Y2xpcC55MiA9IGFjdGl2ZSA/IGludGVsX2NydGNfc3RhdGUtPnBp cGVfc3JjX2ggOiAwOwogCiAJLyoKIAkgKiBEaXNhYmxpbmcgYSBwbGFuZSBpcyBhbHdheXMgb2th eTsgd2UganVzdCBuZWVkIHRvIHVwZGF0ZQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IDdiZmUyYWYuLjg4YjBmNjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTEyNTYyLDYgKzEyNTYyLDUzIEBAIGludGVsX2NsZWFudXBfcGxhbmVfZmIoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCiAJfQogfQogCisvKioKKyAqIGludGVsX2NydGNfc3RhdGVfZm9y X3BsYW5lIC0gT2J0YWluIENSVEMgc3RhdGUgZm9yIGEgcGxhbmUKKyAqIEBwc3RhdGU6IHBsYW5l IHN0YXRlIHRvIGxvb2t1cCBjb3JyZXNwb25kaW5nIGNydGMgc3RhdGUgZm9yCisgKgorICogV2hl biB3b3JraW5nIHdpdGggYSB0b3AtbGV2ZWwgYXRvbWljIHRyYW5zYWN0aW9uIChkcm1fYXRvbWlj X3N0YXRlKSwKKyAqIGEgQ1JUQyBzdGF0ZSBzaG91bGQgYmUgcHJlc2VudCB0aGF0IGNvcnJlc3Bv bmRzIHRvIHRoZSBwcm92aWRlZAorICogcGxhbmUgc3RhdGU7IHRoaXMgZnVuY3Rpb24gcHJvdmlk ZXMgYSBxdWljayB3YXkgdG8gZmV0Y2ggdGhhdAorICogQ1JUQyBzdGF0ZS4gIEluIGNhc2VzIHdo ZXJlIHdlIGhhdmUgYSBwbGFuZSBzdGF0ZSB1bmFzc29jaWF0ZWQgd2l0aCBhbnkKKyAqIHRvcC1s ZXZlbCBhdG9taWMgdHJhbnNhY3Rpb24gKGUuZy4sIHdoaWxlIHVzaW5nIHRoZSB0cmFuc2l0aW9u YWwgYXRvbWljCisgKiBoZWxwZXJzKSwgdGhlIGN1cnJlbnQgQ1JUQyBzdGF0ZSBmcm9tIGNydGMt PnN0YXRlIHdpbGwgYmUgcmV0dXJuZWQKKyAqIGluc3RlYWQuCisgKi8KK3N0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICoKK2ludGVsX2NydGNfc3RhdGVfZm9yX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSAqcHN0YXRlKQoreworCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IHBz dGF0ZS0+YmFzZS5zdGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxf cGxhbmUocHN0YXRlLT5iYXNlLnBsYW5lKTsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBpbnRl bF9nZXRfY3J0Y19mb3JfcGlwZShwc3RhdGUtPmJhc2UucGxhbmUtPmRldiwKKwkJCQkJCQlwbGFu ZS0+cGlwZSk7CisJaW50IGk7CisKKwkvKgorCSAqIFdoaWxlIHVzaW5nIHRyYW5zaXRpb25hbCBw bGFuZSBoZWxwZXJzLCB3ZSBtYXkgbm90IGhhdmUgYSB0b3AtbGV2ZWwKKwkgKiBhdG9taWMgdHJh bnNhY3Rpb24uICBPZiBjb3Vyc2UgdGhhdCBhbHNvIG1lYW5zIHRoYXQgd2UncmUgbm90CisJICog YWN0dWFsbHkgdG91Y2hpbmcgQ1JUQyBzdGF0ZSwgc28ganVzdCByZXR1cm4gdGhlIGN1cnJlbnRs eQorCSAqIGNvbW1pdHRlZCBzdGF0ZS4KKwkgKi8KKwlpZiAoIXN0YXRlKQorCQlyZXR1cm4gdG9f aW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7CisKKwlmb3IgKGkgPSAwOyBpIDwgc3RhdGUt PmRldi0+bW9kZV9jb25maWcubnVtX2NydGM7IGkrKykgeworCQlpZiAoIXN0YXRlLT5jcnRjc1tp XSkKKwkJCWNvbnRpbnVlOworCisJCWlmICh0b19pbnRlbF9jcnRjKHN0YXRlLT5jcnRjc1tpXSkt PnBpcGUgPT0gcGxhbmUtPnBpcGUpCisJCQlyZXR1cm4gdG9faW50ZWxfY3J0Y19zdGF0ZShzdGF0 ZS0+Y3J0Y19zdGF0ZXNbaV0pOworCX0KKworCS8qCisJICogV2UgbWF5IGhhdmUgYSBwbGFuZSBz dGF0ZSB3aXRob3V0IGEgY29ycmVzcG9uZGluZyBDUlRDIHN0YXRlIGlmCisJICogd2UncmUgdXBk YXRpbmcgYSBwcm9wZXJ0eSBvZiBhIGRpc2FibGVkIHBsYW5lLiAgQWdhaW4sIGp1c3QgdXNpbmcK KwkgKiB0aGUgYWxyZWFkeS1jb21taXR0ZWQgc3RhdGUgZm9yIHRoaXMgcGxhbmUncyBDUlRDIHNo b3VsZCBiZSBmaW5lCisJICogc2luY2Ugd2UncmUgbm90IGFjdHVhbGx5IHRvdWNoaW5nIHRoZSBD UlRDIGhlcmUuCisJICovCisJcmV0dXJuIHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUp OworfQorCiBzdGF0aWMgaW50CiBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lLAogCQkJICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQpAQCAt MTI1NzAsMTUgKzEyNjE3LDIwIEBAIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRj OwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICppbnRlbF9jcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gc3Rh dGUtPmJhc2UuZmI7CiAJc3RydWN0IGRybV9yZWN0ICpkZXN0ID0gJnN0YXRlLT5kc3Q7CiAJc3Ry dWN0IGRybV9yZWN0ICpzcmMgPSAmc3RhdGUtPnNyYzsKIAljb25zdCBzdHJ1Y3QgZHJtX3JlY3Qg KmNsaXAgPSAmc3RhdGUtPmNsaXA7CisJYm9vbCBhY3RpdmU7CiAJaW50IHJldDsKIAogCWNydGMg PSBjcnRjID8gY3J0YyA6IHBsYW5lLT5jcnRjOwogCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj KGNydGMpOwogCisJaW50ZWxfY3J0Y19zdGF0ZSA9IGludGVsX2NydGNfc3RhdGVfZm9yX3BsYW5l KHN0YXRlKTsKKwlhY3RpdmUgPSBpbnRlbF9jcnRjX3N0YXRlLT5iYXNlLmVuYWJsZTsKKwogCXJl dCA9IGRybV9wbGFuZV9oZWxwZXJfY2hlY2tfdXBkYXRlKHBsYW5lLCBjcnRjLCBmYiwKIAkJCQkJ ICAgIHNyYywgZGVzdCwgY2xpcCwKIAkJCQkJICAgIERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElO RywKQEAgLTEyNTg3LDcgKzEyNjM5LDcgQEAgaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JaWYgKGlu dGVsX2NydGMtPmFjdGl2ZSkgeworCWlmIChhY3RpdmUpIHsKIAkJaW50ZWxfY3J0Yy0+YXRvbWlj LndhaXRfZm9yX2ZsaXBzID0gdHJ1ZTsKIAogCQkvKgpAQCAtMTI2MzgsMTEgKzEyNjkwLDE2IEBA IGludGVsX2NvbW1pdF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmlu dGVsX2NydGM7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NydGNfc3RhdGU7CiAJ c3RydWN0IGRybV9yZWN0ICpzcmMgPSAmc3RhdGUtPnNyYzsKKwlib29sIGFjdGl2ZTsKIAogCWNy dGMgPSBjcnRjID8gY3J0YyA6IHBsYW5lLT5jcnRjOwogCWludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNydGMpOwogCisJaW50ZWxfY3J0Y19zdGF0ZSA9IGludGVsX2NydGNfc3RhdGVfZm9yX3Bs YW5lKHN0YXRlKTsKKwlhY3RpdmUgPSBpbnRlbF9jcnRjX3N0YXRlLT5iYXNlLmVuYWJsZTsKKwog CXBsYW5lLT5mYiA9IGZiOwogCWNydGMtPnggPSBzcmMtPngxID4+IDE2OwogCWNydGMtPnkgPSBz cmMtPnkxID4+IDE2OwpAQCAtMTI4NTQsMTIgKzEyOTExLDE3IEBAIGludGVsX2NoZWNrX2N1cnNv cl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAljb25zdCBzdHJ1Y3QgZHJtX3JlY3Qg KmNsaXAgPSAmc3RhdGUtPmNsaXA7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9 IGludGVsX2ZiX29iaihmYik7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CisJc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NydGNfc3RhdGU7CiAJdW5zaWduZWQgc3RyaWRl OworCWJvb2wgYWN0aXZlOwogCWludCByZXQ7CiAKIAljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFu ZS0+Y3J0YzsKIAlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAorCWludGVsX2Ny dGNfc3RhdGUgPSBpbnRlbF9jcnRjX3N0YXRlX2Zvcl9wbGFuZShzdGF0ZSk7CisJYWN0aXZlID0g aW50ZWxfY3J0Y19zdGF0ZS0+YmFzZS5lbmFibGU7CisKIAlyZXQgPSBkcm1fcGxhbmVfaGVscGVy X2NoZWNrX3VwZGF0ZShwbGFuZSwgY3J0YywgZmIsCiAJCQkJCSAgICBzcmMsIGRlc3QsIGNsaXAs CiAJCQkJCSAgICBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkcsCkBAIC0xMjg5Miw3ICsxMjk1 NCw3IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK IAl9CiAKIGZpbmlzaDoKLQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7CisJaWYgKGFjdGl2ZSkg ewogCQlpZiAocGxhbmUtPnN0YXRlLT5jcnRjX3cgIT0gc3RhdGUtPmJhc2UuY3J0Y193KQogCQkJ aW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSA9IHRydWU7CiAKQEAgLTEyOTEwLDEyICsxMjk3 MiwxNyBAQCBpbnRlbF9jb21taXRfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5iYXNlLmNydGM7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGM7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NydGNfc3RhdGU7CiAJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihzdGF0ZS0+YmFzZS5mYik7 CiAJdWludDMyX3QgYWRkcjsKKwlib29sIGFjdGl2ZTsKIAogCWNydGMgPSBjcnRjID8gY3J0YyA6 IHBsYW5lLT5jcnRjOwogCWludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCisJaW50 ZWxfY3J0Y19zdGF0ZSA9IGludGVsX2NydGNfc3RhdGVfZm9yX3BsYW5lKHN0YXRlKTsKKwlhY3Rp dmUgPSBpbnRlbF9jcnRjX3N0YXRlLT5iYXNlLmVuYWJsZTsKKwogCXBsYW5lLT5mYiA9IHN0YXRl LT5iYXNlLmZiOwogCWNydGMtPmN1cnNvcl94ID0gc3RhdGUtPmJhc2UuY3J0Y194OwogCWNydGMt PmN1cnNvcl95ID0gc3RhdGUtPmJhc2UuY3J0Y195OwpAQCAtMTI5MzQsNyArMTMwMDEsNyBAQCBp bnRlbF9jb21taXRfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWludGVs X2NydGMtPmN1cnNvcl9ibyA9IG9iajsKIHVwZGF0ZToKIAotCWlmIChpbnRlbF9jcnRjLT5hY3Rp dmUpCisJaWYgKGFjdGl2ZSkKIAkJaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIHN0YXRl LT52aXNpYmxlKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBlZmE1M2Q1Li43 MWUwMTUyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtOTk4LDYgKzk5OCw5IEBAIGlu dGVsX3JvdGF0aW9uXzkwX29yXzI3MCh1bnNpZ25lZCBpbnQgcm90YXRpb24pCiAKIGJvb2wgaW50 ZWxfd21fbmVlZF91cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgIHN0cnVjdCBk cm1fcGxhbmVfc3RhdGUgKnN0YXRlKTsKK3N0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICoKK2ludGVs X2NydGNfc3RhdGVfZm9yX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHN0YXRlKTsK KwogCiAvKiBzaGFyZWQgZHBsbCBmdW5jdGlvbnMgKi8KIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBs bCAqaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGE0YzBhMDQuLjIwMTZlNzggMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC04NjQsNiArODY0LDcgQEAgaW50ZWxfY2hl Y2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJIHN0cnVjdCBpbnRl bF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMg PSB0b19pbnRlbF9jcnRjKHN0YXRlLT5iYXNlLmNydGMpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICppbnRlbF9jcnRjX3N0YXRlOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUg PSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBz dGF0ZS0+YmFzZS5mYjsKIAlpbnQgY3J0Y194LCBjcnRjX3k7CkBAIC04NzUsOSArODc2LDEzIEBA IGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpbnQg aHNjYWxlLCB2c2NhbGU7CiAJaW50IG1heF9zY2FsZSwgbWluX3NjYWxlOwogCWludCBwaXhlbF9z aXplOworCWJvb2wgYWN0aXZlOwogCiAJaW50ZWxfY3J0YyA9IGludGVsX2NydGMgPyBpbnRlbF9j cnRjIDogdG9faW50ZWxfY3J0YyhwbGFuZS0+Y3J0Yyk7CiAKKwlpbnRlbF9jcnRjX3N0YXRlID0g aW50ZWxfY3J0Y19zdGF0ZV9mb3JfcGxhbmUoc3RhdGUpOworCWFjdGl2ZSA9IGludGVsX2NydGNf c3RhdGUtPmJhc2UuZW5hYmxlOworCiAJaWYgKCFmYikgewogCQlzdGF0ZS0+dmlzaWJsZSA9IGZh bHNlOwogCQlnb3RvIGZpbmlzaDsKQEAgLTEwMjQsOSArMTAyOSw5IEBAIGZpbmlzaDoKIAkgKi8K IAlzdGF0ZS0+aGlkZXNfcHJpbWFyeSA9IGZiICE9IE5VTEwgJiYgZHJtX3JlY3RfZXF1YWxzKGRz dCwgY2xpcCkgJiYKIAkJIWNvbG9ya2V5X2VuYWJsZWQoaW50ZWxfcGxhbmUpOwotCVdBUk5fT04o c3RhdGUtPmhpZGVzX3ByaW1hcnkgJiYgIXN0YXRlLT52aXNpYmxlICYmIGludGVsX2NydGMtPmFj dGl2ZSk7CisJV0FSTl9PTihzdGF0ZS0+aGlkZXNfcHJpbWFyeSAmJiAhc3RhdGUtPnZpc2libGUg JiYgYWN0aXZlKTsKIAotCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKKwlpZiAoYWN0aXZlKSB7 CiAJCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgPT0gc3RhdGUtPmhpZGVzX3ByaW1h cnkpCiAJCQlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF9mb3JfZmxpcHMgPSB0cnVlOwogCkBAIC0x MDYyLDE4ICsxMDY3LDIzIEBAIGludGVsX2NvbW1pdF9zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiB7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2UuY3J0 YzsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqaW50ZWxfY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5l ID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0g c3RhdGUtPmJhc2UuZmI7CiAJaW50IGNydGNfeCwgY3J0Y195OwogCXVuc2lnbmVkIGludCBjcnRj X3csIGNydGNfaDsKIAl1aW50MzJfdCBzcmNfeCwgc3JjX3ksIHNyY193LCBzcmNfaDsKKwlib29s IGFjdGl2ZTsKIAogCWNydGMgPSBjcnRjID8gY3J0YyA6IHBsYW5lLT5jcnRjOwogCWludGVsX2Ny dGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCisJaW50ZWxfY3J0Y19zdGF0ZSA9IGludGVsX2Ny dGNfc3RhdGVfZm9yX3BsYW5lKHN0YXRlKTsKKwlhY3RpdmUgPSBpbnRlbF9jcnRjX3N0YXRlLT5i YXNlLmVuYWJsZTsKKwogCXBsYW5lLT5mYiA9IGZiOwogCi0JaWYgKGludGVsX2NydGMtPmFjdGl2 ZSkgeworCWlmIChhY3RpdmUpIHsKIAkJaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkID0gIXN0 YXRlLT5oaWRlc19wcmltYXJ5OwogCiAJCWlmIChzdGF0ZS0+dmlzaWJsZSkgewotLSAKMS44LjUu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK