From: Maarten Lankhorst Subject: [CI 06/12] drm/i915: Complete crtc hw/uapi split, v5. Date: Wed, 30 Oct 2019 15:26:51 +0100 Message-ID: <20191030142657.22405-6-maarten.lankhorst@linux.intel.com> References: <20191030142657.22405-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DEBD6EA29 for ; Wed, 30 Oct 2019 14:27:06 +0000 (UTC) In-Reply-To: <20191030142657.22405-1-maarten.lankhorst@linux.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 Tm93IHRoYXQgd2Ugc2VwYXJhdGVkIGV2ZXJ5dGhpbmcgaW50byB1YXBpIGFuZCBodywgaXQncwp0 aW1lIHRvIG1ha2UgdGhlIHNwbGl0IGRlZmluaXRpdmUuIFJlbW92ZSB0aGUgdW5pb24gYW5kCm1h a2UgYSBjb3B5IG9mIHRoZSBodyBzdGF0ZSBvbiBtb2Rlc2V0IGFuZCBmYXN0c2V0LgoKQ29sb3Ig YmxvYnMgYXJlIGNvcGllZCBpbiBjcnRjIGF0b21pY19jaGVjaygpLCByaWdodApiZWZvcmUgY29s b3IgbWFuYWdlbWVudCBpcyBjaGVja2VkLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBDb3B5IGFsbCBi bG9icyBpbW1lZGlhdGVseSBhZnRlciBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19tb2Rlc2V0KCku Ci0gQ2xlYXIgY3J0Y19zdGF0ZS0+aHcgb24gZGlzYWJsZSwgaW5zdGVhZCBvZiB1c2luZyBjbGVh cl9pbnRlbF9jcnRjX3N0YXRlKCkuCkNoYW5nZXMgc2luY2UgdjI6Ci0gVXNlIGludGVsX2NydGNf ZnJlZV9od19zdGF0ZSArIGNsZWFyIGluIGludGVsX2NydGNfZGlzYWJsZV9ub2F0b21pYygpLgot IE1ha2UgYSBpbnRlbF9jcnRjX3ByZXBhcmVfc3RhdGUoKSBmdW5jdGlvbiB0aGF0IGNsZWFycyB0 aGUgY3J0Y19zdGF0ZQogIGFuZCBjb3BpZXMgaHcgbWVtYmVycy4KLSBSZW1vdmUgc2V0dGluZyB1 YXBpLmFkanVzdGVkX21vZGUsIHdlIG5vdyBoYXZlIGEgZGlyZWN0IGNhbGwgdG8KICBkcm1fY2Fs Y190aW1lc3RhbXBpbmdfY29uc3RhbnRzKCkuCkNoYW5nZXMgc2luY2UgdjM6Ci0gUmVuYW1lIHBy ZWZpeCBjb3B5X2h3X3RvX3VhcGlfc3RhdGUoKSB3aXRoIGludGVsX2NydGMuCi0gQ29weSBjb2xv ciBibG9icyB0byB1YXBpIGFzIHdlbGwuCi0gQWRkIGEgaW50ZWxfY3J0Y19jb3B5X3VhcGlfdG9f aHdfc3RhdGVfbm9tb2Rlc2V0KCkgZnVuY3Rpb24gZm9yIGNsYXJpdHkuCkNoYW5nZXMgc2luY2Ug djQ6Ci0gQ29weSBody5hZGp1c3RlZF9tb2RlIGJhY2sgdG8gdWFwaS5hZGp1c3RlZF9tb2RlLCB0 byBzaHV0IHVwCiAgdGhlIGNhbGwgdG8gZHJtX2NhbGNfdGltZXN0YW1waW5nX2NvbnN0YW50cygp IGluCiAgZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX2xlZ2FjeV9tb2Rlc2V0X3N0YXRlKCkuCi0g VXNlIGRybV9wcm9wZXJ0eV9yZXBsYWNlX2Jsb2IgKFZpbGxlKS4KClNpZ25lZC1vZmYtYnk6IE1h YXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWMuYyAgIHwgMzEgKysrKysr KysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmggICB8ICAyICsK IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jICB8IDc4ICsrKysr KysrKysrKysrKy0tLS0KIC4uLi9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMu aCAgICB8ICA5ICsrLQogNCBmaWxlcyBjaGFuZ2VkLCAxMDMgaW5zZXJ0aW9ucygrKSwgMTcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRl bF9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmMK aW5kZXggNDg5NjRmMzNjMGMxLi4zMzAxYzE3OGRhMDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9hdG9taWMuYwpAQCAtMTk1LDYgKzE5NSwxNCBAQCBpbnRlbF9jcnRj X2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlfX2RybV9hdG9taWNf aGVscGVyX2NydGNfZHVwbGljYXRlX3N0YXRlKGNydGMsICZjcnRjX3N0YXRlLT51YXBpKTsKIAor CS8qIGNvcHkgY29sb3IgYmxvYnMgKi8KKwlpZiAoY3J0Y19zdGF0ZS0+aHcuZGVnYW1tYV9sdXQp CisJCWRybV9wcm9wZXJ0eV9ibG9iX2dldChjcnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dCk7CisJ aWYgKGNydGNfc3RhdGUtPmh3LmN0bSkKKwkJZHJtX3Byb3BlcnR5X2Jsb2JfZ2V0KGNydGNfc3Rh dGUtPmh3LmN0bSk7CisJaWYgKGNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCkKKwkJZHJtX3Byb3Bl cnR5X2Jsb2JfZ2V0KGNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCk7CisKIAljcnRjX3N0YXRlLT51 cGRhdGVfcGlwZSA9IGZhbHNlOwogCWNydGNfc3RhdGUtPmRpc2FibGVfbHBfd20gPSBmYWxzZTsK IAljcnRjX3N0YXRlLT5kaXNhYmxlX2N4c3IgPSBmYWxzZTsKQEAgLTIwOCw2ICsyMTYsMjggQEAg aW50ZWxfY3J0Y19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXJldHVy biAmY3J0Y19zdGF0ZS0+dWFwaTsKIH0KIAorc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19wdXRfY29s b3JfYmxvYnMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJZHJtX3By b3BlcnR5X2Jsb2JfcHV0KGNydGNfc3RhdGUtPmh3LmRlZ2FtbWFfbHV0KTsKKwlkcm1fcHJvcGVy dHlfYmxvYl9wdXQoY3J0Y19zdGF0ZS0+aHcuZ2FtbWFfbHV0KTsKKwlkcm1fcHJvcGVydHlfYmxv Yl9wdXQoY3J0Y19zdGF0ZS0+aHcuY3RtKTsKK30KKwordm9pZCBpbnRlbF9jcnRjX2ZyZWVfaHdf c3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJaW50ZWxfY3J0 Y19wdXRfY29sb3JfYmxvYnMoY3J0Y19zdGF0ZSk7Cit9CisKK3ZvaWQgaW50ZWxfY3J0Y19jb3B5 X2NvbG9yX2Jsb2JzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQoreworCWRy bV9wcm9wZXJ0eV9yZXBsYWNlX2Jsb2IoJmNydGNfc3RhdGUtPmh3LmRlZ2FtbWFfbHV0LAorCQkJ CSAgY3J0Y19zdGF0ZS0+dWFwaS5kZWdhbW1hX2x1dCk7CisJZHJtX3Byb3BlcnR5X3JlcGxhY2Vf YmxvYigmY3J0Y19zdGF0ZS0+aHcuZ2FtbWFfbHV0LAorCQkJCSAgY3J0Y19zdGF0ZS0+dWFwaS5n YW1tYV9sdXQpOworCWRybV9wcm9wZXJ0eV9yZXBsYWNlX2Jsb2IoJmNydGNfc3RhdGUtPmh3LmN0 bSwKKwkJCQkgIGNydGNfc3RhdGUtPnVhcGkuY3RtKTsKK30KKwogLyoqCiAgKiBpbnRlbF9jcnRj X2Rlc3Ryb3lfc3RhdGUgLSBkZXN0cm95IGNydGMgc3RhdGUKICAqIEBjcnRjOiBkcm0gY3J0YwpA QCAtMjIzLDYgKzI1Myw3IEBAIGludGVsX2NydGNfZGVzdHJveV9zdGF0ZShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPSB0b19pbnRl bF9jcnRjX3N0YXRlKHN0YXRlKTsKIAogCV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kZXN0cm95 X3N0YXRlKCZjcnRjX3N0YXRlLT51YXBpKTsKKwlpbnRlbF9jcnRjX2ZyZWVfaHdfc3RhdGUoY3J0 Y19zdGF0ZSk7CiAJa2ZyZWUoY3J0Y19zdGF0ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2F0b21pYy5oCmluZGV4IDQ5ZDVjYjFiOWUwYS4uN2I0OTYyMzQxOWJh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pYy5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmgKQEAgLTM2 LDYgKzM2LDggQEAgaW50ZWxfZGlnaXRhbF9jb25uZWN0b3JfZHVwbGljYXRlX3N0YXRlKHN0cnVj dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpOwogc3RydWN0IGRybV9jcnRjX3N0YXRlICppbnRl bF9jcnRjX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogdm9pZCBpbnRl bF9jcnRjX2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJICAgICAgIHN0 cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUpOwordm9pZCBpbnRlbF9jcnRjX2ZyZWVfaHdfc3Rh dGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOwordm9pZCBpbnRlbF9jcnRj X2NvcHlfY29sb3JfYmxvYnMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOwog c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKmludGVsX2F0b21pY19zdGF0ZV9hbGxvYyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaW50ZWxfYXRvbWljX3N0YXRlX2NsZWFyKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNjYyMjM3MDFlZjc4Li5lMzBmNDY3ZWVjNjcgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCkBAIC03MTg1LDYg KzcxODUsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMoc3RydWN0 IGRybV9jcnRjICpjcnRjLAogCWNydGMtPmVuYWJsZWQgPSBmYWxzZTsKIAljcnRjLT5zdGF0ZS0+ Y29ubmVjdG9yX21hc2sgPSAwOwogCWNydGMtPnN0YXRlLT5lbmNvZGVyX21hc2sgPSAwOworCWlu dGVsX2NydGNfZnJlZV9od19zdGF0ZShjcnRjX3N0YXRlKTsKKwltZW1zZXQoJmNydGNfc3RhdGUt Pmh3LCAwLCBzaXplb2YoY3J0Y19zdGF0ZS0+aHcpKTsKIAogCWZvcl9lYWNoX2VuY29kZXJfb25f Y3J0YyhjcnRjLT5kZXYsIGNydGMsIGVuY29kZXIpCiAJCWVuY29kZXItPmJhc2UuY3J0YyA9IE5V TEw7CkBAIC0xMjU2MCw4ICsxMjU2Miw0MCBAQCBzdGF0aWMgYm9vbCBjaGVja19kaWdpdGFsX3Bv cnRfY29uZmxpY3RzKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlKQogCXJldHVybiBy ZXQ7CiB9CiAKK3N0YXRpYyB2b2lkCitpbnRlbF9jcnRjX2NvcHlfdWFwaV90b19od19zdGF0ZV9u b21vZGVzZXQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJaW50ZWxf Y3J0Y19jb3B5X2NvbG9yX2Jsb2JzKGNydGNfc3RhdGUpOworfQorCitzdGF0aWMgdm9pZAoraW50 ZWxfY3J0Y19jb3B5X3VhcGlfdG9faHdfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUpCit7CisJY3J0Y19zdGF0ZS0+aHcuZW5hYmxlID0gY3J0Y19zdGF0ZS0+dWFwaS5l bmFibGU7CisJY3J0Y19zdGF0ZS0+aHcuYWN0aXZlID0gY3J0Y19zdGF0ZS0+dWFwaS5hY3RpdmU7 CisJY3J0Y19zdGF0ZS0+aHcubW9kZSA9IGNydGNfc3RhdGUtPnVhcGkubW9kZTsKKwljcnRjX3N0 YXRlLT5ody5hZGp1c3RlZF9tb2RlID0gY3J0Y19zdGF0ZS0+dWFwaS5hZGp1c3RlZF9tb2RlOwor CWludGVsX2NydGNfY29weV91YXBpX3RvX2h3X3N0YXRlX25vbW9kZXNldChjcnRjX3N0YXRlKTsK K30KKworc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19jb3B5X2h3X3RvX3VhcGlfc3RhdGUoc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJY3J0Y19zdGF0ZS0+dWFwaS5lbmFi bGUgPSBjcnRjX3N0YXRlLT5ody5lbmFibGU7CisJY3J0Y19zdGF0ZS0+dWFwaS5hY3RpdmUgPSBj cnRjX3N0YXRlLT5ody5hY3RpdmU7CisJY3J0Y19zdGF0ZS0+dWFwaS5tb2RlID0gY3J0Y19zdGF0 ZS0+aHcubW9kZTsKKwljcnRjX3N0YXRlLT51YXBpLmFkanVzdGVkX21vZGUgPSBjcnRjX3N0YXRl LT5ody5hZGp1c3RlZF9tb2RlOworCisJLyogY29weSBjb2xvciBibG9icyB0byB1YXBpICovCisJ ZHJtX3Byb3BlcnR5X3JlcGxhY2VfYmxvYigmY3J0Y19zdGF0ZS0+dWFwaS5kZWdhbW1hX2x1dCwK KwkJCQkgIGNydGNfc3RhdGUtPmh3LmRlZ2FtbWFfbHV0KTsKKwlkcm1fcHJvcGVydHlfcmVwbGFj ZV9ibG9iKCZjcnRjX3N0YXRlLT51YXBpLmdhbW1hX2x1dCwKKwkJCQkgIGNydGNfc3RhdGUtPmh3 LmdhbW1hX2x1dCk7CisJZHJtX3Byb3BlcnR5X3JlcGxhY2VfYmxvYigmY3J0Y19zdGF0ZS0+dWFw aS5jdG0sCisJCQkJICBjcnRjX3N0YXRlLT5ody5jdG0pOworfQorCiBzdGF0aWMgaW50Ci1jbGVh cl9pbnRlbF9jcnRjX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQor aW50ZWxfY3J0Y19wcmVwYXJlX2NsZWFyZWRfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0KIAkJ dG9faTkxNShjcnRjX3N0YXRlLT51YXBpLmNydGMtPmRldik7CkBAIC0xMjU3MSwxMSArMTI2MDUs MTUgQEAgY2xlYXJfaW50ZWxfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSkKIAlpZiAoIXNhdmVkX3N0YXRlKQogCQlyZXR1cm4gLUVOT01FTTsKIAorCS8qIGZy ZWUgdGhlIG9sZCBjcnRjX3N0YXRlLT5odyBtZW1iZXJzICovCisJaW50ZWxfY3J0Y19mcmVlX2h3 X3N0YXRlKGNydGNfc3RhdGUpOworCiAJLyogRklYTUU6IGJlZm9yZSB0aGUgc3dpdGNoIHRvIGF0 b21pYyBzdGFydGVkLCBhIG5ldyBwaXBlX2NvbmZpZyB3YXMKIAkgKiBremFsbG9jJ2QuIENvZGUg dGhhdCBkZXBlbmRzIG9uIGFueSBmaWVsZCBiZWluZyB6ZXJvIHNob3VsZCBiZQogCSAqIGZpeGVk LCBzbyB0aGF0IHRoZSBjcnRjX3N0YXRlIGNhbiBiZSBzYWZlbHkgZHVwbGljYXRlZC4gRm9yIG5v dywKIAkgKiBvbmx5IGZpZWxkcyB0aGF0IGFyZSBrbm93IHRvIG5vdCBjYXVzZSBwcm9ibGVtcyBh cmUgcHJlc2VydmVkLiAqLwogCisJc2F2ZWRfc3RhdGUtPnVhcGkgPSBjcnRjX3N0YXRlLT51YXBp OwogCXNhdmVkX3N0YXRlLT5zY2FsZXJfc3RhdGUgPSBjcnRjX3N0YXRlLT5zY2FsZXJfc3RhdGU7 CiAJc2F2ZWRfc3RhdGUtPnNoYXJlZF9kcGxsID0gY3J0Y19zdGF0ZS0+c2hhcmVkX2RwbGw7CiAJ c2F2ZWRfc3RhdGUtPmRwbGxfaHdfc3RhdGUgPSBjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlOwpA QCAtMTI1OTMsMTQgKzEyNjMxLDExIEBAIGNsZWFyX2ludGVsX2NydGNfc3RhdGUoc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCXNhdmVkX3N0YXRlLT5zeW5jX21vZGVfc2xh dmVzX21hc2sgPQogCQkJY3J0Y19zdGF0ZS0+c3luY19tb2RlX3NsYXZlc19tYXNrOwogCi0JLyog S2VlcCBiYXNlIGRybV9jcnRjX3N0YXRlIGludGFjdCwgb25seSBjbGVhciBvdXIgZXh0ZW5kZWQg c3RydWN0ICovCi0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl LCBiYXNlKSk7Ci0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl LCB1YXBpKSk7Ci0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl LCBodykpOwotCW1lbWNweSgmY3J0Y19zdGF0ZS0+dWFwaSArIDEsICZzYXZlZF9zdGF0ZS0+dWFw aSArIDEsCi0JICAgICAgIHNpemVvZigqY3J0Y19zdGF0ZSkgLSBzaXplb2YoY3J0Y19zdGF0ZS0+ dWFwaSkpOwotCisJbWVtY3B5KGNydGNfc3RhdGUsIHNhdmVkX3N0YXRlLCBzaXplb2YoKmNydGNf c3RhdGUpKTsKIAlrZnJlZShzYXZlZF9zdGF0ZSk7CisKKwlpbnRlbF9jcnRjX2NvcHlfdWFwaV90 b19od19zdGF0ZShjcnRjX3N0YXRlKTsKKwogCXJldHVybiAwOwogfQogCkBAIC0xMjYxNiwxMCAr MTI2NTEsNiBAQCBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpwaXBlX2NvbmZpZykKIAlpbnQgaTsKIAlib29sIHJldHJ5ID0gdHJ1ZTsKIAotCXJldCA9 IGNsZWFyX2ludGVsX2NydGNfc3RhdGUocGlwZV9jb25maWcpOwotCWlmIChyZXQpCi0JCXJldHVy biByZXQ7Ci0KIAlwaXBlX2NvbmZpZy0+Y3B1X3RyYW5zY29kZXIgPQogCQkoZW51bSB0cmFuc2Nv ZGVyKSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlOwogCkBAIC0xMjc0Nyw2ICsxMjc3OCwxMiBA QCBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBl X2NvbmZpZykKIAlEUk1fREVCVUdfS01TKCJodyBtYXggYnBwOiAlaSwgcGlwZSBicHA6ICVpLCBk aXRoZXJpbmc6ICVpXG4iLAogCQkgICAgICBiYXNlX2JwcCwgcGlwZV9jb25maWctPnBpcGVfYnBw LCBwaXBlX2NvbmZpZy0+ZGl0aGVyKTsKIAorCS8qCisJICogTWFrZSBkcm1fY2FsY190aW1lc3Rh bXBpbmdfY29uc3RhbnRzIGluCisJICogZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX2xlZ2FjeV9t b2Rlc2V0X3N0YXRlKCkgaGFwcHkKKwkgKi8KKwlwaXBlX2NvbmZpZy0+dWFwaS5hZGp1c3RlZF9t b2RlID0gcGlwZV9jb25maWctPmh3LmFkanVzdGVkX21vZGU7CisKIAlyZXR1cm4gMDsKIH0KIApA QCAtMTM0NzYsNiArMTM1MTMsOCBAQCB2ZXJpZnlfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKIAogCXN0YXRlID0gb2xkX2NydGNfc3RhdGUtPnVhcGkuc3RhdGU7CiAJX19kcm1f YXRvbWljX2hlbHBlcl9jcnRjX2Rlc3Ryb3lfc3RhdGUoJm9sZF9jcnRjX3N0YXRlLT51YXBpKTsK KwlpbnRlbF9jcnRjX2ZyZWVfaHdfc3RhdGUob2xkX2NydGNfc3RhdGUpOworCiAJcGlwZV9jb25m aWcgPSBvbGRfY3J0Y19zdGF0ZTsKIAltZW1zZXQocGlwZV9jb25maWcsIDAsIHNpemVvZigqcGlw ZV9jb25maWcpKTsKIAlwaXBlX2NvbmZpZy0+dWFwaS5jcnRjID0gJmNydGMtPmJhc2U7CkBAIC0x NDAxMCwxNCArMTQwNDksMjQgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY2hlY2soc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAogCWZvcl9lYWNoX29sZG5ld19pbnRlbF9jcnRjX2luX3N0YXRl KHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwKIAkJCQkJICAgIG5ld19jcnRjX3N0YXRlLCBp KSB7Ci0JCWlmICghbmVlZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSkpCisJCWlmICghbmVlZHNf bW9kZXNldChuZXdfY3J0Y19zdGF0ZSkpIHsKKwkJCS8qIExpZ2h0IGNvcHkgKi8KKwkJCWludGVs X2NydGNfY29weV91YXBpX3RvX2h3X3N0YXRlX25vbW9kZXNldChuZXdfY3J0Y19zdGF0ZSk7CisK IAkJCWNvbnRpbnVlOworCQl9CiAKIAkJaWYgKCFuZXdfY3J0Y19zdGF0ZS0+dWFwaS5lbmFibGUp IHsKKwkJCWludGVsX2NydGNfY29weV91YXBpX3RvX2h3X3N0YXRlKG5ld19jcnRjX3N0YXRlKTsK KwogCQkJYW55X21zID0gdHJ1ZTsKIAkJCWNvbnRpbnVlOwogCQl9CiAKKwkJcmV0ID0gaW50ZWxf Y3J0Y19wcmVwYXJlX2NsZWFyZWRfc3RhdGUobmV3X2NydGNfc3RhdGUpOworCQlpZiAocmV0KQor CQkJZ290byBmYWlsOworCiAJCXJldCA9IGludGVsX21vZGVzZXRfcGlwZV9jb25maWcobmV3X2Ny dGNfc3RhdGUpOwogCQlpZiAocmV0KQogCQkJZ290byBmYWlsOwpAQCAtMTcyOTEsNiArMTczNDAs NyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7 CiAKIAkJX19kcm1fYXRvbWljX2hlbHBlcl9jcnRjX2Rlc3Ryb3lfc3RhdGUoJmNydGNfc3RhdGUt PnVhcGkpOworCQlpbnRlbF9jcnRjX2ZyZWVfaHdfc3RhdGUoY3J0Y19zdGF0ZSk7CiAJCW1lbXNl dChjcnRjX3N0YXRlLCAwLCBzaXplb2YoKmNydGNfc3RhdGUpKTsKIAkJX19kcm1fYXRvbWljX2hl bHBlcl9jcnRjX3Jlc2V0KCZjcnRjLT5iYXNlLCAmY3J0Y19zdGF0ZS0+dWFwaSk7CiAKQEAgLTE3 NDE5LDYgKzE3NDY5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkgKiBzZXQgYSBmbGFnIHRvIGluZGljYXRl IHRoYXQgYSBmdWxsIHJlY2FsY3VsYXRpb24gaXMKIAkJCSAqIG5lZWRlZCBvbiB0aGUgbmV4dCBj b21taXQuCiAJCQkgKi8KKwkJCWNydGNfc3RhdGUtPmh3Lm1vZGUgPSBjcnRjLT5iYXNlLm1vZGU7 CiAJCQljcnRjX3N0YXRlLT5ody5tb2RlLnByaXZhdGVfZmxhZ3MgPSBJOTE1X01PREVfRkxBR19J TkhFUklURUQ7CiAKIAkJCWludGVsX2NydGNfY29tcHV0ZV9waXhlbF9yYXRlKGNydGNfc3RhdGUp OwpAQCAtMTc0NjcsNiArMTc1MTgsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRv dXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCQlpbnRlbF9id19jcnRjX3Vw ZGF0ZShid19zdGF0ZSwgY3J0Y19zdGF0ZSk7CiAKKwkJaW50ZWxfY3J0Y19jb3B5X2h3X3RvX3Vh cGlfc3RhdGUoY3J0Y19zdGF0ZSk7CiAJCWludGVsX3BpcGVfY29uZmlnX3Nhbml0eV9jaGVjayhk ZXZfcHJpdiwgY3J0Y19zdGF0ZSk7CiAJfQogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5X3R5cGVzLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaAppbmRleCBlODQzNDNkM2JmOGQuLjkzMTlj YTY4MjEwNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5X3R5cGVzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5X3R5cGVzLmgKQEAgLTc1Nyw4ICs3NTcsNiBAQCBlbnVtIGludGVsX291dHB1dF9mb3Jt YXQgewogfTsKIAogc3RydWN0IGludGVsX2NydGNfc3RhdGUgewotCXVuaW9uIHsKLQlzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgYmFzZTsKIAkvKgogCSAqIHVhcGkgKGRybSkgc3RhdGUuIFRoaXMgaXMg dGhlIHNvZnR3YXJlIHN0YXRlIHNob3duIHRvIHVzZXJzcGFjZS4KIAkgKiBJbiBwYXJ0aWN1bGFy LCB0aGUgZm9sbG93aW5nIG1lbWJlcnMgYXJlIHVzZWQgZm9yIGJvb2trZWVwaW5nOgpAQCAtNzgx LDggKzc3OSwxMSBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7CiAJICoKIAkgKiBEdXJpbmcg aW5pdGlhbCBodyByZWFkb3V0LCB0aGV5IG5lZWQgdG8gYmUgY29waWVkIHRvIHVhcGkuCiAJICov Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlIGh3OwotCX07CisJc3RydWN0IHsKKwkJYm9vbCBhY3Rp dmUsIGVuYWJsZTsKKwkJc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpkZWdhbW1hX2x1dCwgKmdh bW1hX2x1dCwgKmN0bTsKKwkJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgbW9kZSwgYWRqdXN0ZWRf bW9kZTsKKwl9IGh3OwogCiAJLyoqCiAJICogcXVpcmtzIC0gYml0ZmllbGQgd2l0aCBodyBzdGF0 ZSByZWFkb3V0IHF1aXJrcwotLSAKMi4yMy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZng=