From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 21/29] drm/i915: Convert 'i915_seqno_passed' calls into 'i915_gem_request_completed' Date: Thu, 30 Oct 2014 18:41:13 +0000 Message-ID: <1414694481-15724-22-git-send-email-John.C.Harrison@Intel.com> References: <1414694481-15724-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 749086E5A7 for ; Thu, 30 Oct 2014 11:41:51 -0700 (PDT) In-Reply-To: <1414694481-15724-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkFsbW9zdCBl dmVyeXdoZXJlIHRoYXQgY2FsZWQgaTkxNV9zZXFub19wYXNzZWQoKSB3YXMgcmVhbGx5IGFza2lu ZyAnaGFzIHRoZQpnaXZlbiBzZXFubyBwb3BwZWQgb3V0IG9mIHRoZSBoYXJkd2FyZSB5ZXQ/Jy4g VGh1cyBpdCBoYWQgdG8gcXVlcnkgdGhlIGN1cnJlbnQKaGFyZHdhcmUgc2Vxbm8gYW5kIHRoZW4g ZG8gYSBzaWduZWQgZGVsdGEgY29tcGFyaXNvbiAod2hpY2ggY29wZXMgd2l0aCB3cmFwcGluZwph cm91bmQgemVybyBidXQgbm90IHdpdGggc2Vxbm8gdmFsdWVzIG1vcmUgdGhhbiAyR0IgYXBhcnQs IGFsdGhvdWdoIHRoZSBsYXR0ZXIKaXMgdW5saWtlbHkhKS4KCk5vdyB0aGF0IHRoZSBtYWpvcml0 eSBvZiBzZXFubyBpbnN0YW5jZXMgaGF2ZSBiZWVuIHJlcGxhY2VkIHdpdGggcmVxdWVzdApzdHJ1 Y3R1cmVzLCBpdCBpcyBwb3NzaWJsZSB0byBjb252ZXJ0IHRoaXMgdGVzdCB0byBiZSByZXF1ZXN0 IGJhc2VkIGFzIHdlbGwuClRoZXJlIGlzIG5vdyBhICdpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRl ZCgpJyBmdW5jdGlvbiB3aGljaCB0YWtlcyBhIHJlcXVlc3QgYW5kCnJldHVybnMgdHJ1ZSBvciBm YWxzZSBhcyBhcHByb3ByaWF0ZS4gVGhlIHVsdGltYXRlIGFpbSBpcyB0aGF0IHRoaXMgd2lsbCBi ZQpzaW1wbHkgcmV0dXJuaW5nIGEgY2FjaGVkIGludGVybmFsIHZhbHVlOiBlLmcuICdfY29tcGxl dGVkKHJlcSkgeyByZXR1cm4KcmVxLT5jb21wZWx0ZWQ7IH0nLiBIb3dldmVyLCBhdCB0aGUgbW9t ZW50LCB0aGUgaW1wbGVtZW50YXRpb24gYWN0dWFseSBmYWxscwpiYWNrIHRvIHRoZSBvcmlnaW5h bCAnc2Vxbm9fcGFzc2VkKCknIG1lY2hhbmlzbS4gVGhpcyBpcyB0byBiZSBpbXByb3ZlZCBpbiBs YXRlcgpwYXRjaGVzIGluIHRoZSBzZXJpZXMuCgpUaGlzIGNoZWNraW4gYWxtb3N0IGFsbCBfc2Vx bm9fcGFzc2VkKCkgY2FsbHMuIFRoZSBvbmx5IG9uZSBsZWZ0IGlzIGluIHRoZQpzZW1hcGhvcmUg Y29kZSB3aGljaCBzdGlsbCByZXF1aXJlcyBzZXFub3Mgbm90IHJlcXVlc3Qgc3RydWN0dXJlcy4K CkZvcjogVklaLTQzNzcKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJp c29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAg fCAgICAzICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgICAxOCAr KysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICB8 ICAgMjIgKysrKysrKy0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYyAgICAgIHwgICAgMyArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyB8ICAgMTEgKysrLS0tLS0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwg MjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCAxNWFk MzIyLi5mMjZjMmIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn ZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtNTQ5LDgg KzU0OSw3IEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fcGFnZWZsaXBfaW5mbyhzdHJ1Y3Qgc2VxX2Zp bGUgKm0sIHZvaWQgKmRhdGEpCiAJCQkJCSAgIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHdv cmstPmZsaXBfcXVldWVkX3JlcSksCiAJCQkJCSAgIGRldl9wcml2LT5uZXh0X3NlcW5vLAogCQkJ CQkgICB3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nLT5nZXRfc2Vxbm8od29yay0+ZmxpcF9xdWV1ZWRf cmluZywgdHJ1ZSksCi0JCQkJCSAgIGk5MTVfc2Vxbm9fcGFzc2VkKHdvcmstPmZsaXBfcXVldWVk X3JpbmctPmdldF9zZXFubyh3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nLCB0cnVlKSwKLQkJCQkJCQkg ICAgIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHdvcmstPmZsaXBfcXVldWVkX3JlcSkpKTsK KwkJCQkJICAgaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQod29yay0+ZmxpcF9xdWV1ZWRfcmVx LCB0cnVlKSk7CiAJCQl9IGVsc2UKIAkJCQlzZXFfcHJpbnRmKG0sICJGbGlwIG5vdCBhc3NvY2lh dGVkIHdpdGggYW55IHJpbmdcbiIpOwogCQkJc2VxX3ByaW50ZihtLCAiRmxpcCBxdWV1ZWQgb24g ZnJhbWUgJWQsICh3YXMgcmVhZHkgb24gZnJhbWUgJWQpLCBub3cgJWRcbiIsCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAppbmRleCA2MTM3YjUxLi4xZDMwZGNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKQEAgLTE5OTcsNiArMTk5NywxMiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaTkxNV9nZW1fcmVx dWVzdF9hc3NpZ24oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICoqcGRzdCwKIAkqcGRzdCA9 IHNyYzsKIH0KIAorLyoKKyAqIFhYWDogaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQgc2hvdWxk IGJlIGhlcmUgYnV0IGN1cnJlbnRseSBuZWVkcyB0aGUKKyAqIGRlZmluaXRpb24gb2YgaTkxNV9z ZXFub19wYXNzZWQoKSB3aGljaCBpcyBiZWxvdy4gSXQgd2lsbCBiZSBtb3ZlZCBpbgorICogYSBs YXRlciBwYXRjaCB3aGVuIHRoZSBjYWxsIHRvIGk5MTVfc2Vxbm9fcGFzc2VkKCkgaXMgb2Jzb2xl dGVkLi4uCisgKi8KKwogc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2OwogCXN0cnVjdCBkcm1fZmlsZSAqZmlsZTsKQEAgLTMw NjAsNiArMzA2NiwxOCBAQCB3YWl0X3JlbWFpbmluZ19tc19mcm9tX2ppZmZpZXModW5zaWduZWQg bG9uZyB0aW1lc3RhbXBfamlmZmllcywgaW50IHRvX3dhaXRfbXMpCiAJfQogfQogCitzdGF0aWMg aW5saW5lIGJvb2wgaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEsCisJCQkJCSAgICAgIGJvb2wgbGF6eV9jb2hlcmVuY3kpCit7CisJdTMy IHNlcW5vOworCisJQlVHX09OKHJlcSA9PSBOVUxMKTsKKworCXNlcW5vID0gcmVxLT5yaW5nLT5n ZXRfc2Vxbm8ocmVxLT5yaW5nLCBsYXp5X2NvaGVyZW5jeSk7CisKKwlyZXR1cm4gaTkxNV9zZXFu b19wYXNzZWQoc2Vxbm8sIHJlcS0+c2Vxbm8pOworfQorCiBzdGF0aWMgaW5saW5lIHZvaWQgaTkx NV90cmFjZV9pcnFfZ2V0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkJICAgICAg c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwppbmRleCA5MTdhMDFiLi4yZGFhZmViIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTEx NjcsNyArMTE2Nyw3IEBAIHN0YXRpYyBpbnQgX193YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEsCiAKIAlXQVJOKCFpbnRlbF9pcnFzX2VuYWJsZWQoZGV2X3ByaXYp LCAiSVJRcyBkaXNhYmxlZCIpOwogCi0JaWYgKGk5MTVfc2Vxbm9fcGFzc2VkKHJpbmctPmdldF9z ZXFubyhyaW5nLCB0cnVlKSwgcmVxLT5zZXFubykpCisJaWYgKGk5MTVfZ2VtX3JlcXVlc3RfY29t cGxldGVkKHJlcSwgdHJ1ZSkpCiAJCXJldHVybiAwOwogCiAJdGltZW91dF9leHBpcmUgPSB0aW1l b3V0ID8gamlmZmllcyArIG5zZWNzX3RvX2ppZmZpZXMoKHU2NCkqdGltZW91dCkgOiAwOwpAQCAt MTIwMyw3ICsxMjAzLDcgQEAgc3RhdGljIGludCBfX3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCWJyZWFrOwogCQl9CiAKLQkJaWYgKGk5MTVfc2Vxbm9f cGFzc2VkKHJpbmctPmdldF9zZXFubyhyaW5nLCBmYWxzZSksIHJlcS0+c2Vxbm8pKSB7CisJCWlm IChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEsIGZhbHNlKSkgewogCQkJcmV0ID0gMDsK IAkJCWJyZWFrOwogCQl9CkBAIC0yMjUxLDggKzIyNTEsNyBAQCBpOTE1X2dlbV9vYmplY3RfcmV0 aXJlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJaWYgKHJpbmcgPT0gTlVMTCkK IAkJcmV0dXJuOwogCi0JaWYgKGk5MTVfc2Vxbm9fcGFzc2VkKHJpbmctPmdldF9zZXFubyhyaW5n LCB0cnVlKSwKLQkJCSAgICAgIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKG9iai0+bGFzdF9y ZWFkX3JlcSkpKQorCWlmIChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChvYmotPmxhc3RfcmVh ZF9yZXEsIHRydWUpKQogCQlpOTE1X2dlbV9vYmplY3RfbW92ZV90b19pbmFjdGl2ZShvYmopOwog fQogCkBAIC0yNTEyLDEyICsyNTExLDkgQEAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICoK IGk5MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7Ci0JdTMyIGNvbXBs ZXRlZF9zZXFubzsKLQotCWNvbXBsZXRlZF9zZXFubyA9IHJpbmctPmdldF9zZXFubyhyaW5nLCBm YWxzZSk7CiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJlcXVlc3QsICZyaW5nLT5yZXF1ZXN0X2xp c3QsIGxpc3QpIHsKLQkJaWYgKGk5MTVfc2Vxbm9fcGFzc2VkKGNvbXBsZXRlZF9zZXFubywgcmVx dWVzdC0+c2Vxbm8pKQorCQlpZiAoaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmVxdWVzdCwg ZmFsc2UpKQogCQkJY29udGludWU7CiAKIAkJcmV0dXJuIHJlcXVlc3Q7CkBAIC0yNjUyLDE1ICsy NjQ4LDExIEBAIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZV9pcnEoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB2b2lkCiBpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHNf cmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewotCXVpbnQzMl90IHNlcW5vOwot CiAJaWYgKGxpc3RfZW1wdHkoJnJpbmctPnJlcXVlc3RfbGlzdCkpCiAJCXJldHVybjsKIAogCVdB Uk5fT04oaTkxNV92ZXJpZnlfbGlzdHMocmluZy0+ZGV2KSk7CiAKLQlzZXFubyA9IHJpbmctPmdl dF9zZXFubyhyaW5nLCB0cnVlKTsKLQogCS8qIE1vdmUgYW55IGJ1ZmZlcnMgb24gdGhlIGFjdGl2 ZSBsaXN0IHRoYXQgYXJlIG5vIGxvbmdlciByZWZlcmVuY2VkCiAJICogYnkgdGhlIHJpbmdidWZm ZXIgdG8gdGhlIGZsdXNoaW5nL2luYWN0aXZlIGxpc3RzIGFzIGFwcHJvcHJpYXRlLAogCSAqIGJl Zm9yZSB3ZSBmcmVlIHRoZSBjb250ZXh0IGFzc29jaWF0ZWQgd2l0aCB0aGUgcmVxdWVzdHMuCkBA IC0yNjcyLDcgKzI2NjQsNyBAQCBpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHNfcmluZyhzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nKQogCQkJCSAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0LAogCQkJCSAgICAgIHJpbmdfbGlzdCk7CiAKLQkJaWYgKCFpOTE1X3NlcW5vX3Bhc3NlZChz ZXFubywgaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ob2JqLT5sYXN0X3JlYWRfcmVxKSkpCisJ CWlmICghaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQob2JqLT5sYXN0X3JlYWRfcmVxLCB0cnVl KSkKIAkJCWJyZWFrOwogCiAJCWk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2luYWN0aXZlKG9iaik7 CkBAIC0yNjg3LDcgKzI2NzksNyBAQCBpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHNfcmluZyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCQkJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QsCiAJCQkJCSAgIGxpc3QpOwogCi0JCWlmICghaTkxNV9zZXFub19wYXNzZWQoc2Vxbm8s IHJlcXVlc3QtPnNlcW5vKSkKKwkJaWYgKCFpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXF1 ZXN0LCB0cnVlKSkKIAkJCWJyZWFrOwogCiAJCXRyYWNlX2k5MTVfZ2VtX3JlcXVlc3RfcmV0aXJl KHJlcXVlc3QpOwpAQCAtMjcxNCw3ICsyNzA2LDcgQEAgaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3Rz X3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAl9CiAKIAlpZiAodW5saWtlbHko cmluZy0+dHJhY2VfaXJxX3JlcSAmJgotCQkgICAgIGk5MTVfc2Vxbm9fcGFzc2VkKHNlcW5vLCBp OTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyaW5nLT50cmFjZV9pcnFfcmVxKSkpKSB7CisJCSAg ICAgaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmluZy0+dHJhY2VfaXJxX3JlcSwgdHJ1ZSkp KSB7CiAJCXJpbmctPmlycV9wdXQocmluZyk7CiAJCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZy aW5nLT50cmFjZV9pcnFfcmVxLCBOVUxMKTsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRl eCAwMDNiMjY4Li4yMWUxZDY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTI3MjcsOCAr MjcyNyw3IEBAIHN0YXRpYyBib29sCiByaW5nX2lkbGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZykKIHsKIAlyZXR1cm4gKGxpc3RfZW1wdHkoJnJpbmctPnJlcXVlc3RfbGlzdCkgfHwKLQkJ aTkxNV9zZXFub19wYXNzZWQocmluZy0+Z2V0X3NlcW5vKHJpbmcsIGZhbHNlKSwKLQkJCQkgIGk5 MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJpbmdfbGFzdF9yZXF1ZXN0KHJpbmcpKSkpOworCQlp OTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyaW5nX2xhc3RfcmVxdWVzdChyaW5nKSwgZmFsc2Up KTsKIH0KIAogc3RhdGljIGJvb2wKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl eCA0NDAwNWEyLi5lY2E0MjQwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC05MzQ2LDggKzkzNDYsNyBAQCBzdGF0aWMgaW50IGludGVsX3Bvc3Rwb25lX2ZsaXAoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAogCXJpbmcgPSBvYmotPnJpbmc7CiAKLQlpZiAo aTkxNV9zZXFub19wYXNzZWQocmluZy0+Z2V0X3NlcW5vKHJpbmcsIHRydWUpLAotCQkJICAgICAg aTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ob2JqLT5sYXN0X3dyaXRlX3JlcSkpKQorCWlmIChp OTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChvYmotPmxhc3Rfd3JpdGVfcmVxLCB0cnVlKSkKIAkJ cmV0dXJuIDA7CiAKIAlyZXQgPSBpOTE1X2dlbV9jaGVja19vbHIob2JqLT5sYXN0X3dyaXRlX3Jl cSk7CkBAIC05MzY1LDkgKzkzNjQsNiBAQCB2b2lkIGludGVsX25vdGlmeV9tbWlvX2ZsaXAoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KHJpbmctPmRldik7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGM7CiAJdW5zaWduZWQgbG9uZyBpcnFfZmxhZ3M7Ci0JdTMyIHNlcW5vOwotCi0Jc2Vxbm8gPSBy aW5nLT5nZXRfc2Vxbm8ocmluZywgZmFsc2UpOwogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9w cml2LT5tbWlvX2ZsaXBfbG9jaywgaXJxX2ZsYWdzKTsKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKHJp bmctPmRldiwgaW50ZWxfY3J0YykgewpAQCAtOTM4MCw3ICs5Mzc2LDcgQEAgdm9pZCBpbnRlbF9u b3RpZnlfbW1pb19mbGlwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCWlmIChyaW5n LT5pZCAhPSBtbWlvX2ZsaXAtPnJpbmdfaWQpCiAJCQljb250aW51ZTsKIAotCQlpZiAoaTkxNV9z ZXFub19wYXNzZWQoc2Vxbm8sIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKG1taW9fZmxpcC0+ cmVxKSkpIHsKKwkJaWYgKGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKG1taW9fZmxpcC0+cmVx LCBmYWxzZSkpIHsKIAkJCWludGVsX2RvX21taW9fZmxpcChpbnRlbF9jcnRjKTsKIAkJCWk5MTVf Z2VtX3JlcXVlc3RfYXNzaWduKCZtbWlvX2ZsaXAtPnJlcSwgTlVMTCk7CiAJCQlyaW5nLT5pcnFf cHV0KHJpbmcpOwpAQCAtOTQ1MSw4ICs5NDQ3LDcgQEAgc3RhdGljIGJvb2wgX19pbnRlbF9wYWdl ZmxpcF9zdGFsbF9jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJaWYgKHdvcmstPmZs aXBfcmVhZHlfdmJsYW5rID09IDApIHsKIAkJaWYgKHdvcmstPmZsaXBfcXVldWVkX3JpbmcpIHsK LQkJCWlmICghaTkxNV9zZXFub19wYXNzZWQod29yay0+ZmxpcF9xdWV1ZWRfcmluZy0+Z2V0X3Nl cW5vKHdvcmstPmZsaXBfcXVldWVkX3JpbmcsIHRydWUpLAotCQkJCSAgICAgICBpOTE1X2dlbV9y ZXF1ZXN0X2dldF9zZXFubyh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpKSkKKwkJCWlmICghaTkxNV9n ZW1fcmVxdWVzdF9jb21wbGV0ZWQod29yay0+ZmxpcF9xdWV1ZWRfcmVxLCB0cnVlKSkKIAkJCQly ZXR1cm4gZmFsc2U7CiAKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2VfaXJxKHdvcmst PmZsaXBfcXVldWVkX3JlcSk7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=