From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 08/14] drm/i915: Complete crtc hw/uapi split, v3. Date: Thu, 24 Oct 2019 14:47:59 +0200 Message-ID: <20191024124805.26840-8-maarten.lankhorst@linux.intel.com> References: <20191024124805.26840-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B7EA6E3CB for ; Thu, 24 Oct 2019 12:48:11 +0000 (UTC) In-Reply-To: <20191024124805.26840-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 Y190aW1lc3RhbXBpbmdfY29uc3RhbnRzKCkuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmto b3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmMgICB8IDQ0ICsrKysrKysrKysrKysrKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWMuaCAgIHwgIDIgKwogZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgIHwgNTYgKysrKysrKysr KysrKysrLS0tLQogLi4uL2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oICAg IHwgIDkgKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDk1IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRv bWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pYy5jCmluZGV4 IDdjZjEzYjljN2QzOC4uMjY2ZDBjZTlkMDNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfYXRvbWljLmMKQEAgLTE5NSw2ICsxOTUsMTQgQEAgaW50ZWxfY3J0Y19kdXBs aWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJX19kcm1fYXRvbWljX2hlbHBl cl9jcnRjX2R1cGxpY2F0ZV9zdGF0ZShjcnRjLCAmY3J0Y19zdGF0ZS0+dWFwaSk7CiAKKwkvKiBj b3B5IGNvbG9yIGJsb2JzICovCisJaWYgKGNydGNfc3RhdGUtPmh3LmRlZ2FtbWFfbHV0KQorCQlk cm1fcHJvcGVydHlfYmxvYl9nZXQoY3J0Y19zdGF0ZS0+aHcuZGVnYW1tYV9sdXQpOworCWlmIChj cnRjX3N0YXRlLT5ody5jdG0pCisJCWRybV9wcm9wZXJ0eV9ibG9iX2dldChjcnRjX3N0YXRlLT5o dy5jdG0pOworCWlmIChjcnRjX3N0YXRlLT5ody5nYW1tYV9sdXQpCisJCWRybV9wcm9wZXJ0eV9i bG9iX2dldChjcnRjX3N0YXRlLT5ody5nYW1tYV9sdXQpOworCiAJY3J0Y19zdGF0ZS0+dXBkYXRl X3BpcGUgPSBmYWxzZTsKIAljcnRjX3N0YXRlLT5kaXNhYmxlX2xwX3dtID0gZmFsc2U7CiAJY3J0 Y19zdGF0ZS0+ZGlzYWJsZV9jeHNyID0gZmFsc2U7CkBAIC0yMDgsNiArMjE2LDQxIEBAIGludGVs X2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlyZXR1cm4gJmNy dGNfc3RhdGUtPnVhcGk7CiB9CiAKK3N0YXRpYyB2b2lkIGludGVsX2NydGNfcHV0X2NvbG9yX2Js b2JzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQoreworCWRybV9wcm9wZXJ0 eV9ibG9iX3B1dChjcnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dCk7CisJZHJtX3Byb3BlcnR5X2Js b2JfcHV0KGNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCk7CisJZHJtX3Byb3BlcnR5X2Jsb2JfcHV0 KGNydGNfc3RhdGUtPmh3LmN0bSk7Cit9CisKK3ZvaWQgaW50ZWxfY3J0Y19mcmVlX2h3X3N0YXRl KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQoreworCWludGVsX2NydGNfcHV0 X2NvbG9yX2Jsb2JzKGNydGNfc3RhdGUpOworfQorCit2b2lkIGludGVsX2NydGNfY29weV9jb2xv cl9ibG9icyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3sKKwlpbnRlbF9j cnRjX3B1dF9jb2xvcl9ibG9icyhjcnRjX3N0YXRlKTsKKworCWlmIChjcnRjX3N0YXRlLT51YXBp LmRlZ2FtbWFfbHV0KQorCQljcnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dCA9CisJCQlkcm1fcHJv cGVydHlfYmxvYl9nZXQoY3J0Y19zdGF0ZS0+dWFwaS5kZWdhbW1hX2x1dCk7CisJZWxzZQorCQlj cnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dCA9IE5VTEw7CisKKwlpZiAoY3J0Y19zdGF0ZS0+dWFw aS5nYW1tYV9sdXQpCisJCWNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCA9CisJCQlkcm1fcHJvcGVy dHlfYmxvYl9nZXQoY3J0Y19zdGF0ZS0+dWFwaS5nYW1tYV9sdXQpOworCWVsc2UKKwkJY3J0Y19z dGF0ZS0+aHcuZ2FtbWFfbHV0ID0gTlVMTDsKKworCWlmIChjcnRjX3N0YXRlLT51YXBpLmN0bSkK KwkJY3J0Y19zdGF0ZS0+aHcuY3RtID0KKwkJCWRybV9wcm9wZXJ0eV9ibG9iX2dldChjcnRjX3N0 YXRlLT51YXBpLmN0bSk7CisJZWxzZQorCQljcnRjX3N0YXRlLT5ody5jdG0gPSBOVUxMOworfQor CiAvKioKICAqIGludGVsX2NydGNfZGVzdHJveV9zdGF0ZSAtIGRlc3Ryb3kgY3J0YyBzdGF0ZQog ICogQGNydGM6IGRybSBjcnRjCkBAIC0yMjMsNiArMjY2LDcgQEAgaW50ZWxfY3J0Y19kZXN0cm95 X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoc3RhdGUpOwogCiAJX19kcm1fYXRvbWlj X2hlbHBlcl9jcnRjX2Rlc3Ryb3lfc3RhdGUoJmNydGNfc3RhdGUtPnVhcGkpOworCWludGVsX2Ny dGNfZnJlZV9od19zdGF0ZShjcnRjX3N0YXRlKTsKIAlrZnJlZShjcnRjX3N0YXRlKTsKIH0KIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWMuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmgKaW5kZXggNTgwNjVk MzE2MWEzLi40MmJlOTFlMDc3MmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfYXRvbWljLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9hdG9taWMuaApAQCAtMzUsNiArMzUsOCBAQCBpbnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9k dXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rvcik7CiBzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKmludGVsX2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY3J0 YyAqY3J0Yyk7CiB2b2lkIGludGVsX2NydGNfZGVzdHJveV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJCQkgICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSk7Cit2b2lkIGlu dGVsX2NydGNfZnJlZV9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSk7Cit2b2lkIGludGVsX2NydGNfY29weV9jb2xvcl9ibG9icyhzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSk7CiBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqaW50ZWxfYXRvbWlj X3N0YXRlX2FsbG9jKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbnRlbF9hdG9taWNf c3RhdGVfY2xlYXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwppbmRleCAxMWRkN2ExODI1NDMu LjJkYmMxZGY5NTA1YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5LmMKQEAgLTcxMTAsNiArNzExMCw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlz YWJsZV9ub2F0b21pYyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJY3J0Yy0+ZW5hYmxlZCA9IGZh bHNlOwogCWNydGMtPnN0YXRlLT5jb25uZWN0b3JfbWFzayA9IDA7CiAJY3J0Yy0+c3RhdGUtPmVu Y29kZXJfbWFzayA9IDA7CisJaW50ZWxfY3J0Y19mcmVlX2h3X3N0YXRlKGNydGNfc3RhdGUpOwor CW1lbXNldCgmY3J0Y19zdGF0ZS0+aHcsIDAsIHNpemVvZihjcnRjX3N0YXRlLT5odykpOwogCiAJ Zm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGNydGMtPmRldiwgY3J0YywgZW5jb2RlcikKIAkJZW5j b2Rlci0+YmFzZS5jcnRjID0gTlVMTDsKQEAgLTEyNDgyLDIyICsxMjQ4NCw1MCBAQCBzdGF0aWMg Ym9vbCBjaGVja19kaWdpdGFsX3BvcnRfY29uZmxpY3RzKHN0cnVjdCBpbnRlbF9hdG9taWNfc3Rh dGUgKnN0YXRlKQogCXJldHVybiByZXQ7CiB9CiAKK3N0YXRpYyB2b2lkCitpbnRlbF9jcnRjX2Nv cHlfdWFwaV90b19od19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkK K3sKKwljcnRjX3N0YXRlLT5ody5lbmFibGUgPSBjcnRjX3N0YXRlLT51YXBpLmVuYWJsZTsKKwlj cnRjX3N0YXRlLT5ody5hY3RpdmUgPSBjcnRjX3N0YXRlLT51YXBpLmFjdGl2ZTsKKwljcnRjX3N0 YXRlLT5ody5tb2RlID0gY3J0Y19zdGF0ZS0+dWFwaS5tb2RlOworCWNydGNfc3RhdGUtPmh3LmFk anVzdGVkX21vZGUgPSBjcnRjX3N0YXRlLT51YXBpLmFkanVzdGVkX21vZGU7CisJaW50ZWxfY3J0 Y19jb3B5X2NvbG9yX2Jsb2JzKGNydGNfc3RhdGUpOworfQorCitzdGF0aWMgdm9pZCBjb3B5X2h3 X3RvX3VhcGlfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJ Y3J0Y19zdGF0ZS0+dWFwaS5lbmFibGUgPSBjcnRjX3N0YXRlLT5ody5lbmFibGU7CisJY3J0Y19z dGF0ZS0+dWFwaS5hY3RpdmUgPSBjcnRjX3N0YXRlLT5ody5hY3RpdmU7CisJY3J0Y19zdGF0ZS0+ dWFwaS5tb2RlID0gY3J0Y19zdGF0ZS0+aHcubW9kZTsKKwljcnRjX3N0YXRlLT51YXBpLmFkanVz dGVkX21vZGUgPSBjcnRjX3N0YXRlLT5ody5hZGp1c3RlZF9tb2RlOworfQorCiBzdGF0aWMgaW50 Ci1jbGVhcl9pbnRlbF9jcnRjX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlKQoraW50ZWxfY3J0Y19wcmVwYXJlX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9CiAJCXRv X2k5MTUoY3J0Y19zdGF0ZS0+dWFwaS5jcnRjLT5kZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpzYXZlZF9zdGF0ZTsKIAorCWlmICghbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkgewor CQkvKiBPbmx5IG5lZWQgdG8gdXBkYXRlIGNydGNfc3RhdGUtPmh3IGNvbG9yIGJsb2JzICovCisJ CWludGVsX2NydGNfY29weV9jb2xvcl9ibG9icyhjcnRjX3N0YXRlKTsKKwkJcmV0dXJuIDA7CisJ fQorCiAJc2F2ZWRfc3RhdGUgPSBremFsbG9jKHNpemVvZigqc2F2ZWRfc3RhdGUpLCBHRlBfS0VS TkVMKTsKIAlpZiAoIXNhdmVkX3N0YXRlKQogCQlyZXR1cm4gLUVOT01FTTsKIAorCS8qIGZyZWUg dGhlIG9sZCBjcnRjX3N0YXRlLT5odyBtZW1iZXJzICovCisJaW50ZWxfY3J0Y19mcmVlX2h3X3N0 YXRlKGNydGNfc3RhdGUpOworCiAJLyogRklYTUU6IGJlZm9yZSB0aGUgc3dpdGNoIHRvIGF0b21p YyBzdGFydGVkLCBhIG5ldyBwaXBlX2NvbmZpZyB3YXMKIAkgKiBremFsbG9jJ2QuIENvZGUgdGhh dCBkZXBlbmRzIG9uIGFueSBmaWVsZCBiZWluZyB6ZXJvIHNob3VsZCBiZQogCSAqIGZpeGVkLCBz byB0aGF0IHRoZSBjcnRjX3N0YXRlIGNhbiBiZSBzYWZlbHkgZHVwbGljYXRlZC4gRm9yIG5vdywK IAkgKiBvbmx5IGZpZWxkcyB0aGF0IGFyZSBrbm93IHRvIG5vdCBjYXVzZSBwcm9ibGVtcyBhcmUg cHJlc2VydmVkLiAqLwogCisJc2F2ZWRfc3RhdGUtPnVhcGkgPSBjcnRjX3N0YXRlLT51YXBpOwog CXNhdmVkX3N0YXRlLT5zY2FsZXJfc3RhdGUgPSBjcnRjX3N0YXRlLT5zY2FsZXJfc3RhdGU7CiAJ c2F2ZWRfc3RhdGUtPnNoYXJlZF9kcGxsID0gY3J0Y19zdGF0ZS0+c2hhcmVkX2RwbGw7CiAJc2F2 ZWRfc3RhdGUtPmRwbGxfaHdfc3RhdGUgPSBjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlOwpAQCAt MTI1MTUsMTQgKzEyNTQ1LDExIEBAIGNsZWFyX2ludGVsX2NydGNfc3RhdGUoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCXNhdmVkX3N0YXRlLT5zeW5jX21vZGVfc2xhdmVz X21hc2sgPQogCQkJY3J0Y19zdGF0ZS0+c3luY19tb2RlX3NsYXZlc19tYXNrOwogCi0JLyogS2Vl cCBiYXNlIGRybV9jcnRjX3N0YXRlIGludGFjdCwgb25seSBjbGVhciBvdXIgZXh0ZW5kZWQgc3Ry dWN0ICovCi0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlLCBi YXNlKSk7Ci0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlLCB1 YXBpKSk7Ci0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlLCBo dykpOwotCW1lbWNweSgmY3J0Y19zdGF0ZS0+dWFwaSArIDEsICZzYXZlZF9zdGF0ZS0+dWFwaSAr IDEsCi0JICAgICAgIHNpemVvZigqY3J0Y19zdGF0ZSkgLSBzaXplb2YoY3J0Y19zdGF0ZS0+dWFw aSkpOwotCisJbWVtY3B5KGNydGNfc3RhdGUsIHNhdmVkX3N0YXRlLCBzaXplb2YoKmNydGNfc3Rh dGUpKTsKIAlrZnJlZShzYXZlZF9zdGF0ZSk7CisKKwlpbnRlbF9jcnRjX2NvcHlfdWFwaV90b19o d19zdGF0ZShjcnRjX3N0YXRlKTsKKwogCXJldHVybiAwOwogfQogCkBAIC0xMjUzOCwxMCArMTI1 NjUsNiBAQCBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpwaXBlX2NvbmZpZykKIAlpbnQgaTsKIAlib29sIHJldHJ5ID0gdHJ1ZTsKIAotCXJldCA9IGNs ZWFyX2ludGVsX2NydGNfc3RhdGUocGlwZV9jb25maWcpOwotCWlmIChyZXQpCi0JCXJldHVybiBy ZXQ7Ci0KIAlwaXBlX2NvbmZpZy0+Y3B1X3RyYW5zY29kZXIgPQogCQkoZW51bSB0cmFuc2NvZGVy KSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlOwogCkBAIC0xMzM2MSw2ICsxMzM4NCw4IEBAIHZl cmlmeV9jcnRjX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCiAJc3RhdGUgPSBvbGRf Y3J0Y19zdGF0ZS0+dWFwaS5zdGF0ZTsKIAlfX2RybV9hdG9taWNfaGVscGVyX2NydGNfZGVzdHJv eV9zdGF0ZSgmb2xkX2NydGNfc3RhdGUtPnVhcGkpOworCWludGVsX2NydGNfZnJlZV9od19zdGF0 ZShvbGRfY3J0Y19zdGF0ZSk7CisKIAlwaXBlX2NvbmZpZyA9IG9sZF9jcnRjX3N0YXRlOwogCW1l bXNldChwaXBlX2NvbmZpZywgMCwgc2l6ZW9mKCpwaXBlX2NvbmZpZykpOwogCXBpcGVfY29uZmln LT51YXBpLmNydGMgPSAmY3J0Yy0+YmFzZTsKQEAgLTEzODIzLDYgKzEzODQ4LDEwIEBAIHN0YXRp YyBpbnQgaW50ZWxfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlmb3Jf ZWFjaF9vbGRuZXdfaW50ZWxfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3Rh dGUsCiAJCQkJCSAgICBuZXdfY3J0Y19zdGF0ZSwgaSkgeworCQlyZXQgPSBpbnRlbF9jcnRjX3By ZXBhcmVfc3RhdGUobmV3X2NydGNfc3RhdGUpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsK KwogCQlpZiAoIW5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpKQogCQkJY29udGludWU7CiAK QEAgLTE3MDk5LDYgKzE3MTI4LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0 X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQl0b19pbnRlbF9jcnRjX3N0YXRl KGNydGMtPmJhc2Uuc3RhdGUpOwogCiAJCV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kZXN0cm95 X3N0YXRlKCZjcnRjX3N0YXRlLT51YXBpKTsKKwkJaW50ZWxfY3J0Y19mcmVlX2h3X3N0YXRlKGNy dGNfc3RhdGUpOwogCQltZW1zZXQoY3J0Y19zdGF0ZSwgMCwgc2l6ZW9mKCpjcnRjX3N0YXRlKSk7 CiAJCV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19yZXNldCgmY3J0Yy0+YmFzZSwgJmNydGNfc3Rh dGUtPnVhcGkpOwogCkBAIC0xNzIyNyw2ICsxNzI1Nyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX21v ZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJICogc2V0 IGEgZmxhZyB0byBpbmRpY2F0ZSB0aGF0IGEgZnVsbCByZWNhbGN1bGF0aW9uIGlzCiAJCQkgKiBu ZWVkZWQgb24gdGhlIG5leHQgY29tbWl0LgogCQkJICovCisJCQljcnRjX3N0YXRlLT5ody5tb2Rl ID0gY3J0Yy0+YmFzZS5tb2RlOwogCQkJY3J0Y19zdGF0ZS0+aHcubW9kZS5wcml2YXRlX2ZsYWdz ID0gSTkxNV9NT0RFX0ZMQUdfSU5IRVJJVEVEOwogCiAJCQlpbnRlbF9jcnRjX2NvbXB1dGVfcGl4 ZWxfcmF0ZShjcnRjX3N0YXRlKTsKQEAgLTE3MjU3LDYgKzE3Mjg4LDcgQEAgc3RhdGljIHZvaWQg aW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAK IAkJaW50ZWxfYndfY3J0Y191cGRhdGUoYndfc3RhdGUsIGNydGNfc3RhdGUpOwogCisJCWNvcHlf aHdfdG9fdWFwaV9zdGF0ZShjcnRjX3N0YXRlKTsKIAkJaW50ZWxfcGlwZV9jb25maWdfc2FuaXR5 X2NoZWNrKGRldl9wcml2LCBjcnRjX3N0YXRlKTsKIAl9CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oCmluZGV4IDQ2OTdmNzE5YjNh OC4uMTdjOWVjMzAwZjE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXlfdHlwZXMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXlfdHlwZXMuaApAQCAtNzQ5LDggKzc0OSw2IEBAIGVudW0gaW50ZWxfb3V0 cHV0X2Zvcm1hdCB7CiB9OwogCiBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7Ci0JdW5pb24gewot CXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSBiYXNlOwogCS8qCiAJICogdWFwaSAoZHJtKSBzdGF0ZS4g VGhpcyBpcyB0aGUgc29mdHdhcmUgc3RhdGUgc2hvd24gdG8gdXNlcnNwYWNlLgogCSAqIEluIHBh cnRpY3VsYXIsIHRoZSBmb2xsb3dpbmcgbWVtYmVycyBhcmUgdXNlZCBmb3IgYm9va2tlZXBpbmc6 CkBAIC03NzMsOCArNzcxLDExIEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAkgKgogCSAq IER1cmluZyBpbml0aWFsIGh3IHJlYWRvdXQsIHRoZXkgbmVlZCB0byBiZSBjb3BpZWQgdG8gdWFw aS4KIAkgKi8KLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgaHc7Ci0JfTsKKwlzdHJ1Y3QgeworCQli b29sIGFjdGl2ZSwgZW5hYmxlOworCQlzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmRlZ2FtbWFf bHV0LCAqZ2FtbWFfbHV0LCAqY3RtOworCQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSBtb2RlLCBh ZGp1c3RlZF9tb2RlOworCX0gaHc7CiAKIAkvKioKIAkgKiBxdWlya3MgLSBiaXRmaWVsZCB3aXRo IGh3IHN0YXRlIHJlYWRvdXQgcXVpcmtzCi0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51882CA9EAF for ; Thu, 24 Oct 2019 12:48:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EB41205C9 for ; Thu, 24 Oct 2019 12:48:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EB41205C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C91286E3C4; Thu, 24 Oct 2019 12:48:24 +0000 (UTC) Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B7EA6E3CB for ; Thu, 24 Oct 2019 12:48:11 +0000 (UTC) From: Maarten Lankhorst To: intel-gfx@lists.freedesktop.org Date: Thu, 24 Oct 2019 14:47:59 +0200 Message-Id: <20191024124805.26840-8-maarten.lankhorst@linux.intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191024124805.26840-1-maarten.lankhorst@linux.intel.com> References: <20191024124805.26840-1-maarten.lankhorst@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 08/14] drm/i915: Complete crtc hw/uapi split, v3. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Message-ID: <20191024124759.6GcQbFqJNQ39QRelzu18jE6YviyE_i4bvWuCXSwdAIQ@z> Tm93IHRoYXQgd2Ugc2VwYXJhdGVkIGV2ZXJ5dGhpbmcgaW50byB1YXBpIGFuZCBodywgaXQncwp0 aW1lIHRvIG1ha2UgdGhlIHNwbGl0IGRlZmluaXRpdmUuIFJlbW92ZSB0aGUgdW5pb24gYW5kCm1h a2UgYSBjb3B5IG9mIHRoZSBodyBzdGF0ZSBvbiBtb2Rlc2V0IGFuZCBmYXN0c2V0LgoKQ29sb3Ig YmxvYnMgYXJlIGNvcGllZCBpbiBjcnRjIGF0b21pY19jaGVjaygpLCByaWdodApiZWZvcmUgY29s b3IgbWFuYWdlbWVudCBpcyBjaGVja2VkLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBDb3B5IGFsbCBi bG9icyBpbW1lZGlhdGVseSBhZnRlciBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19tb2Rlc2V0KCku Ci0gQ2xlYXIgY3J0Y19zdGF0ZS0+aHcgb24gZGlzYWJsZSwgaW5zdGVhZCBvZiB1c2luZyBjbGVh cl9pbnRlbF9jcnRjX3N0YXRlKCkuCkNoYW5nZXMgc2luY2UgdjI6Ci0gVXNlIGludGVsX2NydGNf ZnJlZV9od19zdGF0ZSArIGNsZWFyIGluIGludGVsX2NydGNfZGlzYWJsZV9ub2F0b21pYygpLgot IE1ha2UgYSBpbnRlbF9jcnRjX3ByZXBhcmVfc3RhdGUoKSBmdW5jdGlvbiB0aGF0IGNsZWFycyB0 aGUgY3J0Y19zdGF0ZQogIGFuZCBjb3BpZXMgaHcgbWVtYmVycy4KLSBSZW1vdmUgc2V0dGluZyB1 YXBpLmFkanVzdGVkX21vZGUsIHdlIG5vdyBoYXZlIGEgZGlyZWN0IGNhbGwgdG8KICBkcm1fY2Fs Y190aW1lc3RhbXBpbmdfY29uc3RhbnRzKCkuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmto b3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmMgICB8IDQ0ICsrKysrKysrKysrKysrKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWMuaCAgIHwgIDIgKwogZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgIHwgNTYgKysrKysrKysr KysrKysrLS0tLQogLi4uL2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oICAg IHwgIDkgKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDk1IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRv bWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pYy5jCmluZGV4 IDdjZjEzYjljN2QzOC4uMjY2ZDBjZTlkMDNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfYXRvbWljLmMKQEAgLTE5NSw2ICsxOTUsMTQgQEAgaW50ZWxfY3J0Y19kdXBs aWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJX19kcm1fYXRvbWljX2hlbHBl cl9jcnRjX2R1cGxpY2F0ZV9zdGF0ZShjcnRjLCAmY3J0Y19zdGF0ZS0+dWFwaSk7CiAKKwkvKiBj b3B5IGNvbG9yIGJsb2JzICovCisJaWYgKGNydGNfc3RhdGUtPmh3LmRlZ2FtbWFfbHV0KQorCQlk cm1fcHJvcGVydHlfYmxvYl9nZXQoY3J0Y19zdGF0ZS0+aHcuZGVnYW1tYV9sdXQpOworCWlmIChj cnRjX3N0YXRlLT5ody5jdG0pCisJCWRybV9wcm9wZXJ0eV9ibG9iX2dldChjcnRjX3N0YXRlLT5o dy5jdG0pOworCWlmIChjcnRjX3N0YXRlLT5ody5nYW1tYV9sdXQpCisJCWRybV9wcm9wZXJ0eV9i bG9iX2dldChjcnRjX3N0YXRlLT5ody5nYW1tYV9sdXQpOworCiAJY3J0Y19zdGF0ZS0+dXBkYXRl X3BpcGUgPSBmYWxzZTsKIAljcnRjX3N0YXRlLT5kaXNhYmxlX2xwX3dtID0gZmFsc2U7CiAJY3J0 Y19zdGF0ZS0+ZGlzYWJsZV9jeHNyID0gZmFsc2U7CkBAIC0yMDgsNiArMjE2LDQxIEBAIGludGVs X2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlyZXR1cm4gJmNy dGNfc3RhdGUtPnVhcGk7CiB9CiAKK3N0YXRpYyB2b2lkIGludGVsX2NydGNfcHV0X2NvbG9yX2Js b2JzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQoreworCWRybV9wcm9wZXJ0 eV9ibG9iX3B1dChjcnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dCk7CisJZHJtX3Byb3BlcnR5X2Js b2JfcHV0KGNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCk7CisJZHJtX3Byb3BlcnR5X2Jsb2JfcHV0 KGNydGNfc3RhdGUtPmh3LmN0bSk7Cit9CisKK3ZvaWQgaW50ZWxfY3J0Y19mcmVlX2h3X3N0YXRl KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQoreworCWludGVsX2NydGNfcHV0 X2NvbG9yX2Jsb2JzKGNydGNfc3RhdGUpOworfQorCit2b2lkIGludGVsX2NydGNfY29weV9jb2xv cl9ibG9icyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3sKKwlpbnRlbF9j cnRjX3B1dF9jb2xvcl9ibG9icyhjcnRjX3N0YXRlKTsKKworCWlmIChjcnRjX3N0YXRlLT51YXBp LmRlZ2FtbWFfbHV0KQorCQljcnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dCA9CisJCQlkcm1fcHJv cGVydHlfYmxvYl9nZXQoY3J0Y19zdGF0ZS0+dWFwaS5kZWdhbW1hX2x1dCk7CisJZWxzZQorCQlj cnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dCA9IE5VTEw7CisKKwlpZiAoY3J0Y19zdGF0ZS0+dWFw aS5nYW1tYV9sdXQpCisJCWNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCA9CisJCQlkcm1fcHJvcGVy dHlfYmxvYl9nZXQoY3J0Y19zdGF0ZS0+dWFwaS5nYW1tYV9sdXQpOworCWVsc2UKKwkJY3J0Y19z dGF0ZS0+aHcuZ2FtbWFfbHV0ID0gTlVMTDsKKworCWlmIChjcnRjX3N0YXRlLT51YXBpLmN0bSkK KwkJY3J0Y19zdGF0ZS0+aHcuY3RtID0KKwkJCWRybV9wcm9wZXJ0eV9ibG9iX2dldChjcnRjX3N0 YXRlLT51YXBpLmN0bSk7CisJZWxzZQorCQljcnRjX3N0YXRlLT5ody5jdG0gPSBOVUxMOworfQor CiAvKioKICAqIGludGVsX2NydGNfZGVzdHJveV9zdGF0ZSAtIGRlc3Ryb3kgY3J0YyBzdGF0ZQog ICogQGNydGM6IGRybSBjcnRjCkBAIC0yMjMsNiArMjY2LDcgQEAgaW50ZWxfY3J0Y19kZXN0cm95 X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoc3RhdGUpOwogCiAJX19kcm1fYXRvbWlj X2hlbHBlcl9jcnRjX2Rlc3Ryb3lfc3RhdGUoJmNydGNfc3RhdGUtPnVhcGkpOworCWludGVsX2Ny dGNfZnJlZV9od19zdGF0ZShjcnRjX3N0YXRlKTsKIAlrZnJlZShjcnRjX3N0YXRlKTsKIH0KIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWMuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmgKaW5kZXggNTgwNjVk MzE2MWEzLi40MmJlOTFlMDc3MmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfYXRvbWljLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9hdG9taWMuaApAQCAtMzUsNiArMzUsOCBAQCBpbnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9k dXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rvcik7CiBzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKmludGVsX2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY3J0 YyAqY3J0Yyk7CiB2b2lkIGludGVsX2NydGNfZGVzdHJveV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJCQkgICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSk7Cit2b2lkIGlu dGVsX2NydGNfZnJlZV9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSk7Cit2b2lkIGludGVsX2NydGNfY29weV9jb2xvcl9ibG9icyhzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSk7CiBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqaW50ZWxfYXRvbWlj X3N0YXRlX2FsbG9jKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbnRlbF9hdG9taWNf c3RhdGVfY2xlYXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwppbmRleCAxMWRkN2ExODI1NDMu LjJkYmMxZGY5NTA1YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5LmMKQEAgLTcxMTAsNiArNzExMCw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlz YWJsZV9ub2F0b21pYyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJY3J0Yy0+ZW5hYmxlZCA9IGZh bHNlOwogCWNydGMtPnN0YXRlLT5jb25uZWN0b3JfbWFzayA9IDA7CiAJY3J0Yy0+c3RhdGUtPmVu Y29kZXJfbWFzayA9IDA7CisJaW50ZWxfY3J0Y19mcmVlX2h3X3N0YXRlKGNydGNfc3RhdGUpOwor CW1lbXNldCgmY3J0Y19zdGF0ZS0+aHcsIDAsIHNpemVvZihjcnRjX3N0YXRlLT5odykpOwogCiAJ Zm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGNydGMtPmRldiwgY3J0YywgZW5jb2RlcikKIAkJZW5j b2Rlci0+YmFzZS5jcnRjID0gTlVMTDsKQEAgLTEyNDgyLDIyICsxMjQ4NCw1MCBAQCBzdGF0aWMg Ym9vbCBjaGVja19kaWdpdGFsX3BvcnRfY29uZmxpY3RzKHN0cnVjdCBpbnRlbF9hdG9taWNfc3Rh dGUgKnN0YXRlKQogCXJldHVybiByZXQ7CiB9CiAKK3N0YXRpYyB2b2lkCitpbnRlbF9jcnRjX2Nv cHlfdWFwaV90b19od19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkK K3sKKwljcnRjX3N0YXRlLT5ody5lbmFibGUgPSBjcnRjX3N0YXRlLT51YXBpLmVuYWJsZTsKKwlj cnRjX3N0YXRlLT5ody5hY3RpdmUgPSBjcnRjX3N0YXRlLT51YXBpLmFjdGl2ZTsKKwljcnRjX3N0 YXRlLT5ody5tb2RlID0gY3J0Y19zdGF0ZS0+dWFwaS5tb2RlOworCWNydGNfc3RhdGUtPmh3LmFk anVzdGVkX21vZGUgPSBjcnRjX3N0YXRlLT51YXBpLmFkanVzdGVkX21vZGU7CisJaW50ZWxfY3J0 Y19jb3B5X2NvbG9yX2Jsb2JzKGNydGNfc3RhdGUpOworfQorCitzdGF0aWMgdm9pZCBjb3B5X2h3 X3RvX3VhcGlfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJ Y3J0Y19zdGF0ZS0+dWFwaS5lbmFibGUgPSBjcnRjX3N0YXRlLT5ody5lbmFibGU7CisJY3J0Y19z dGF0ZS0+dWFwaS5hY3RpdmUgPSBjcnRjX3N0YXRlLT5ody5hY3RpdmU7CisJY3J0Y19zdGF0ZS0+ dWFwaS5tb2RlID0gY3J0Y19zdGF0ZS0+aHcubW9kZTsKKwljcnRjX3N0YXRlLT51YXBpLmFkanVz dGVkX21vZGUgPSBjcnRjX3N0YXRlLT5ody5hZGp1c3RlZF9tb2RlOworfQorCiBzdGF0aWMgaW50 Ci1jbGVhcl9pbnRlbF9jcnRjX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlKQoraW50ZWxfY3J0Y19wcmVwYXJlX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9CiAJCXRv X2k5MTUoY3J0Y19zdGF0ZS0+dWFwaS5jcnRjLT5kZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpzYXZlZF9zdGF0ZTsKIAorCWlmICghbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkgewor CQkvKiBPbmx5IG5lZWQgdG8gdXBkYXRlIGNydGNfc3RhdGUtPmh3IGNvbG9yIGJsb2JzICovCisJ CWludGVsX2NydGNfY29weV9jb2xvcl9ibG9icyhjcnRjX3N0YXRlKTsKKwkJcmV0dXJuIDA7CisJ fQorCiAJc2F2ZWRfc3RhdGUgPSBremFsbG9jKHNpemVvZigqc2F2ZWRfc3RhdGUpLCBHRlBfS0VS TkVMKTsKIAlpZiAoIXNhdmVkX3N0YXRlKQogCQlyZXR1cm4gLUVOT01FTTsKIAorCS8qIGZyZWUg dGhlIG9sZCBjcnRjX3N0YXRlLT5odyBtZW1iZXJzICovCisJaW50ZWxfY3J0Y19mcmVlX2h3X3N0 YXRlKGNydGNfc3RhdGUpOworCiAJLyogRklYTUU6IGJlZm9yZSB0aGUgc3dpdGNoIHRvIGF0b21p YyBzdGFydGVkLCBhIG5ldyBwaXBlX2NvbmZpZyB3YXMKIAkgKiBremFsbG9jJ2QuIENvZGUgdGhh dCBkZXBlbmRzIG9uIGFueSBmaWVsZCBiZWluZyB6ZXJvIHNob3VsZCBiZQogCSAqIGZpeGVkLCBz byB0aGF0IHRoZSBjcnRjX3N0YXRlIGNhbiBiZSBzYWZlbHkgZHVwbGljYXRlZC4gRm9yIG5vdywK IAkgKiBvbmx5IGZpZWxkcyB0aGF0IGFyZSBrbm93IHRvIG5vdCBjYXVzZSBwcm9ibGVtcyBhcmUg cHJlc2VydmVkLiAqLwogCisJc2F2ZWRfc3RhdGUtPnVhcGkgPSBjcnRjX3N0YXRlLT51YXBpOwog CXNhdmVkX3N0YXRlLT5zY2FsZXJfc3RhdGUgPSBjcnRjX3N0YXRlLT5zY2FsZXJfc3RhdGU7CiAJ c2F2ZWRfc3RhdGUtPnNoYXJlZF9kcGxsID0gY3J0Y19zdGF0ZS0+c2hhcmVkX2RwbGw7CiAJc2F2 ZWRfc3RhdGUtPmRwbGxfaHdfc3RhdGUgPSBjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlOwpAQCAt MTI1MTUsMTQgKzEyNTQ1LDExIEBAIGNsZWFyX2ludGVsX2NydGNfc3RhdGUoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCXNhdmVkX3N0YXRlLT5zeW5jX21vZGVfc2xhdmVz X21hc2sgPQogCQkJY3J0Y19zdGF0ZS0+c3luY19tb2RlX3NsYXZlc19tYXNrOwogCi0JLyogS2Vl cCBiYXNlIGRybV9jcnRjX3N0YXRlIGludGFjdCwgb25seSBjbGVhciBvdXIgZXh0ZW5kZWQgc3Ry dWN0ICovCi0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlLCBi YXNlKSk7Ci0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlLCB1 YXBpKSk7Ci0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlLCBo dykpOwotCW1lbWNweSgmY3J0Y19zdGF0ZS0+dWFwaSArIDEsICZzYXZlZF9zdGF0ZS0+dWFwaSAr IDEsCi0JICAgICAgIHNpemVvZigqY3J0Y19zdGF0ZSkgLSBzaXplb2YoY3J0Y19zdGF0ZS0+dWFw aSkpOwotCisJbWVtY3B5KGNydGNfc3RhdGUsIHNhdmVkX3N0YXRlLCBzaXplb2YoKmNydGNfc3Rh dGUpKTsKIAlrZnJlZShzYXZlZF9zdGF0ZSk7CisKKwlpbnRlbF9jcnRjX2NvcHlfdWFwaV90b19o d19zdGF0ZShjcnRjX3N0YXRlKTsKKwogCXJldHVybiAwOwogfQogCkBAIC0xMjUzOCwxMCArMTI1 NjUsNiBAQCBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpwaXBlX2NvbmZpZykKIAlpbnQgaTsKIAlib29sIHJldHJ5ID0gdHJ1ZTsKIAotCXJldCA9IGNs ZWFyX2ludGVsX2NydGNfc3RhdGUocGlwZV9jb25maWcpOwotCWlmIChyZXQpCi0JCXJldHVybiBy ZXQ7Ci0KIAlwaXBlX2NvbmZpZy0+Y3B1X3RyYW5zY29kZXIgPQogCQkoZW51bSB0cmFuc2NvZGVy KSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlOwogCkBAIC0xMzM2MSw2ICsxMzM4NCw4IEBAIHZl cmlmeV9jcnRjX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCiAJc3RhdGUgPSBvbGRf Y3J0Y19zdGF0ZS0+dWFwaS5zdGF0ZTsKIAlfX2RybV9hdG9taWNfaGVscGVyX2NydGNfZGVzdHJv eV9zdGF0ZSgmb2xkX2NydGNfc3RhdGUtPnVhcGkpOworCWludGVsX2NydGNfZnJlZV9od19zdGF0 ZShvbGRfY3J0Y19zdGF0ZSk7CisKIAlwaXBlX2NvbmZpZyA9IG9sZF9jcnRjX3N0YXRlOwogCW1l bXNldChwaXBlX2NvbmZpZywgMCwgc2l6ZW9mKCpwaXBlX2NvbmZpZykpOwogCXBpcGVfY29uZmln LT51YXBpLmNydGMgPSAmY3J0Yy0+YmFzZTsKQEAgLTEzODIzLDYgKzEzODQ4LDEwIEBAIHN0YXRp YyBpbnQgaW50ZWxfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlmb3Jf ZWFjaF9vbGRuZXdfaW50ZWxfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3Rh dGUsCiAJCQkJCSAgICBuZXdfY3J0Y19zdGF0ZSwgaSkgeworCQlyZXQgPSBpbnRlbF9jcnRjX3By ZXBhcmVfc3RhdGUobmV3X2NydGNfc3RhdGUpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsK KwogCQlpZiAoIW5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpKQogCQkJY29udGludWU7CiAK QEAgLTE3MDk5LDYgKzE3MTI4LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0 X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQl0b19pbnRlbF9jcnRjX3N0YXRl KGNydGMtPmJhc2Uuc3RhdGUpOwogCiAJCV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kZXN0cm95 X3N0YXRlKCZjcnRjX3N0YXRlLT51YXBpKTsKKwkJaW50ZWxfY3J0Y19mcmVlX2h3X3N0YXRlKGNy dGNfc3RhdGUpOwogCQltZW1zZXQoY3J0Y19zdGF0ZSwgMCwgc2l6ZW9mKCpjcnRjX3N0YXRlKSk7 CiAJCV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19yZXNldCgmY3J0Yy0+YmFzZSwgJmNydGNfc3Rh dGUtPnVhcGkpOwogCkBAIC0xNzIyNyw2ICsxNzI1Nyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX21v ZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJICogc2V0 IGEgZmxhZyB0byBpbmRpY2F0ZSB0aGF0IGEgZnVsbCByZWNhbGN1bGF0aW9uIGlzCiAJCQkgKiBu ZWVkZWQgb24gdGhlIG5leHQgY29tbWl0LgogCQkJICovCisJCQljcnRjX3N0YXRlLT5ody5tb2Rl ID0gY3J0Yy0+YmFzZS5tb2RlOwogCQkJY3J0Y19zdGF0ZS0+aHcubW9kZS5wcml2YXRlX2ZsYWdz ID0gSTkxNV9NT0RFX0ZMQUdfSU5IRVJJVEVEOwogCiAJCQlpbnRlbF9jcnRjX2NvbXB1dGVfcGl4 ZWxfcmF0ZShjcnRjX3N0YXRlKTsKQEAgLTE3MjU3LDYgKzE3Mjg4LDcgQEAgc3RhdGljIHZvaWQg aW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAK IAkJaW50ZWxfYndfY3J0Y191cGRhdGUoYndfc3RhdGUsIGNydGNfc3RhdGUpOwogCisJCWNvcHlf aHdfdG9fdWFwaV9zdGF0ZShjcnRjX3N0YXRlKTsKIAkJaW50ZWxfcGlwZV9jb25maWdfc2FuaXR5 X2NoZWNrKGRldl9wcml2LCBjcnRjX3N0YXRlKTsKIAl9CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oCmluZGV4IDQ2OTdmNzE5YjNh OC4uMTdjOWVjMzAwZjE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXlfdHlwZXMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXlfdHlwZXMuaApAQCAtNzQ5LDggKzc0OSw2IEBAIGVudW0gaW50ZWxfb3V0 cHV0X2Zvcm1hdCB7CiB9OwogCiBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7Ci0JdW5pb24gewot CXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSBiYXNlOwogCS8qCiAJICogdWFwaSAoZHJtKSBzdGF0ZS4g VGhpcyBpcyB0aGUgc29mdHdhcmUgc3RhdGUgc2hvd24gdG8gdXNlcnNwYWNlLgogCSAqIEluIHBh cnRpY3VsYXIsIHRoZSBmb2xsb3dpbmcgbWVtYmVycyBhcmUgdXNlZCBmb3IgYm9va2tlZXBpbmc6 CkBAIC03NzMsOCArNzcxLDExIEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAkgKgogCSAq IER1cmluZyBpbml0aWFsIGh3IHJlYWRvdXQsIHRoZXkgbmVlZCB0byBiZSBjb3BpZWQgdG8gdWFw aS4KIAkgKi8KLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgaHc7Ci0JfTsKKwlzdHJ1Y3QgeworCQli b29sIGFjdGl2ZSwgZW5hYmxlOworCQlzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmRlZ2FtbWFf bHV0LCAqZ2FtbWFfbHV0LCAqY3RtOworCQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSBtb2RlLCBh ZGp1c3RlZF9tb2RlOworCX0gaHc7CiAKIAkvKioKIAkgKiBxdWlya3MgLSBiaXRmaWVsZCB3aXRo IGh3IHN0YXRlIHJlYWRvdXQgcXVpcmtzCi0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==