From: Matt Roper Subject: [PATCH 3/4] drm/i915: Calculate an intermediate atomic state for modesets (v2) Date: Wed, 9 Sep 2015 18:57:54 -0700 Message-ID: <1441850275-20353-4-git-send-email-matthew.d.roper@intel.com> References: <1441850275-20353-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id AF378721A3 for ; Wed, 9 Sep 2015 18:58:40 -0700 (PDT) In-Reply-To: <1441850275-20353-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 VG8gc2ltcGxpZnkgdGhlIG1vZGVzZXQgcHJvY2VzcyBmb3IgYXRvbWljLCBzdGFydCBjYWxjdWxh dGluZyBhbgoiaW50ZXJtZWRpYXRlIiBzdGF0ZS4gIFRoaXMgc3RhdGUgb25seSBtb2RpZmllcyBD UlRDJ3MgdGhhdCB1bmRlcmdvIGEKbW9kZXNldCAob3IgZGlzYWJsZSkuLi5pbiB0aGF0IGNhc2Ug aXQgd2lsbCBiZSBhIGNvcHkgb2YgdGhlIGZpbmFsIHN0YXRlCndpdGggLT5hY3RpdmUgc2V0IHRv IGZhbHNlICh3aGljaCB3aWxsIGluIHR1cm4gY2F1c2UgdmFyaW91cyBkZXJpdmVkCnN0YXRlIHRv IGJlIGNhbGN1bGF0ZWQgZGlmZmVyZW50bHkpLiAgVGhpcyBzdGF0ZSByZXByZXNlbnRzIHRoZSBz dGF0dXMKb2YgdGhlIENSVEMgYW5kIHBsYW5lcyBhdCB0aGUgcG9pbnQgaW4gd2hpY2ggdGhlIENS VEMncyBoYXZlIGJlZW4KZGlzYWJsZWQgZXZlbiBpZiB0aGUgQ1JUQyB3aWxsIGJlIHJ1bm5pbmcg YWdhaW4gb25jZSB0aGUgZnVsbCBtb2Rlc2V0IGlzCmNvbXBsZXRlLiAgVGhpcyB3aWxsIGFsbG93 IHVzIHRvIGNhbGN1bGF0ZSBwcm9wZXIgZGVyaXZlZCBzdGF0ZSBmaWVsZHMKZm9yIHRoaXMgcG9p bnQgaW4gdGhlIG1vZGVzZXQgcHJvY2VzcyB3aGljaCBzaG91bGQgaW4gdHVybiBzaG91bGQgaGVs cAp1cyBwcm9wZXJseSBwZXJmb3JtIHRhc2tzIGxpa2Ugd2F0ZXJtYXJrIGNhbGN1bGF0aW9uIHdp dGggbGVzcyBzcGVjaWFsCmNhc2VzLgoKRm9yIHJldmlldyBzaW1wbGljaXR5LCB0aGlzIHBhdGNo IHNpbXBseSBhbGxvY2F0ZXMgYW5kIGNhbGN1bGF0ZXMgdGhlCmludGVybWVkaWF0ZSBzdGF0ZSwg YnV0IGRvZXNuJ3QgYWN0dWFsbHkgZG8gYW55dGhpbmcgd2l0aCBpdCB5ZXQuClRoZSBuZXh0IHBh dGNoIHdpbGwgc3RhcnQgYWN0dWFsbHkgdXNpbmcgdGhpcyBpbnRlcm1lZGlhdGUgc3RhdGUgZGF0 YS4KCnYyOgogLSBVc2UgYSB3aG9sZSBuZXcgdG9wLWxldmVsIHN0YXRlIG9iamVjdCByYXRoZXIg dGhhbiBqdXN0IHN0aWNraW5nCiAgIGV4dHJhIHBsYW5lIHN0YXRlIGFuZCBjcnRjIHN0YXRlIGFy cmF5cyBpbiB0aGUgZXhpc3RpbmcKICAgaW50ZWxfYXRvbWljX3N0YXRlIG9iamVjdC4gIChWaWxs ZSkKCkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpT aWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jICAgICAgIHwgMTQyICsrKysrKysr KysrKysrKysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWlj X3BsYW5lLmMgfCAgMzYgKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyAgICAgIHwgICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAg ICAgICB8ICAxNCArKysKIDQgZmlsZXMgY2hhbmdlZCwgMTYwIGluc2VydGlvbnMoKyksIDM1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21p Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKaW5kZXggNDViMjFhYy4u MDQ4NzA3MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKQEAgLTc0LDMyICs3NCwy MyBAQCBpbnRlbF9jb25uZWN0b3JfYXRvbWljX2dldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqY29ubmVjdG9yLAogfQogCiAvKgotICogaW50ZWxfY3J0Y19kdXBsaWNhdGVfc3RhdGUg LSBkdXBsaWNhdGUgY3J0YyBzdGF0ZQotICogQGNydGM6IGRybSBjcnRjCi0gKgotICogQWxsb2Nh dGVzIGFuZCByZXR1cm5zIGEgY29weSBvZiB0aGUgY3J0YyBzdGF0ZSAoYm90aCBjb21tb24gYW5k Ci0gKiBJbnRlbC1zcGVjaWZpYykgZm9yIHRoZSBzcGVjaWZpZWQgY3J0Yy4KLSAqCi0gKiBSZXR1 cm5zOiBUaGUgbmV3bHkgYWxsb2NhdGVkIGNydGMgc3RhdGUsIG9yIE5VTEwgb24gZmFpbHVyZS4K KyAqIER1cGxpY2F0ZSBhbnkgQ1JUQyBzdGF0ZSAobm90IGp1c3QgYW4gYWxyZWFkeSBjb21taXR0 ZWQgc3RhdGUpLgogICovCi1zdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKgotaW50ZWxfY3J0Y19kdXBs aWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHN0cnVjdCBkcm1fY3J0 Y19zdGF0ZSAqCitfX2ludGVsX2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY3J0Y19z dGF0ZSAqY3MpCiB7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNydGMpOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCi0JaWYg KFdBUk5fT04oIWludGVsX2NydGMtPmNvbmZpZykpCisJaWYgKFdBUk5fT04oIWNzKSkKIAkJY3J0 Y19zdGF0ZSA9IGt6YWxsb2Moc2l6ZW9mKCpjcnRjX3N0YXRlKSwgR0ZQX0tFUk5FTCk7CiAJZWxz ZQotCQljcnRjX3N0YXRlID0ga21lbWR1cChpbnRlbF9jcnRjLT5jb25maWcsCi0JCQkJICAgICBz aXplb2YoKmludGVsX2NydGMtPmNvbmZpZyksIEdGUF9LRVJORUwpOwotCisJCWNydGNfc3RhdGUg PSBrbWVtZHVwKGNzLCBzaXplb2YoKmNydGNfc3RhdGUpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIWNy dGNfc3RhdGUpCiAJCXJldHVybiBOVUxMOwogCi0JX19kcm1fYXRvbWljX2hlbHBlcl9jcnRjX2R1 cGxpY2F0ZV9zdGF0ZShjcnRjLT5zdGF0ZSwgJmNydGNfc3RhdGUtPmJhc2UpOworCV9fZHJtX2F0 b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUoY3MsICZjcnRjX3N0YXRlLT5iYXNlKTsK IAotCWNydGNfc3RhdGUtPmJhc2UuY3J0YyA9IGNydGM7CisJY3J0Y19zdGF0ZS0+YmFzZS5jcnRj ID0gY3MtPmNydGM7CiAKIAljcnRjX3N0YXRlLT53YWl0X2Zvcl9mbGlwcyA9IGZhbHNlOwogCWNy dGNfc3RhdGUtPmRpc2FibGVfZmJjID0gZmFsc2U7CkBAIC0xMTgsNiArMTA5LDIxIEBAIGludGVs X2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlyZXR1cm4gJmNy dGNfc3RhdGUtPmJhc2U7CiB9CiAKKy8qCisgKiBpbnRlbF9jcnRjX2R1cGxpY2F0ZV9zdGF0ZSAt IGR1cGxpY2F0ZSBjcnRjIHN0YXRlCisgKiBAY3J0YzogZHJtIGNydGMKKyAqCisgKiBBbGxvY2F0 ZXMgYW5kIHJldHVybnMgYSBjb3B5IG9mIHRoZSBjcnRjIHN0YXRlIChib3RoIGNvbW1vbiBhbmQK KyAqIEludGVsLXNwZWNpZmljKSBmb3IgdGhlIHNwZWNpZmllZCBjcnRjLgorICoKKyAqIFJldHVy bnM6IFRoZSBuZXdseSBhbGxvY2F0ZWQgY3J0YyBzdGF0ZSwgb3IgTlVMTCBvbiBmYWlsdXJlLgor ICovCitzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKgoraW50ZWxfY3J0Y19kdXBsaWNhdGVfc3RhdGUo c3RydWN0IGRybV9jcnRjICpjcnRjKQoreworCXJldHVybiBfX2ludGVsX2NydGNfZHVwbGljYXRl X3N0YXRlKGNydGMtPnN0YXRlKTsKK30KKwogLyoqCiAgKiBpbnRlbF9jcnRjX2Rlc3Ryb3lfc3Rh dGUgLSBkZXN0cm95IGNydGMgc3RhdGUKICAqIEBjcnRjOiBkcm0gY3J0YwpAQCAtMzE1LDE3ICsz MjEsMTEzIEBAIGludGVsX2F0b21pY19zdGF0ZV9hbGxvYyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogewogCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlID0ga3phbGxvYyhzaXplb2Yo KnN0YXRlKSwgR0ZQX0tFUk5FTCk7CiAKLQlpZiAoIXN0YXRlIHx8IGRybV9hdG9taWNfc3RhdGVf aW5pdChkZXYsICZzdGF0ZS0+YmFzZSkgPCAwKSB7Ci0JCWtmcmVlKHN0YXRlKTsKLQkJcmV0dXJu IE5VTEw7Ci0JfQorCWlmICghc3RhdGUgfHwgZHJtX2F0b21pY19zdGF0ZV9pbml0KGRldiwgJnN0 YXRlLT5iYXNlKSA8IDApCisJCWdvdG8gZmFpbDsKKworCS8qIEFsc28gYWxsb2NhdGUgYW4gaW50 ZXJtZWRpYXRlIHN0YXRlICovCisJc3RhdGUtPmludGVybWVkaWF0ZSA9IGt6YWxsb2Moc2l6ZW9m KCpzdGF0ZS0+aW50ZXJtZWRpYXRlKSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFzdGF0ZS0+aW50ZXJt ZWRpYXRlIHx8CisJICAgIGRybV9hdG9taWNfc3RhdGVfaW5pdChkZXYsIHN0YXRlLT5pbnRlcm1l ZGlhdGUpIDwgMCkKKwkJZ290byBmYWlsOwogCisJc3RhdGUtPmludGVybWVkaWF0ZS0+YWNxdWly ZV9jdHggPSBzdGF0ZS0+YmFzZS5hY3F1aXJlX2N0eDsKIAlyZXR1cm4gJnN0YXRlLT5iYXNlOwor CitmYWlsOgorCWlmIChzdGF0ZSkKKwkJa2ZyZWUoc3RhdGUtPmludGVybWVkaWF0ZSk7CisJZHJt X2F0b21pY19zdGF0ZV9kZWZhdWx0X3JlbGVhc2UoJnN0YXRlLT5iYXNlKTsKKwlrZnJlZShzdGF0 ZSk7CisJcmV0dXJuIE5VTEw7Cit9CisKK3ZvaWQKK2ludGVsX2F0b21pY19zdGF0ZV9mcmVlKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzKQoreworCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUg KnN0YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKHMpOworCisJaWYgKFdBUk5fT04oIXMpKQor CQlyZXR1cm47CisKKwlkcm1fYXRvbWljX3N0YXRlX2RlZmF1bHRfcmVsZWFzZShzdGF0ZS0+aW50 ZXJtZWRpYXRlKTsKKwlkcm1fYXRvbWljX3N0YXRlX2RlZmF1bHRfcmVsZWFzZShzKTsKIH0KIAog dm9pZCBpbnRlbF9hdG9taWNfc3RhdGVfY2xlYXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnMp CiB7CiAJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUgPSB0b19pbnRlbF9hdG9taWNf c3RhdGUocyk7CisKKwlkcm1fYXRvbWljX3N0YXRlX2RlZmF1bHRfY2xlYXIoc3RhdGUtPmludGVy bWVkaWF0ZSk7CiAJZHJtX2F0b21pY19zdGF0ZV9kZWZhdWx0X2NsZWFyKCZzdGF0ZS0+YmFzZSk7 CiAJc3RhdGUtPmRwbGxfc2V0ID0gZmFsc2U7CiB9CisKKy8qKgorICogaW50ZWxfYXRvbWljX2No ZWNrX3BsYW5lcyAtIHZhbGlkYXRlIHN0YXRlIG9iamVjdCBmb3IgcGxhbmVzIGNoYW5nZXMKKyAq IEBkZXY6IERSTSBkZXZpY2UKKyAqIEBzdGF0ZTogdGhlIGRyaXZlciBzdGF0ZSBvYmplY3QKKyAq CisgKiBBbiBJbnRlbC1zcGVjaWZpYyByZXBsYWNlbWVudCBmb3IgZHJtX2F0b21pY19oZWxwZXJf Y2hlY2tfcGxhbmVzKCkuICBJbgorICogYWRkaXRpb24gdG8gY2FsbGluZyB0aGUgLT5hdG9taWNf Y2hlY2soKSBlbnRyeXBvaW50cyBmb3IgYWxsIHBsYW5lL2NydGMKKyAqIHN0YXRlcyBwcmVzZW50 IGluIHRoZSBhdG9taWMgdHJhbnNhY3Rpb24sIGl0IGFsc28gY3JlYXRlcyBhbiBhZGRpdGlvbmFs CisgKiAnaW50ZXJtZWRpYXRlJyBzdGF0ZSB0aGF0IGNvcnJlc3BvbmRzIHRvIHRoZSBwb2ludCBp biB0aGUgY29tbWl0IHBpcGVsaW5lCisgKiB3aGVyZSBhbnkgQ1JUQydzIHBlcmZvcm1pbmcgYSBt b2Rlc2V0IChvciBkaXNhYmxlKSBoYXZlIGJlZW4gZGlzYWJsZWQgYnV0CisgKiBub3QgeWV0IHJl ZW5hYmxlZC4gIFNwZWNpZmljYWxseSwgY3J0Y19zdGF0ZS0+YWN0aXZlID0gZmFsc2UgZm9yIGVh Y2ggQ1JUQworICogaW52b2x2ZWQgaW4gYSBtb2Rlc2V0IGFuZCB0aGUgY29ycmVzcG9uZGluZyBk ZXJpdmVkIHN0YXRlIGlzIHVwZGF0ZWQgdG8KKyAqIHJlZmxlY3QgdGhhdC4KKyAqLworaW50Citp bnRlbF9hdG9taWNfY2hlY2tfcGxhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkgIHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0 YXRlICppc3RhdGUgPSB0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpOworCXN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICppbnRlciA9IGlzdGF0ZS0+aW50ZXJtZWRpYXRlOworCXN0cnVjdCBkcm1f Y3J0YyAqY3J0YzsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0ZTsKKwlzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZTsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGU7CisJdW5zaWdu ZWQgbmVlZHNfbXMgPSAwOworCWludCBpLCByZXQ7CisKKwkvKgorCSAqIFN0YXJ0IGJ5IGNoZWNr aW5nIGNhbGN1bGF0aW5nL2NoZWNraW5nIHRoZSBmaW5hbCBzdGF0ZSBhcyB1c3VhbDsKKwkgKiBp ZiB0aGF0IGRvZXNuJ3Qgd29yaywgdGhlbiB0aGVyZSdzIG5vIHBvaW50IGluIHdvcnJ5aW5nIGFi b3V0CisJICogaW50ZXJtZWRpYXRlIHN0YXRlcy4KKwkgKi8KKwlyZXQgPSBkcm1fYXRvbWljX2hl bHBlcl9jaGVja19wbGFuZXMoZGV2LCBzdGF0ZSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsK KworCS8qCisJICogRm9yIENSVEMncyB1bmRlcmdvaW5nIGEgbW9kZXNldCwgY29weSBDUlRDIGFu ZCBwbGFuZSBzdGF0ZSBpbnRvCisJICogdGhlIGludGVybWVkaWF0ZSBzdGF0ZSwgYnV0IHVwZGF0 ZSBjcnRjX3N0YXRlLT5hY3RpdmUgPSBmYWxzZS4KKwkgKi8KKwlmb3JfZWFjaF9jcnRjX2luX3N0 YXRlKHN0YXRlLCBjcnRjLCBjc3RhdGUsIGkpIHsKKwkJaWYgKCFkcm1fYXRvbWljX2NydGNfbmVl ZHNfbW9kZXNldChjc3RhdGUpKQorCQkJY29udGludWU7CisKKwkJbmVlZHNfbXMgfD0gZHJtX2Ny dGNfbWFzayhjcnRjKTsKKwkJaW50ZXItPmNydGNzW2ldID0gY3J0YzsKKwkJaW50ZXItPmNydGNf c3RhdGVzW2ldID0gX19pbnRlbF9jcnRjX2R1cGxpY2F0ZV9zdGF0ZShjc3RhdGUpOworCQlpbnRl ci0+Y3J0Y19zdGF0ZXNbaV0tPnN0YXRlID0gaW50ZXI7CisJCWludGVyLT5jcnRjX3N0YXRlc1tp XS0+YWN0aXZlID0gZmFsc2U7CisKKwkJaWYgKGRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0 KGNzdGF0ZSkpCisJCQlpc3RhdGUtPmFueV9tcyA9IHRydWU7CisJfQorCWZvcl9lYWNoX3BsYW5l X2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcHN0YXRlLCBpKSB7CisJCWNydGMgPSBwbGFuZS0+c3Rh dGUtPmNydGMgPzogcHN0YXRlLT5jcnRjOworCQlpZiAoIWNydGMgfHwgIShuZWVkc19tcyAmIGRy bV9jcnRjX21hc2soY3J0YykpKQorCQkJY29udGludWU7CisKKwkJaW50ZXItPnBsYW5lc1tpXSA9 IHBsYW5lOworCQlpbnRlci0+cGxhbmVfc3RhdGVzW2ldID0gX19pbnRlbF9wbGFuZV9kdXBsaWNh dGVfc3RhdGUocHN0YXRlKTsKKwkJaW50ZXItPnBsYW5lX3N0YXRlc1tpXS0+c3RhdGUgPSBpbnRl cjsKKwl9CisKKwkvKgorCSAqIFJ1biBhbGwgdGhlIHBsYW5lL2NydGMgY2hlY2sgaGFuZGxlcnMg dG8gdXBkYXRlIHRoZSBkZXJpdmVkIHN0YXRlCisJICogZmllbGRzIHRvIHJlZmxlY3QgdGhlIC0+ YWN0aXZlIGNoYW5nZS4KKwkgKi8KKwlyZXR1cm4gZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfcGxh bmVzKGRldiwgaW50ZXIpOworfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfYXRvbWljX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxh bmUuYwppbmRleCBhZmJiZmUwLi5iODkzODUzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9hdG9taWNfcGxhbmUuYwpAQCAtNjEsMzggKzYxLDQ2IEBAIGludGVsX2NyZWF0ZV9wbGFuZV9z dGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAlyZXR1cm4gc3RhdGU7CiB9CiAKLS8qKgot ICogaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlIC0gZHVwbGljYXRlIHBsYW5lIHN0YXRlCi0g KiBAcGxhbmU6IGRybSBwbGFuZQotICoKLSAqIEFsbG9jYXRlcyBhbmQgcmV0dXJucyBhIGNvcHkg b2YgdGhlIHBsYW5lIHN0YXRlIChib3RoIGNvbW1vbiBhbmQKLSAqIEludGVsLXNwZWNpZmljKSBm b3IgdGhlIHNwZWNpZmllZCBwbGFuZS4KLSAqCi0gKiBSZXR1cm5zOiBUaGUgbmV3bHkgYWxsb2Nh dGVkIHBsYW5lIHN0YXRlLCBvciBOVUxMIG9uIGZhaWx1cmUuCisvKgorICogRHVwbGljYXRlIGFu eSBwbGFuZSBzdGF0ZSAobm90IGp1c3QgYW4gYWxyZWFkeSBjb21taXR0ZWQgc3RhdGUpLgogICov CiBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICoKLWludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKK19faW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHN0 cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzKQogewogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0 YXRlOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50ZWxfc3RhdGU7CiAKLQlpZiAoV0FS Tl9PTighcGxhbmUtPnN0YXRlKSkKLQkJaW50ZWxfc3RhdGUgPSBpbnRlbF9jcmVhdGVfcGxhbmVf c3RhdGUocGxhbmUpOworCWlmIChXQVJOX09OKCFwcykpCisJCWludGVsX3N0YXRlID0gaW50ZWxf Y3JlYXRlX3BsYW5lX3N0YXRlKHBzLT5wbGFuZSk7CiAJZWxzZQotCQlpbnRlbF9zdGF0ZSA9IGtt ZW1kdXAocGxhbmUtPnN0YXRlLCBzaXplb2YoKmludGVsX3N0YXRlKSwKLQkJCQkgICAgICBHRlBf S0VSTkVMKTsKKwkJaW50ZWxfc3RhdGUgPSBrbWVtZHVwKHBzLCBzaXplb2YoKmludGVsX3N0YXRl KSwgR0ZQX0tFUk5FTCk7CiAKIAlpZiAoIWludGVsX3N0YXRlKQogCQlyZXR1cm4gTlVMTDsKIAog CXN0YXRlID0gJmludGVsX3N0YXRlLT5iYXNlOwogCi0JX19kcm1fYXRvbWljX2hlbHBlcl9wbGFu ZV9kdXBsaWNhdGVfc3RhdGUocGxhbmUtPnN0YXRlLCBzdGF0ZSk7CisJX19kcm1fYXRvbWljX2hl bHBlcl9wbGFuZV9kdXBsaWNhdGVfc3RhdGUocHMsIHN0YXRlKTsKIAogCXJldHVybiBzdGF0ZTsK IH0KIAogLyoqCisgKiBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUgLSBkdXBsaWNhdGUgcGxh bmUgc3RhdGUKKyAqIEBwbGFuZTogZHJtIHBsYW5lCisgKgorICogQWxsb2NhdGVzIGFuZCByZXR1 cm5zIGEgY29weSBvZiB0aGUgcGxhbmUgc3RhdGUgKGJvdGggY29tbW9uIGFuZAorICogSW50ZWwt c3BlY2lmaWMpIGZvciB0aGUgc3BlY2lmaWVkIHBsYW5lLgorICoKKyAqIFJldHVybnM6IFRoZSBu ZXdseSBhbGxvY2F0ZWQgcGxhbmUgc3RhdGUsIG9yIE5VTEwgb24gZmFpbHVyZS4KKyAqLworc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSAqCitpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUpCit7CisJcmV0dXJuIF9faW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0 YXRlKHBsYW5lLT5zdGF0ZSk7Cit9CisKKy8qKgogICogaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0 ZSAtIGRlc3Ryb3kgcGxhbmUgc3RhdGUKICAqIEBwbGFuZTogZHJtIHBsYW5lCiAgKiBAc3RhdGU6 IHN0YXRlIG9iamVjdCB0byBkZXN0cm95CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggNDY5MzFmOS4uNTA4MWE5ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtMTMwMjQsNyArMTMwMjQsNyBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jaGVjayhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQl0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpLT5j ZGNsayA9CiAJCQl0b19pOTE1KHN0YXRlLT5kZXYpLT5jZGNsa19mcmVxOwogCi0JcmV0dXJuIGRy bV9hdG9taWNfaGVscGVyX2NoZWNrX3BsYW5lcyhzdGF0ZS0+ZGV2LCBzdGF0ZSk7CisJcmV0dXJu IGludGVsX2F0b21pY19jaGVja19wbGFuZXMoc3RhdGUtPmRldiwgc3RhdGUpOwogfQogCiAvKioK QEAgLTE0MzEyLDYgKzE0MzEyLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9jb25m aWdfZnVuY3MgaW50ZWxfbW9kZV9mdW5jcyA9IHsKIAkuYXRvbWljX2NoZWNrID0gaW50ZWxfYXRv bWljX2NoZWNrLAogCS5hdG9taWNfY29tbWl0ID0gaW50ZWxfYXRvbWljX2NvbW1pdCwKIAkuYXRv bWljX3N0YXRlX2FsbG9jID0gaW50ZWxfYXRvbWljX3N0YXRlX2FsbG9jLAorCS5hdG9taWNfc3Rh dGVfZnJlZSA9IGludGVsX2F0b21pY19zdGF0ZV9mcmVlLAogCS5hdG9taWNfc3RhdGVfY2xlYXIg PSBpbnRlbF9hdG9taWNfc3RhdGVfY2xlYXIsCiB9OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CmluZGV4IDhiN2UzZDkuLmUyYWE3YjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0y MzcsNiArMjM3LDE1IEBAIHR5cGVkZWYgc3RydWN0IGRwbGwgewogc3RydWN0IGludGVsX2F0b21p Y19zdGF0ZSB7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgYmFzZTsKIAorCS8qCisJICogQSBz ZWNvbmQgdG9wLWxldmVsIHN0YXRlIG9iamVjdCB0aGF0IGhvbGRzIHRoZSBpbnRlcm1lZGlhdGUg c3RhdGUKKwkgKiB0aGF0IHRoZSBkcml2ZXIgcGFzc2VzIHRocm91Z2ggd2hlbiBwZXJmb3JtaW5n IGEgbW9kZXNldCBvcgorCSAqIGRpc2FibGluZyBDUlRDJ3MuICBUaGlzIHN0YXRlIGNvcnJlc3Bv bmRzIHRvIHRoZSBwb2ludCB3aGVyZSB3ZSd2ZQorCSAqIGRpc2FibGVkIHRoZSBDUlRDJ3MgdW5k ZXJnb2luZyBtb2Rlc2V0cy4KKwkgKi8KKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqaW50ZXJt ZWRpYXRlOworCisJYm9vbCBhbnlfbXM7CiAJdW5zaWduZWQgaW50IGNkY2xrOwogCWJvb2wgZHBs bF9zZXQ7CiAJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsX2NvbmZpZyBzaGFyZWRfZHBsbFtJOTE1 X05VTV9QTExTXTsKQEAgLTE0MTksNiArMTQyOCw3IEBAIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAq aW50ZWxfY3J0Y19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHZvaWQg aW50ZWxfY3J0Y19kZXN0cm95X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgICAg ICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlKTsKIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICppbnRlbF9hdG9taWNfc3RhdGVfYWxsb2Moc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lk IGludGVsX2F0b21pY19zdGF0ZV9mcmVlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzKTsKIHZv aWQgaW50ZWxfYXRvbWljX3N0YXRlX2NsZWFyKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICopOwog c3RydWN0IGludGVsX3NoYXJlZF9kcGxsX2NvbmZpZyAqCiBpbnRlbF9hdG9taWNfZ2V0X3NoYXJl ZF9kcGxsX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzKTsKQEAgLTE0MzcsNiArMTQ0 Nyw4IEBAIGludGVsX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUsCiBpbnQgaW50ZWxfYXRvbWljX3NldHVwX3NjYWxlcnMoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAlzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CitpbnQgaW50ZWxfYXRvbWljX2NoZWNrX3BsYW5lcyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJICAgICAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlKTsKIAogLyogaW50ZWxfYXRvbWljX3BsYW5lLmMgKi8KIHN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSAqaW50ZWxfY3JlYXRlX3BsYW5lX3N0YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l KTsKQEAgLTE0NDQsNSArMTQ1Niw3IEBAIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKmludGVsX3Bs YW5lX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSk7CiB2b2lkIGludGVs X3BsYW5lX2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgICAgICAg c3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUpOwogZXh0ZXJuIGNvbnN0IHN0cnVjdCBkcm1f cGxhbmVfaGVscGVyX2Z1bmNzIGludGVsX3BsYW5lX2hlbHBlcl9mdW5jczsKK3N0cnVjdCBkcm1f cGxhbmVfc3RhdGUgKgorX19pbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9w bGFuZV9zdGF0ZSAqcHMpOwogCiAjZW5kaWYgLyogX19JTlRFTF9EUlZfSF9fICovCi0tIAoyLjEu NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK