From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v3 10/28] drm/i915: Convert i915_wait_seqno to i915_wait_request Date: Mon, 24 Nov 2014 18:49:32 +0000 Message-ID: <1416854990-1920-11-git-send-email-John.C.Harrison@Intel.com> References: <1416854990-1920-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id C40FB6EE1F for ; Mon, 24 Nov 2014 10:50:16 -0800 (PST) In-Reply-To: <1416854990-1920-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg aTkxNV93YWl0X3NlcW5vKCkgdG8gdGFrZSBhIHJlcXVlc3Qgc3RydWN0dXJlIGluc3RlYWQgb2Yg YSBzZXFubyB2YWx1ZQphbmQgcmVuYW1lZCBpdCBhY2NvcmRpbmdseS4gSW50ZXJuYWxseSwgaXQg anVzdCBwdWxscyB0aGUgc2Vxbm8gb3V0IG9mIHRoZQpyZXF1ZXN0IGFuZCBjYWxscyBvbiB0byBf X3dhaXRfc2Vxbm8oKSBhcyBiZWZvcmUuIEhvd2V2ZXIsIGFsbCB0aGUgY29kZSBmdXJ0aGVyCnVw IHRoZSBzdGFjayBpcyBub3cgc2ltcGxpZmllZCBhcyBpdCBjYW4ganVzdCBwYXNzIHRoZSByZXF1 ZXN0IG9iamVjdCBzdHJhaWdodAp0aHJvdWdoIHdpdGhvdXQgaGF2aW5nIHRvIHBlZWsgaW5zaWRl LgoKRm9yOiBWSVotNDM3NwpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFy cmlzb25ASW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVGhvbWFzIERhbmllbCA8VGhvbWFzLkRhbmll bEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAg IHwgICAxOSArLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgICAgICAgICB8ICAgMzMgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgICAgNiArKy0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyAgICB8ICAgMTEgKysrLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8ICAgMTQgKysrKysrLS0tLS0tLQog NSBmaWxlcyBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCA1NSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCA2MmZmZGI1Li4xNDk1MzJlNiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCkBAIC0yNjM3LDggKzI2MzcsNyBAQCBpbnQgX19pOTE1X3dhaXRfc2Vxbm8oc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMyIHNlcW5vLAogCQkJYm9vbCBpbnRlcnJ1cHRp YmxlLAogCQkJczY0ICp0aW1lb3V0LAogCQkJc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAq ZmlsZV9wcml2KTsKLWludCBfX211c3RfY2hlY2sgaTkxNV93YWl0X3NlcW5vKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkJIHVpbnQzMl90IHNlcW5vKTsKK2ludCBfX211c3RfY2hl Y2sgaTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwog aW50IGk5MTVfZ2VtX2ZhdWx0KHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLCBzdHJ1Y3Qgdm1f ZmF1bHQgKnZtZik7CiBpbnQgX19tdXN0X2NoZWNrCiBpOTE1X2dlbV9vYmplY3Rfc2V0X3RvX2d0 dF9kb21haW4oc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKQEAgLTMxMjUsMjAgKzMx MjQsNCBAQCB3YWl0X3JlbWFpbmluZ19tc19mcm9tX2ppZmZpZXModW5zaWduZWQgbG9uZyB0aW1l c3RhbXBfamlmZmllcywgaW50IHRvX3dhaXRfbXMpCiAJfQogfQogCi0vKiBYWFg6IFRlbXBvcmFy eSBzb2x1dGlvbiB0byBiZSByZW1vdmVkIGxhdGVyIGluIHBhdGNoIHNlcmllcy4gKi8KLXN0YXRp YyBpbmxpbmUgaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9jaGVja19vbHMoCi0JCQkJICAgICBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1MzIgc2Vxbm8pCi17Ci0JaW50IHJldDsKLQot CVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmcmluZy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKLQot CXJldCA9IDA7Ci0JaWYgKHNlcW5vID09IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJpbmct Pm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCkpCi0JCXJldCA9IGk5MTVfYWRkX3JlcXVlc3Qocmlu ZywgTlVMTCk7Ci0KLQlyZXR1cm4gcmV0OwotfQotLyogWFhYOiBUZW1wb3Jhcnkgc29sdXRpb24g dG8gYmUgcmVtb3ZlZCBsYXRlciBpbiBwYXRjaCBzZXJpZXMuICovCi0KICNlbmRpZgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKaW5kZXggYjA3ZGU2OS4uOGUyYzUzMCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCkBAIC0xMzA4LDMzICsxMzA4LDM4IEBAIGludCBfX2k5MTVfd2FpdF9zZXFubyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1MzIgc2Vxbm8sCiB9CiAKIC8qKgotICogV2FpdHMg Zm9yIGEgc2VxdWVuY2UgbnVtYmVyIHRvIGJlIHNpZ25hbGVkLCBhbmQgY2xlYW5zIHVwIHRoZQor ICogV2FpdHMgZm9yIGEgcmVxdWVzdCB0byBiZSBzaWduYWxlZCwgYW5kIGNsZWFucyB1cCB0aGUK ICAqIHJlcXVlc3QgYW5kIG9iamVjdCBsaXN0cyBhcHByb3ByaWF0ZWx5IGZvciB0aGF0IGV2ZW50 LgogICovCiBpbnQKLWk5MTVfd2FpdF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n LCB1aW50MzJfdCBzZXFubykKK2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7Ci0J c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQli b29sIGludGVycnVwdGlibGUgPSBkZXZfcHJpdi0+bW0uaW50ZXJydXB0aWJsZTsKKwlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdjsKKwli b29sIGludGVycnVwdGlibGU7CiAJdW5zaWduZWQgcmVzZXRfY291bnRlcjsKIAlpbnQgcmV0Owog CisJQlVHX09OKHJlcSA9PSBOVUxMKTsKKworCWRldiA9IHJlcS0+cmluZy0+ZGV2OworCWRldl9w cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlpbnRlcnJ1cHRpYmxlID0gZGV2X3ByaXYtPm1tLmlu dGVycnVwdGlibGU7CisKIAlCVUdfT04oIW11dGV4X2lzX2xvY2tlZCgmZGV2LT5zdHJ1Y3RfbXV0 ZXgpKTsKLQlCVUdfT04oc2Vxbm8gPT0gMCk7CiAKIAlyZXQgPSBpOTE1X2dlbV9jaGVja193ZWRn ZSgmZGV2X3ByaXYtPmdwdV9lcnJvciwgaW50ZXJydXB0aWJsZSk7CiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX29scyhyaW5nLCBzZXFubyk7CisJcmV0 ID0gaTkxNV9nZW1fY2hlY2tfb2xyKHJlcSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAog CXJlc2V0X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9j b3VudGVyKTsKIAlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShyZXEpOwotCXJldCA9IF9faTkx NV93YWl0X3NlcW5vKHJpbmcsIHNlcW5vLCByZXNldF9jb3VudGVyLCBpbnRlcnJ1cHRpYmxlLAot CQkJCU5VTEwsIE5VTEwpOworCXJldCA9IF9faTkxNV93YWl0X3NlcW5vKHJlcS0+cmluZywgaTkx NV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKSwKKwkJCQlyZXNldF9jb3VudGVyLCBpbnRlcnJ1 cHRpYmxlLCBOVUxMLCBOVUxMKTsKIAlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcSk7 CiAJcmV0dXJuIHJldDsKIH0KQEAgLTEzNjYsMTggKzEzNzEsMTMgQEAgaTkxNV9nZW1fb2JqZWN0 X3dhaXRfcmVuZGVyaW5nKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkgICAg ICAgYm9vbCByZWFkb25seSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsK LQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gb2JqLT5yaW5nOwotCXUzMiBzZXFubzsK IAlpbnQgcmV0OwogCiAJcmVxID0gcmVhZG9ubHkgPyBvYmotPmxhc3Rfd3JpdGVfcmVxIDogb2Jq LT5sYXN0X3JlYWRfcmVxOwogCWlmICghcmVxKQogCQlyZXR1cm4gMDsKIAotCXNlcW5vID0gaTkx NV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKTsKLQlXQVJOX09OKHNlcW5vID09IDApOwotCi0J cmV0ID0gaTkxNV93YWl0X3NlcW5vKHJpbmcsIHNlcW5vKTsKKwlyZXQgPSBpOTE1X3dhaXRfcmVx dWVzdChyZXEpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTMzMzUsOCArMzMzNSw3 IEBAIHN0YXRpYyBpbnQKIGk5MTVfZ2VtX29iamVjdF93YWl0X2ZlbmNlKHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpvYmopCiB7CiAJaWYgKG9iai0+bGFzdF9mZW5jZWRfcmVxKSB7Ci0JCWlu dCByZXQgPSBpOTE1X3dhaXRfc2Vxbm8ob2JqLT5yaW5nLAotCQkJICAgaTkxNV9nZW1fcmVxdWVz dF9nZXRfc2Vxbm8ob2JqLT5sYXN0X2ZlbmNlZF9yZXEpKTsKKwkJaW50IHJldCA9IGk5MTVfd2Fp dF9yZXF1ZXN0KG9iai0+bGFzdF9mZW5jZWRfcmVxKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiBy ZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggOWFlZDgzYy4uNjE3NzE3OSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTkyMiw3ICs5MjIsNiBAQCBzdGF0aWMgaW50IGxv Z2ljYWxfcmluZ193YWl0X3JlcXVlc3Qoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYs CiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJpbmc7CiAJc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwotCXUzMiBzZXFubyA9IDA7CiAJaW50 IHJldDsKIAogCWlmIChyaW5nYnVmLT5sYXN0X3JldGlyZWRfaGVhZCAhPSAtMSkgewpAQCAtOTM3 LDE1ICs5MzYsMTQgQEAgc3RhdGljIGludCBsb2dpY2FsX3Jpbmdfd2FpdF9yZXF1ZXN0KHN0cnVj dCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCWxpc3RfZm9yX2VhY2hfZW50cnkocmVxdWVz dCwgJnJpbmctPnJlcXVlc3RfbGlzdCwgbGlzdCkgewogCQlpZiAoX19pbnRlbF9yaW5nX3NwYWNl KHJlcXVlc3QtPnRhaWwsIHJpbmdidWYtPnRhaWwsCiAJCQkJICAgICAgIHJpbmdidWYtPnNpemUp ID49IGJ5dGVzKSB7Ci0JCQlzZXFubyA9IHJlcXVlc3QtPnNlcW5vOwogCQkJYnJlYWs7CiAJCX0K IAl9CiAKLQlpZiAoc2Vxbm8gPT0gMCkKKwlpZiAoJnJlcXVlc3QtPmxpc3QgPT0gJnJpbmctPnJl cXVlc3RfbGlzdCkKIAkJcmV0dXJuIC1FTk9TUEM7CiAKLQlyZXQgPSBpOTE1X3dhaXRfc2Vxbm8o cmluZywgc2Vxbm8pOworCXJldCA9IGk5MTVfd2FpdF9yZXF1ZXN0KHJlcXVlc3QpOwogCWlmIChy ZXQpCiAJCXJldHVybiByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX292ZXJsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYwppbmRl eCA1ZGVmYzM3Li42YzUzMGUyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9vdmVybGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCkBA IC0yMjQsOCArMjI0LDcgQEAgc3RhdGljIGludCBpbnRlbF9vdmVybGF5X2RvX3dhaXRfcmVxdWVz dChzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqb3ZlcmxheSwKIAkJcmV0dXJuIHJldDsKIAogCW92ZXJs YXktPmZsaXBfdGFpbCA9IHRhaWw7Ci0JcmV0ID0gaTkxNV93YWl0X3NlcW5vKHJpbmcsCi0JCQkg aTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ob3ZlcmxheS0+bGFzdF9mbGlwX3JlcSkpOworCXJl dCA9IGk5MTVfd2FpdF9yZXF1ZXN0KG92ZXJsYXktPmxhc3RfZmxpcF9yZXEpOwogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAJaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzKGRldik7CkBAIC0zNjcs MTkgKzM2NiwxNSBAQCBzdGF0aWMgaW50IGludGVsX292ZXJsYXlfb2ZmKHN0cnVjdCBpbnRlbF9v dmVybGF5ICpvdmVybGF5KQogICogV2UgaGF2ZSB0byBiZSBjYXJlZnVsIG5vdCB0byByZXBlYXQg d29yayBmb3JldmVyIGFuIG1ha2UgZm9yd2FyZCBwcm9nZXNzLiAqLwogc3RhdGljIGludCBpbnRl bF9vdmVybGF5X3JlY292ZXJfZnJvbV9pbnRlcnJ1cHQoc3RydWN0IGludGVsX292ZXJsYXkgKm92 ZXJsYXkpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG92ZXJsYXktPmRldjsKLQlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSAmZGV2X3ByaXYtPnJpbmdbUkNTXTsKIAlpbnQgcmV0 OwogCiAJaWYgKG92ZXJsYXktPmxhc3RfZmxpcF9yZXEgPT0gTlVMTCkKIAkJcmV0dXJuIDA7CiAK LQlyZXQgPSBpOTE1X3dhaXRfc2Vxbm8ocmluZywKLQkJCSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9z ZXFubyhvdmVybGF5LT5sYXN0X2ZsaXBfcmVxKSk7CisJcmV0ID0gaTkxNV93YWl0X3JlcXVlc3Qo b3ZlcmxheS0+bGFzdF9mbGlwX3JlcSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKLQlpOTE1 X2dlbV9yZXRpcmVfcmVxdWVzdHMoZGV2KTsKKwlpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHMob3Zl cmxheS0+ZGV2KTsKIAogCWlmIChvdmVybGF5LT5mbGlwX3RhaWwpCiAJCW92ZXJsYXktPmZsaXBf dGFpbChvdmVybGF5KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRl eCBhY2NmYzg5Li5iOWQwZDI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jCkBAIC0xODk5LDcgKzE4OTksNiBAQCBzdGF0aWMgaW50IGludGVsX3Jpbmdfd2FpdF9yZXF1 ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIGludCBuKQogewogCXN0cnVjdCBpbnRl bF9yaW5nYnVmZmVyICpyaW5nYnVmID0gcmluZy0+YnVmZmVyOwogCXN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxdWVzdDsKLQl1MzIgc2Vxbm8gPSAwOwogCWludCByZXQ7CiAKIAlpZiAo cmluZ2J1Zi0+bGFzdF9yZXRpcmVkX2hlYWQgIT0gLTEpIHsKQEAgLTE5MTQsMTUgKzE5MTMsMTQg QEAgc3RhdGljIGludCBpbnRlbF9yaW5nX3dhaXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nLCBpbnQgbikKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJlcXVlc3QsICZyaW5nLT5y ZXF1ZXN0X2xpc3QsIGxpc3QpIHsKIAkJaWYgKF9faW50ZWxfcmluZ19zcGFjZShyZXF1ZXN0LT50 YWlsLCByaW5nYnVmLT50YWlsLAogCQkJCSAgICAgICByaW5nYnVmLT5zaXplKSA+PSBuKSB7Ci0J CQlzZXFubyA9IHJlcXVlc3QtPnNlcW5vOwogCQkJYnJlYWs7CiAJCX0KIAl9CiAKLQlpZiAoc2Vx bm8gPT0gMCkKKwlpZiAoJnJlcXVlc3QtPmxpc3QgPT0gJnJpbmctPnJlcXVlc3RfbGlzdCkKIAkJ cmV0dXJuIC1FTk9TUEM7CiAKLQlyZXQgPSBpOTE1X3dhaXRfc2Vxbm8ocmluZywgc2Vxbm8pOwor CXJldCA9IGk5MTVfd2FpdF9yZXF1ZXN0KHJlcXVlc3QpOwogCWlmIChyZXQpCiAJCXJldHVybiBy ZXQ7CiAKQEAgLTIwMTEsNyArMjAwOSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfd3JhcF9yaW5nX2J1 ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCiBpbnQgaW50ZWxfcmluZ19pZGxl KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB7Ci0JdTMyIHNlcW5vOworCXN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwogCWludCByZXQ7CiAKIAkvKiBXZSBuZWVkIHRvIGFk ZCBhbnkgcmVxdWVzdHMgcmVxdWlyZWQgdG8gZmx1c2ggdGhlIG9iamVjdHMgYW5kIHJpbmcgKi8K QEAgLTIwMjUsMTEgKzIwMjMsMTEgQEAgaW50IGludGVsX3JpbmdfaWRsZShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKQogCWlmIChsaXN0X2VtcHR5KCZyaW5nLT5yZXF1ZXN0X2xpc3QpKQog CQlyZXR1cm4gMDsKIAotCXNlcW5vID0gbGlzdF9lbnRyeShyaW5nLT5yZXF1ZXN0X2xpc3QucHJl diwKKwlyZXEgPSBsaXN0X2VudHJ5KHJpbmctPnJlcXVlc3RfbGlzdC5wcmV2LAogCQkJICAgc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0LAotCQkJICAgbGlzdCktPnNlcW5vOworCQkJICAgbGlz dCk7CiAKLQlyZXR1cm4gaTkxNV93YWl0X3NlcW5vKHJpbmcsIHNlcW5vKTsKKwlyZXR1cm4gaTkx NV93YWl0X3JlcXVlc3QocmVxKTsKIH0KIAogc3RhdGljIGludAotLSAKMS43LjkuNQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK