From: John.C.Harrison@Intel.com Subject: [PATCH v7 3/8] drm/i915: Add per context timelines to fence object Date: Wed, 20 Apr 2016 18:09:50 +0100 Message-ID: <1461172195-3959-4-git-send-email-John.C.Harrison@Intel.com> References: <1461172195-3959-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 109D26E064 for ; Wed, 20 Apr 2016 17:10:00 +0000 (UTC) In-Reply-To: <1461172195-3959-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBmZW5j ZSBvYmplY3QgdXNlZCBpbnNpZGUgdGhlIHJlcXVlc3Qgc3RydWN0dXJlIHJlcXVpcmVzIGEgc2Vx dWVuY2UKbnVtYmVyLiBBbHRob3VnaCB0aGlzIGlzIG5vdCB1c2VkIGJ5IHRoZSBpOTE1IGRyaXZl ciBpdHNlbGYsIGl0IGNvdWxkCnBvdGVudGlhbGx5IGJlIHVzZWQgYnkgbm9uLWk5MTUgY29kZSBp ZiB0aGUgZmVuY2UgaXMgcGFzc2VkIG91dHNpZGUgb2YKdGhlIGRyaXZlci4gVGhpcyBpcyB0aGUg aW50ZW50aW9uIGFzIGl0IGFsbG93cyBleHRlcm5hbCBrZXJuZWwgZHJpdmVycwphbmQgdXNlciBh cHBsaWNhdGlvbnMgdG8gd2FpdCBvbiBiYXRjaCBidWZmZXIgY29tcGxldGlvbgphc3luY2hyb25v dXNseSB2aWEgdGhlIGRtYS1idWZmIGZlbmNlIEFQSS4KClRvIGVuc3VyZSB0aGF0IHN1Y2ggZXh0 ZXJuYWwgdXNlcnMgYXJlIG5vdCBjb25mdXNlZCBieSBzdHJhbmdlIHRoaW5ncwpoYXBwZW5pbmcg d2l0aCB0aGUgc2Vxbm8sIHRoaXMgcGF0Y2ggYWRkcyBpbiBhIHBlciBjb250ZXh0IHRpbWVsaW5l CnRoYXQgY2FuIHByb3ZpZGUgYSBndWFyYW50ZWVkIGluLW9yZGVyIHNlcW5vIHZhbHVlIGZvciB0 aGUgZmVuY2UuIFRoaXMKaXMgc2FmZSBiZWNhdXNlIHRoZSBzY2hlZHVsZXIgd2lsbCBub3QgcmUt b3JkZXIgYmF0Y2ggYnVmZmVycyB3aXRoaW4gYQpjb250ZXh0IC0gdGhleSBhcmUgY29uc2lkZXJl ZCB0byBiZSBtdXR1YWxseSBkZXBlbmRlbnQuCgp2MjogTmV3IHBhdGNoIGluIHNlcmllcy4KCnYz OiBSZW5hbWVkL3JldHlwZWQgdGltZWxpbmUgc3RydWN0dXJlIGZpZWxkcyBhZnRlciByZXZpZXcg Y29tbWVudHMgYnkKVHZydGtvIFVyc3VsaW4uCgpBZGRlZCBjb250ZXh0IGluZm9ybWF0aW9uIHRv IHRoZSB0aW1lbGluZSdzIG5hbWUgc3RyaW5nIGZvciBiZXR0ZXIKaWRlbnRpZmljYXRpb24gaW4g ZGVidWdmcyBvdXRwdXQuCgp2NTogTGluZSB3cmFwcGluZyBhbmQgb3RoZXIgd2hpdGUgc3BhY2Ug Zml4ZXMgdG8ga2VlcCBzdHlsZSBjaGVja2VyCmhhcHB5LgoKdjc6IFVwZGF0ZWQgdG8gbmV3ZXIg bmlnaHRseSAobG90cyBvZiByaW5nIC0+IGVuZ2luZSByZW5hbWluZykuCgpGb3I6IFZJWi01MTkw ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8IDI1ICsrKysrKystLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8IDgzICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5j IHwgMTQgKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAg OCArKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgMSAtCiA1 IGZpbGVzIGNoYW5nZWQsIDExNCBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCBiYjE4Yjg5Li4xYzNhMWNhIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTgxMyw2ICs4MTMsMTUgQEAgc3RydWN0IGk5MTVfY3R4X2hhbmdfc3RhdHMg ewogCWJvb2wgYmFubmVkOwogfTsKIAorc3RydWN0IGk5MTVfZmVuY2VfdGltZWxpbmUgeworCWNo YXIgICAgICAgIG5hbWVbMzJdOworCXVuc2lnbmVkICAgIGZlbmNlX2NvbnRleHQ7CisJdW5zaWdu ZWQgICAgbmV4dDsKKworCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHg7CisJc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lOworfTsKKwogLyogVGhpcyBtdXN0IG1hdGNoIHVwIHdpdGggdGhl IHZhbHVlIHByZXZpb3VzbHkgdXNlZCBmb3IgZXhlY2J1ZjIucnN2ZDEuICovCiAjZGVmaW5lIERF RkFVTFRfQ09OVEVYVF9IQU5ETEUgMAogCkBAIC04NjAsNiArODY5LDcgQEAgc3RydWN0IGludGVs X2NvbnRleHQgewogCQlzdHJ1Y3QgaTkxNV92bWEgKmxyY192bWE7CiAJCXU2NCBscmNfZGVzYzsK IAkJdWludDMyX3QgKmxyY19yZWdfc3RhdGU7CisJCXN0cnVjdCBpOTE1X2ZlbmNlX3RpbWVsaW5l IGZlbmNlX3RpbWVsaW5lOwogCX0gZW5naW5lW0k5MTVfTlVNX0VOR0lORVNdOwogCiAJc3RydWN0 IGxpc3RfaGVhZCBsaW5rOwpAQCAtMjI0NSwxMyArMjI1NSwxMCBAQCB2b2lkIGk5MTVfZ2VtX3Ry YWNrX2ZiKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvbGQsCiBzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgewogCS8qKgogCSAqIFVuZGVybHlpbmcgb2JqZWN0IGZvciBpbXBsZW1lbnRp bmcgdGhlIHNpZ25hbC93YWl0IHN0dWZmLgotCSAqIE5COiBOZXZlciBjYWxsIGZlbmNlX2xhdGVy KCkgb3IgcmV0dXJuIHRoaXMgZmVuY2Ugb2JqZWN0IHRvIHVzZXIKLQkgKiBsYW5kISBEdWUgdG8g bGF6eSBhbGxvY2F0aW9uLCBzY2hlZHVsZXIgcmUtb3JkZXJpbmcsIHByZS1lbXB0aW9uLAotCSAq IGV0Yy4sIHRoZXJlIGlzIG5vIGd1YXJhbnRlZSBhdCBhbGwgYWJvdXQgdGhlIHZhbGlkaXR5IG9y Ci0JICogc2VxdWVudGlhbGl0eSBvZiB0aGUgZmVuY2UncyBzZXFubyEgSXQgaXMgYWxzbyB1bnNh ZmUgdG8gbGV0Ci0JICogYW55dGhpbmcgb3V0c2lkZSBvZiB0aGUgaTkxNSBkcml2ZXIgZ2V0IGhv bGQgb2YgdGhlIGZlbmNlIG9iamVjdAotCSAqIGFzIHRoZSBjbGVhbiB1cCB3aGVuIGRlY3JlbWVu dGluZyB0aGUgcmVmZXJlbmNlIGNvdW50IHJlcXVpcmVzCi0JICogaG9sZGluZyB0aGUgZHJpdmVy IG11dGV4IGxvY2suCisJICogTkI6IE5ldmVyIHJldHVybiB0aGlzIGZlbmNlIG9iamVjdCB0byB1 c2VyIGxhbmQhIEl0IGlzIHVuc2FmZSB0bworCSAqIGxldCBhbnl0aGluZyBvdXRzaWRlIG9mIHRo ZSBpOTE1IGRyaXZlciBnZXQgaG9sZCBvZiB0aGUgZmVuY2UKKwkgKiBvYmplY3QgYXMgdGhlIGNs ZWFuIHVwIHdoZW4gZGVjcmVtZW50aW5nIHRoZSByZWZlcmVuY2UgY291bnQKKwkgKiByZXF1aXJl cyBob2xkaW5nIHRoZSBkcml2ZXIgbXV0ZXggbG9jay4KIAkgKi8KIAlzdHJ1Y3QgZmVuY2UgZmVu Y2U7CiAKQEAgLTIzNDAsNiArMjM0NywxMCBAQCBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJICAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHgpOwogdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSk7CiAKK2ludCBpOTE1X2NyZWF0ZV9mZW5jZV90aW1lbGluZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAorCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisJ CQkgICAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CisKIHN0YXRpYyBpbmxpbmUg Ym9vbCBpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcSkKIHsKIAlyZXR1cm4gZmVuY2VfaXNfc2lnbmFsZWQoJnJlcS0+ZmVuY2UpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggNDIwOWUzYi4uOTllOWRkYiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCkBAIC0yNzc2LDkgKzI3NzYsMzUgQEAgc3RhdGljIGNvbnN0IGNoYXIgKmk5MTVf Z2VtX3JlcXVlc3RfZ2V0X2RyaXZlcl9uYW1lKHN0cnVjdCBmZW5jZSAqcmVxX2ZlbmNlKQogCiBz dGF0aWMgY29uc3QgY2hhciAqaTkxNV9nZW1fcmVxdWVzdF9nZXRfdGltZWxpbmVfbmFtZShzdHJ1 Y3QgZmVuY2UgKnJlcV9mZW5jZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cSA9IGNvbnRhaW5lcl9vZihyZXFfZmVuY2UsCi0JCQkJCQkgdHlwZW9mKCpyZXEpLCBmZW5jZSk7 Ci0JcmV0dXJuIHJlcS0+ZW5naW5lLT5uYW1lOworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxOworCXN0cnVjdCBpOTE1X2ZlbmNlX3RpbWVsaW5lICp0aW1lbGluZTsKKworCXJlcSA9 IGNvbnRhaW5lcl9vZihyZXFfZmVuY2UsIHR5cGVvZigqcmVxKSwgZmVuY2UpOworCXRpbWVsaW5l ID0gJnJlcS0+Y3R4LT5lbmdpbmVbcmVxLT5lbmdpbmUtPmlkXS5mZW5jZV90aW1lbGluZTsKKwor CXJldHVybiB0aW1lbGluZS0+bmFtZTsKK30KKworc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVxdWVz dF90aW1lbGluZV92YWx1ZV9zdHIoc3RydWN0IGZlbmNlICpyZXFfZmVuY2UsCisJCQkJCQljaGFy ICpzdHIsIGludCBzaXplKQoreworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwor CisJcmVxID0gY29udGFpbmVyX29mKHJlcV9mZW5jZSwgdHlwZW9mKCpyZXEpLCBmZW5jZSk7CisK KwkvKiBMYXN0IHNpZ25hbGxlZCB0aW1lbGluZSB2YWx1ZSA/Pz8gKi8KKwlzbnByaW50ZihzdHIs IHNpemUsICI/IFslZF0iLyosIHRpbWVsaW5lLT52YWx1ZSovLAorCQkgcmVxLT5lbmdpbmUtPmdl dF9zZXFubyhyZXEtPmVuZ2luZSkpOworfQorCitzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZXF1ZXN0 X2ZlbmNlX3ZhbHVlX3N0cihzdHJ1Y3QgZmVuY2UgKnJlcV9mZW5jZSwKKwkJCQkJICAgICBjaGFy ICpzdHIsIGludCBzaXplKQoreworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwor CisJcmVxID0gY29udGFpbmVyX29mKHJlcV9mZW5jZSwgdHlwZW9mKCpyZXEpLCBmZW5jZSk7CisK KwlzbnByaW50ZihzdHIsIHNpemUsICIlZCBbJWRdIiwgcmVxLT5mZW5jZS5zZXFubywgcmVxLT5z ZXFubyk7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVuY2Vfb3BzIGk5MTVfZ2VtX3JlcXVl c3RfZm9wcyA9IHsKQEAgLTI3ODgsOCArMjgxNCw1MCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGZl bmNlX29wcyBpOTE1X2dlbV9yZXF1ZXN0X2ZvcHMgPSB7CiAJLnJlbGVhc2UJCT0gaTkxNV9nZW1f cmVxdWVzdF9mcmVlLAogCS5nZXRfZHJpdmVyX25hbWUJPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9k cml2ZXJfbmFtZSwKIAkuZ2V0X3RpbWVsaW5lX25hbWUJPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF90 aW1lbGluZV9uYW1lLAorCS5mZW5jZV92YWx1ZV9zdHIJPSBpOTE1X2dlbV9yZXF1ZXN0X2ZlbmNl X3ZhbHVlX3N0ciwKKwkudGltZWxpbmVfdmFsdWVfc3RyCT0gaTkxNV9nZW1fcmVxdWVzdF90aW1l bGluZV92YWx1ZV9zdHIsCiB9OwogCitpbnQgaTkxNV9jcmVhdGVfZmVuY2VfdGltZWxpbmUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4 LAorCQkJICAgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3Qg aTkxNV9mZW5jZV90aW1lbGluZSAqdGltZWxpbmU7CisKKwl0aW1lbGluZSA9ICZjdHgtPmVuZ2lu ZVtlbmdpbmUtPmlkXS5mZW5jZV90aW1lbGluZTsKKworCWlmICh0aW1lbGluZS0+ZW5naW5lKQor CQlyZXR1cm4gMDsKKworCXRpbWVsaW5lLT5mZW5jZV9jb250ZXh0ID0gZmVuY2VfY29udGV4dF9h bGxvYygxKTsKKworCS8qCisJICogU3RhcnQgdGhlIHRpbWVsaW5lIGZyb20gc2Vxbm8gMCBhcyB0 aGlzIGlzIGEgc3BlY2lhbCB2YWx1ZQorCSAqIHRoYXQgaXMgcmVzZXJ2ZWQgZm9yIGludmFsaWQg c3luYyBwb2ludHMuCisJICovCisJdGltZWxpbmUtPm5leHQgICAgICAgPSAxOworCXRpbWVsaW5l LT5jdHggICAgICAgID0gY3R4OworCXRpbWVsaW5lLT5lbmdpbmUgICAgID0gZW5naW5lOworCisJ c25wcmludGYodGltZWxpbmUtPm5hbWUsIHNpemVvZih0aW1lbGluZS0+bmFtZSksICIlZD4lczol ZCIsCisJCSB0aW1lbGluZS0+ZmVuY2VfY29udGV4dCwgZW5naW5lLT5uYW1lLCBjdHgtPnVzZXJf aGFuZGxlKTsKKworCXJldHVybiAwOworfQorCitzdGF0aWMgdW5zaWduZWQgaTkxNV9mZW5jZV90 aW1lbGluZV9nZXRfbmV4dF9zZXFubyhzdHJ1Y3QgaTkxNV9mZW5jZV90aW1lbGluZSAqdGltZWxp bmUpCit7CisJdW5zaWduZWQgc2Vxbm87CisKKwlzZXFubyA9IHRpbWVsaW5lLT5uZXh0OworCisJ LyogUmVzZXJ2ZSB6ZXJvIGZvciBpbnZhbGlkICovCisJaWYgKCsrdGltZWxpbmUtPm5leHQgPT0g MCkKKwkJdGltZWxpbmUtPm5leHQgPSAxOworCisJcmV0dXJuIHNlcW5vOworfQorCiBzdGF0aWMg aW5saW5lIGludAogX19pOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSwKIAkJCSBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LApAQCAtMjgyNyw3ICsy ODk1LDggQEAgX19pOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSwKIAl9CiAKIAlmZW5jZV9pbml0KCZyZXEtPmZlbmNlLCAmaTkxNV9nZW1fcmVxdWVz dF9mb3BzLCAmZW5naW5lLT5mZW5jZV9sb2NrLAotCQkgICBlbmdpbmUtPmZlbmNlX2NvbnRleHQs IHJlcS0+c2Vxbm8pOworCQkgICBjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5mZW5jZV90aW1lbGlu ZS5mZW5jZV9jb250ZXh0LAorCQkgICBpOTE1X2ZlbmNlX3RpbWVsaW5lX2dldF9uZXh0X3NlcW5v KCZjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5mZW5jZV90aW1lbGluZSkpOwogCiAJLyoKIAkgKiBS ZXNlcnZlIHNwYWNlIGluIHRoZSByaW5nIGJ1ZmZlciBmb3IgYWxsIHRoZSBjb21tYW5kcyByZXF1 aXJlZCB0bwpAQCAtNDkzOSw3ICs1MDA4LDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwotCWludCBy ZXQsIGosIGZlbmNlX2Jhc2U7CisJaW50IHJldCwgajsKIAogCWlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA8IDYgJiYgIWludGVsX2VuYWJsZV9ndHQoKSkKIAkJcmV0dXJuIC1FSU87CkBAIC01MDA5 LDE0ICs1MDc4LDEwIEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAlpZiAocmV0KQogCQlnb3RvIG91dDsKIAotCWZlbmNlX2Jhc2UgPSBmZW5jZV9jb250ZXh0X2Fs bG9jKEk5MTVfTlVNX0VOR0lORVMpOwotCiAJLyogTm93IGl0IGlzIHNhZmUgdG8gZ28gYmFjayBy b3VuZCBhbmQgZG8gZXZlcnl0aGluZyBlbHNlOiAqLwogCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUs IGRldl9wcml2KSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwogCi0JCWVu Z2luZS0+ZmVuY2VfY29udGV4dCA9IGZlbmNlX2Jhc2UgKyBlbmdpbmUtPmlkOwotCiAJCXJlcSA9 IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MoZW5naW5lLCBOVUxMKTsKIAkJaWYgKElTX0VSUihyZXEp KSB7CiAJCQlyZXQgPSBQVFJfRVJSKHJlcSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j b250ZXh0LmMKaW5kZXggMjgyYjE3Yy4uNmIzMGRlOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2NvbnRleHQuYwpAQCAtMjc5LDYgKzI3OSwyMCBAQCBpOTE1X2dlbV9jcmVhdGVfY29u dGV4dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmIChJU19FUlIoY3R4KSkKIAkJcmV0dXJu IGN0eDsKIAorCWlmICghaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CisJCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZTsKKworCQkvKiBDcmVhdGUgYSBwZXIgY29udGV4dCB0aW1lbGluZSBm b3IgZmVuY2VzICovCisJCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIHRvX2k5MTUoZGV2KSkgewor CQkJcmV0ID0gaTkxNV9jcmVhdGVfZmVuY2VfdGltZWxpbmUoZGV2LCBjdHgsIGVuZ2luZSk7CisJ CQlpZiAocmV0KSB7CisJCQkJRFJNX0VSUk9SKCJGZW5jZSB0aW1lbGluZSBjcmVhdGlvbiBmYWls ZWQgZm9yIGxlZ2FjeSAlczogJXBcbiIsCisJCQkJCSAgZW5naW5lLT5uYW1lLCBjdHgpOworCQkJ CWdvdG8gZXJyX2Rlc3Ryb3k7CisJCQl9CisJCX0KKwl9CisKIAlpZiAoaXNfZ2xvYmFsX2RlZmF1 bHRfY3R4ICYmIGN0eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpIHsKIAkJLyogV2UgbWF5IG5l ZWQgdG8gZG8gdGhpbmdzIHdpdGggdGhlIHNocmlua2VyIHdoaWNoCiAJCSAqIHJlcXVpcmUgdXMg dG8gaW1tZWRpYXRlbHkgc3dpdGNoIGJhY2sgdG8gdGhlIGRlZmF1bHQKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKaW5kZXggMjY4ZTAyNC4uZGI3NGNjMTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCkBAIC0yNjk0LDYgKzI2OTQsMTQgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRf YWxsb2Moc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJZ290byBlcnJvcl9yaW5nYnVmOwog CX0KIAorCS8qIENyZWF0ZSBhIHBlciBjb250ZXh0IHRpbWVsaW5lIGZvciBmZW5jZXMgKi8KKwly ZXQgPSBpOTE1X2NyZWF0ZV9mZW5jZV90aW1lbGluZShkZXYsIGN0eCwgZW5naW5lKTsKKwlpZiAo cmV0KSB7CisJCURSTV9FUlJPUigiRmVuY2UgdGltZWxpbmUgY3JlYXRpb24gZmFpbGVkIGZvciBl bmdpbmUgJXMsIGN0eCAlcFxuIiwKKwkJCSAgZW5naW5lLT5uYW1lLCBjdHgpOworCQlnb3RvIGVy cm9yX3JpbmdidWY7CisJfQorCiAJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ucmluZ2J1ZiA9IHJp bmdidWY7CiAJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0uc3RhdGUgPSBjdHhfb2JqOwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggMmNkOWQyYy4uMjNlMWQ5NCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMzQ5LDcgKzM0OSw2 IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsKIAkgKi8KIAl1MzIgKCpnZXRfY21kX2xlbmd0 aF9tYXNrKSh1MzIgY21kX2hlYWRlcik7CiAKLQl1bnNpZ25lZCBmZW5jZV9jb250ZXh0OwogCXNw aW5sb2NrX3QgZmVuY2VfbG9jazsKIH07CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK