From: Nick Hoath Subject: [PATCH 4/5] drm/i915: Subsume intel_ctx_submit_request in to drm_i915_gem_request Date: Wed, 12 Nov 2014 10:53:26 +0000 Message-ID: <1415789607-10243-5-git-send-email-nicholas.hoath@intel.com> References: <1415789607-10243-1-git-send-email-nicholas.hoath@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 04FA76E495 for ; Wed, 12 Nov 2014 02:57:35 -0800 (PST) In-Reply-To: <1415789607-10243-1-git-send-email-nicholas.hoath@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 TW92ZSBhbGwgcmVtYWluaW5nIGVsZW1lbnRzIHRoYXQgd2VyZSB1bmlxdWUgdG8gZXhlY2xpc3Rz IHF1ZXVlIGl0ZW1zCmluIHRvIHRoZSBhc3NvY2lhdGVkIHJlcXVlc3QuCgpTaWduZWQtb2ZmLWJ5 OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+Cklzc3VlOiBWSVotNDI3NAot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIHwgIDggKysrLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgfCAyMiArKysrKysrKysrKysrKysrKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgfCAgNiArKy0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgfCA0NyArKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCAgICB8IDI4IC0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwg NjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCA0NWRh NzllLi45Y2U5YTAyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn ZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMTg1MSw3 ICsxODUxLDcgQEAgc3RhdGljIGludCBpOTE1X2V4ZWNsaXN0cyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0s IHZvaWQgKmRhdGEpCiAJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwogCiAJZm9yX2Vh Y2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgcmluZ19pZCkgewotCQlzdHJ1Y3QgaW50ZWxfY3R4X3N1 Ym1pdF9yZXF1ZXN0ICpoZWFkX3JlcSA9IE5VTEw7CisJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqaGVhZF9yZXEgPSBOVUxMOwogCQlpbnQgY291bnQgPSAwOwogCQl1bnNpZ25lZCBsb25n IGZsYWdzOwogCkBAIC0xODg0LDE4ICsxODg0LDE4IEBAIHN0YXRpYyBpbnQgaTkxNV9leGVjbGlz dHMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCQlsaXN0X2Zvcl9lYWNoKGN1cnNv ciwgJnJpbmctPmV4ZWNsaXN0X3F1ZXVlKQogCQkJY291bnQrKzsKIAkJaGVhZF9yZXEgPSBsaXN0 X2ZpcnN0X2VudHJ5X29yX251bGwoJnJpbmctPmV4ZWNsaXN0X3F1ZXVlLAotCQkJCXN0cnVjdCBp bnRlbF9jdHhfc3VibWl0X3JlcXVlc3QsIGV4ZWNsaXN0X2xpbmspOworCQkJCXN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCwgZXhlY2xpc3RfbGluayk7CiAJCXNwaW5fdW5sb2NrX2lycXJlc3Rv cmUoJnJpbmctPmV4ZWNsaXN0X2xvY2ssIGZsYWdzKTsKIAogCQlzZXFfcHJpbnRmKG0sICJcdCVk IHJlcXVlc3RzIGluIHF1ZXVlXG4iLCBjb3VudCk7CiAJCWlmIChoZWFkX3JlcSkgewogCQkJc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmo7CiAKLQkJCWN0eF9vYmogPSBoZWFkX3Jl cS0+cmVxdWVzdC0+Y3R4LT5lbmdpbmVbcmluZ19pZF0uc3RhdGU7CisJCQljdHhfb2JqID0gaGVh ZF9yZXEtPmN0eC0+ZW5naW5lW3JpbmdfaWRdLnN0YXRlOwogCQkJc2VxX3ByaW50ZihtLCAiXHRI ZWFkIHJlcXVlc3QgaWQ6ICV1XG4iLAogCQkJCSAgIGludGVsX2V4ZWNsaXN0c19jdHhfaWQoY3R4 X29iaikpOwogCQkJc2VxX3ByaW50ZihtLCAiXHRIZWFkIHJlcXVlc3QgdGFpbDogJXVcbiIsCi0J CQkJICAgaGVhZF9yZXEtPnJlcXVlc3QtPnRhaWwpOworCQkJCSAgIGhlYWRfcmVxLT50YWlsKTsK IAkJfQogCiAJCXNlcV9wdXRjKG0sICdcbicpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg YWZhOWMzNS4uMGZlMjM4YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yMDI3LDYgKzIw MjcsMjggQEAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0IHsKIAlzdHJ1Y3QgbGlzdF9oZWFk IGZyZWVfbGlzdDsKIAogCXVpbnQzMl90IHVuaXE7CisKKwkvKioKKwkgKiBUaGUgRUxTUCBvbmx5 IGFjY2VwdHMgdHdvIGVsZW1lbnRzIGF0IGEgdGltZSwgc28gd2UgcXVldWUgY29udGV4dC90YWls CisJICogcGFpcnMgb24gYSBnaXZlbiBxdWV1ZSAocmluZy0+ZXhlY2xpc3RfcXVldWUpIHVudGls IHRoZSBoYXJkd2FyZSBpcworCSAqIGF2YWlsYWJsZS4gVGhlIHF1ZXVlIHNlcnZlcyBhIGRvdWJs ZSBwdXJwb3NlOiB3ZSBhbHNvIHVzZSBpdCB0byBrZWVwIHRyYWNrCisJICogb2YgdGhlIHVwIHRv IDIgY29udGV4dHMgY3VycmVudGx5IGluIHRoZSBoYXJkd2FyZSAodXN1YWxseSBvbmUgaW4gZXhl Y3V0aW9uCisJICogYW5kIHRoZSBvdGhlciBxdWV1ZWQgdXAgYnkgdGhlIEdQVSk6IFdlIG9ubHkg cmVtb3ZlIGVsZW1lbnRzIGZyb20gdGhlIGhlYWQKKwkgKiBvZiB0aGUgcXVldWUgd2hlbiB0aGUg aGFyZHdhcmUgaW5mb3JtcyB1cyB0aGF0IGFuIGVsZW1lbnQgaGFzIGJlZW4KKwkgKiBjb21wbGV0 ZWQuCisJICoKKwkgKiBBbGwgYWNjZXNzZXMgdG8gdGhlIHF1ZXVlIGFyZSBtZWRpYXRlZCBieSBh IHNwaW5sb2NrIChyaW5nLT5leGVjbGlzdF9sb2NrKS4KKwkgKi8KKworCS8qKiBFeGVjbGlzdCBs aW5rIGluIHRoZSBzdWJtaXNzaW9uIHF1ZXVlLiovCisJc3RydWN0IGxpc3RfaGVhZCBleGVjbGlz dF9saW5rOworCisJLyoqIEV4ZWNsaXN0cyB3b3JrcXVldWUgZm9yIHByb2Nlc3NpbmcgdGhpcyBy ZXF1ZXN0IGluIGEgYm90dG9tIGhhbGYgKi8KKwlzdHJ1Y3Qgd29ya19zdHJ1Y3Qgd29yazsKKwor CS8qKiBFeGVjbGlzdHMgbm8uIG9mIHRpbWVzIHRoaXMgcmVxdWVzdCBoYXMgYmVlbiBzZW50IHRv IHRoZSBFTFNQICovCisJaW50IGVsc3Bfc3VibWl0dGVkOworCiB9OwogCiB2b2lkIGk5MTVfZ2Vt X3JlcXVlc3RfZnJlZShzdHJ1Y3Qga3JlZiAqcmVxX3JlZik7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwppbmRleCBiZDVhMWUyLi40ZDJkMmU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI2 OTYsMTQgKzI2OTYsMTQgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfcmluZ19jbGVhbnVw KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAl9CiAKIAl3aGlsZSAoIWxpc3Rf ZW1wdHkoJnJpbmctPmV4ZWNsaXN0X3F1ZXVlKSkgewotCQlzdHJ1Y3QgaW50ZWxfY3R4X3N1Ym1p dF9yZXF1ZXN0ICpzdWJtaXRfcmVxOworCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnN1 Ym1pdF9yZXE7CiAKIAkJc3VibWl0X3JlcSA9IGxpc3RfZmlyc3RfZW50cnkoJnJpbmctPmV4ZWNs aXN0X3F1ZXVlLAotCQkJCXN0cnVjdCBpbnRlbF9jdHhfc3VibWl0X3JlcXVlc3QsCisJCQkJc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0LAogCQkJCWV4ZWNsaXN0X2xpbmspOwogCQlsaXN0X2Rl bCgmc3VibWl0X3JlcS0+ZXhlY2xpc3RfbGluayk7CiAJCWludGVsX3J1bnRpbWVfcG1fcHV0KGRl dl9wcml2KTsKLQkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShzdWJtaXRfcmVxLT5yZXF1 ZXN0LT5jdHgpOworCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKHN1Ym1pdF9yZXEtPmN0 eCk7CiAJCWtmcmVlKHN1Ym1pdF9yZXEpOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpp bmRleCA0YmQ5NTcyLi5iNmVjMDEyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMzgy LDggKzM4Miw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19zdWJtaXRfY29udGV4dHMoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAogc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRf dW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewotCXN0cnVjdCBpbnRlbF9j dHhfc3VibWl0X3JlcXVlc3QgKnJlcTAgPSBOVUxMLCAqcmVxMSA9IE5VTEw7Ci0Jc3RydWN0IGlu dGVsX2N0eF9zdWJtaXRfcmVxdWVzdCAqY3Vyc29yID0gTlVMTCwgKnRtcCA9IE5VTEw7CisJc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEwID0gTlVMTCwgKnJlcTEgPSBOVUxMOworCXN0 cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqY3Vyc29yID0gTlVMTCwgKnRtcCA9IE5VTEw7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0 ZTsKIAogCWFzc2VydF9zcGluX2xvY2tlZCgmcmluZy0+ZXhlY2xpc3RfbG9jayk7CkBAIC0zOTYs NyArMzk2LDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nKQogCQkJCSBleGVjbGlzdF9saW5rKSB7CiAJCWlmICghcmVx MCkgewogCQkJcmVxMCA9IGN1cnNvcjsKLQkJfSBlbHNlIGlmIChyZXEwLT5yZXF1ZXN0LT5jdHgg PT0gY3Vyc29yLT5yZXF1ZXN0LT5jdHgpIHsKKwkJfSBlbHNlIGlmIChyZXEwLT5jdHggPT0gY3Vy c29yLT5jdHgpIHsKIAkJCS8qIFNhbWUgY3R4OiBpZ25vcmUgZmlyc3QgcmVxdWVzdCwgYXMgc2Vj b25kIHJlcXVlc3QKIAkJCSAqIHdpbGwgdXBkYXRlIHRhaWwgcGFzdCBmaXJzdCByZXF1ZXN0J3Mg d29ya2xvYWQgKi8KIAkJCWN1cnNvci0+ZWxzcF9zdWJtaXR0ZWQgPSByZXEwLT5lbHNwX3N1Ym1p dHRlZDsKQEAgLTQxMSw5ICs0MTEsOSBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29udGV4dF91 bnF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAKIAlXQVJOX09OKHJlcTEgJiYg cmVxMS0+ZWxzcF9zdWJtaXR0ZWQpOwogCi0JZXhlY2xpc3RzX3N1Ym1pdF9jb250ZXh0cyhyaW5n LCByZXEwLT5yZXF1ZXN0LT5jdHgsIHJlcTAtPnJlcXVlc3QtPnRhaWwsCi0JCQkJICByZXExID8g cmVxMS0+cmVxdWVzdC0+Y3R4IDogTlVMTCwKLQkJCQkgIHJlcTEgPyByZXExLT5yZXF1ZXN0LT50 YWlsIDogMCk7CisJZXhlY2xpc3RzX3N1Ym1pdF9jb250ZXh0cyhyaW5nLCByZXEwLT5jdHgsIHJl cTAtPnRhaWwsCisJCQkJICByZXExID8gcmVxMS0+Y3R4IDogTlVMTCwKKwkJCQkgIHJlcTEgPyBy ZXExLT50YWlsIDogMCk7CiAKIAlyZXEwLT5lbHNwX3N1Ym1pdHRlZCsrOwogCWlmIChyZXExKQpA QCAtNDI0LDE3ICs0MjQsMTcgQEAgc3RhdGljIGJvb2wgZXhlY2xpc3RzX2NoZWNrX3JlbW92ZV9y ZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkJCSAgIHUzMiByZXF1ZXN0 X2lkKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCAqaGVhZF9yZXE7 CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpoZWFkX3JlcTsKIAogCWFzc2VydF9zcGlu X2xvY2tlZCgmcmluZy0+ZXhlY2xpc3RfbG9jayk7CiAKIAloZWFkX3JlcSA9IGxpc3RfZmlyc3Rf ZW50cnlfb3JfbnVsbCgmcmluZy0+ZXhlY2xpc3RfcXVldWUsCi0JCQkJCSAgICBzdHJ1Y3QgaW50 ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0LAorCQkJCQkgICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0LAogCQkJCQkgICAgZXhlY2xpc3RfbGluayk7CiAKIAlpZiAoaGVhZF9yZXEgIT0gTlVMTCkg ewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9Ci0JCQkJaGVhZF9yZXEt PnJlcXVlc3QtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZTsKKwkJCQloZWFkX3JlcS0+Y3R4 LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOwogCQlpZiAoaW50ZWxfZXhlY2xpc3RzX2N0eF9pZChj dHhfb2JqKSA9PSByZXF1ZXN0X2lkKSB7CiAJCQlXQVJOKGhlYWRfcmVxLT5lbHNwX3N1Ym1pdHRl ZCA9PSAwLAogCQkJICAgICAiTmV2ZXIgc3VibWl0dGVkIGhlYWQgcmVxdWVzdFxuIik7CkBAIC01 MTIsMTYgKzUxMiwxNiBAQCB2b2lkIGludGVsX2V4ZWNsaXN0c19oYW5kbGVfY3R4X2V2ZW50cyhz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCiBzdGF0aWMgdm9pZCBleGVjbGlzdHNfZnJl ZV9yZXF1ZXN0X3Rhc2soc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogewotCXN0cnVjdCBpbnRl bF9jdHhfc3VibWl0X3JlcXVlc3QgKnJlcSA9Ci0JCWNvbnRhaW5lcl9vZih3b3JrLCBzdHJ1Y3Qg aW50ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0LCB3b3JrKTsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gcmVxLT5yZXF1ZXN0LT5yaW5nLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEgPQorCQljb250YWluZXJfb2Yod29yaywgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 LCB3b3JrKTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcmVxLT5yaW5nLT5kZXY7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAogCWlu dGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKIAogCW11dGV4X2xvY2soJmRldi0+c3RydWN0 X211dGV4KTsKLQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKHJlcS0+cmVxdWVzdC0+Y3R4 KTsKLQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcS0+cmVxdWVzdCk7CisJaTkxNV9n ZW1fY29udGV4dF91bnJlZmVyZW5jZShyZXEtPmN0eCk7CisJaTkxNV9nZW1fcmVxdWVzdF91bnJl ZmVyZW5jZShyZXEpOwogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCiAJa2Zy ZWUocmVxKTsKQEAgLTUzMiwxNiArNTMyLDExIEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRl eHRfcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCQkgICB1MzIgdGFpbCwK IAkJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7Ci0Jc3RydWN0 IGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCAqcmVxID0gTlVMTCwgKmN1cnNvcjsKKwlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmN1cnNvcjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7 CiAJaW50IG51bV9lbGVtZW50cyA9IDA7CiAKLQlyZXEgPSBremFsbG9jKHNpemVvZigqcmVxKSwg R0ZQX0tFUk5FTCk7Ci0JaWYgKHJlcSA9PSBOVUxMKQotCQlyZXR1cm4gLUVOT01FTTsKLQlJTklU X1dPUksoJnJlcS0+d29yaywgZXhlY2xpc3RzX2ZyZWVfcmVxdWVzdF90YXNrKTsKLQogCWlmKCFy ZXF1ZXN0KQogCXsKIAkJLyoKQEAgLTU1OSw5ICs1NTQsOSBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0 c19jb250ZXh0X3F1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJewogCQlXQVJO X09OKHRvICE9IHJlcXVlc3QtPmN0eCk7CiAJfQotCXJlcS0+cmVxdWVzdCA9IHJlcXVlc3Q7CisJ SU5JVF9XT1JLKCZyZXF1ZXN0LT53b3JrLCBleGVjbGlzdHNfZnJlZV9yZXF1ZXN0X3Rhc2spOwog CWk5MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHJlcXVlc3QpOwotCWk5MTVfZ2VtX2NvbnRleHRf cmVmZXJlbmNlKHJlcS0+cmVxdWVzdC0+Y3R4KTsKKwlpOTE1X2dlbV9jb250ZXh0X3JlZmVyZW5j ZShyZXF1ZXN0LT5jdHgpOwogCiAJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwogCkBA IC01NzIsMTMgKzU2NywxMyBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19jb250ZXh0X3F1ZXVlKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQlicmVhazsKIAogCWlmIChudW1fZWxlbWVu dHMgPiAyKSB7Ci0JCXN0cnVjdCBpbnRlbF9jdHhfc3VibWl0X3JlcXVlc3QgKnRhaWxfcmVxOwor CQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnRhaWxfcmVxOwogCiAJCXRhaWxfcmVxID0g bGlzdF9sYXN0X2VudHJ5KCZyaW5nLT5leGVjbGlzdF9xdWV1ZSwKLQkJCQkJICAgc3RydWN0IGlu dGVsX2N0eF9zdWJtaXRfcmVxdWVzdCwKKwkJCQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0LAogCQkJCQkgICBleGVjbGlzdF9saW5rKTsKIAotCQlpZiAodG8gPT0gdGFpbF9yZXEtPnJl cXVlc3QtPmN0eCkgeworCQlpZiAodG8gPT0gdGFpbF9yZXEtPmN0eCkgewogCQkJV0FSTih0YWls X3JlcS0+ZWxzcF9zdWJtaXR0ZWQgIT0gMCwKIAkJCSAgICAgIk1vcmUgdGhhbiAyIGFscmVhZHkt c3VibWl0dGVkIHJlcXMgcXVldWVkXG4iKTsKIAkJCWxpc3RfZGVsKCZ0YWlsX3JlcS0+ZXhlY2xp c3RfbGluayk7CkBAIC01ODYsNyArNTgxLDcgQEAgc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4 dF9xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQl9CiAJfQogCi0JbGlzdF9h ZGRfdGFpbCgmcmVxLT5leGVjbGlzdF9saW5rLCAmcmluZy0+ZXhlY2xpc3RfcXVldWUpOworCWxp c3RfYWRkX3RhaWwoJnJlcXVlc3QtPmV4ZWNsaXN0X2xpbmssICZyaW5nLT5leGVjbGlzdF9xdWV1 ZSk7CiAJaWYgKG51bV9lbGVtZW50cyA9PSAwKQogCQlleGVjbGlzdHNfY29udGV4dF91bnF1ZXVl KHJpbmcpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IGJjNmZmMGQuLjk0ZmNkNWMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCkBAIC04NCwzNCArODQsNiBAQCBpbnQgaW50ZWxf ZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9m aWxlICpmaWxlLAogCQkJICAgICAgIHU2NCBleGVjX3N0YXJ0LCB1MzIgZmxhZ3MpOwogdTMyIGlu dGVsX2V4ZWNsaXN0c19jdHhfaWQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmop OwogCi0vKioKLSAqIHN0cnVjdCBpbnRlbF9jdHhfc3VibWl0X3JlcXVlc3QgLSBxdWV1ZWQgY29u dGV4dCBzdWJtaXNzaW9uIHJlcXVlc3QKLSAqIEBjdHg6IENvbnRleHQgdG8gc3VibWl0IHRvIHRo ZSBFTFNQLgotICogQHJpbmc6IEVuZ2luZSB0byBzdWJtaXQgaXQgdG8uCi0gKiBAdGFpbDogaG93 IGZhciBpbiB0aGUgY29udGV4dCdzIHJpbmdidWZmZXIgdGhpcyByZXF1ZXN0IGdvZXMgdG8uCi0g KiBAZXhlY2xpc3RfbGluazogbGluayBpbiB0aGUgc3VibWlzc2lvbiBxdWV1ZS4KLSAqIEB3b3Jr OiB3b3JrcXVldWUgZm9yIHByb2Nlc3NpbmcgdGhpcyByZXF1ZXN0IGluIGEgYm90dG9tIGhhbGYu Ci0gKiBAZWxzcF9zdWJtaXR0ZWQ6IG5vLiBvZiB0aW1lcyB0aGlzIHJlcXVlc3QgaGFzIGJlZW4g c2VudCB0byB0aGUgRUxTUC4KLSAqCi0gKiBUaGUgRUxTUCBvbmx5IGFjY2VwdHMgdHdvIGVsZW1l bnRzIGF0IGEgdGltZSwgc28gd2UgcXVldWUgY29udGV4dC90YWlsCi0gKiBwYWlycyBvbiBhIGdp dmVuIHF1ZXVlIChyaW5nLT5leGVjbGlzdF9xdWV1ZSkgdW50aWwgdGhlIGhhcmR3YXJlIGlzCi0g KiBhdmFpbGFibGUuIFRoZSBxdWV1ZSBzZXJ2ZXMgYSBkb3VibGUgcHVycG9zZTogd2UgYWxzbyB1 c2UgaXQgdG8ga2VlcCB0cmFjawotICogb2YgdGhlIHVwIHRvIDIgY29udGV4dHMgY3VycmVudGx5 IGluIHRoZSBoYXJkd2FyZSAodXN1YWxseSBvbmUgaW4gZXhlY3V0aW9uCi0gKiBhbmQgdGhlIG90 aGVyIHF1ZXVlZCB1cCBieSB0aGUgR1BVKTogV2Ugb25seSByZW1vdmUgZWxlbWVudHMgZnJvbSB0 aGUgaGVhZAotICogb2YgdGhlIHF1ZXVlIHdoZW4gdGhlIGhhcmR3YXJlIGluZm9ybXMgdXMgdGhh dCBhbiBlbGVtZW50IGhhcyBiZWVuCi0gKiBjb21wbGV0ZWQuCi0gKgotICogQWxsIGFjY2Vzc2Vz IHRvIHRoZSBxdWV1ZSBhcmUgbWVkaWF0ZWQgYnkgYSBzcGlubG9jayAocmluZy0+ZXhlY2xpc3Rf bG9jaykuCi0gKi8KLXN0cnVjdCBpbnRlbF9jdHhfc3VibWl0X3JlcXVlc3QgewotCXN0cnVjdCBs aXN0X2hlYWQgZXhlY2xpc3RfbGluazsKLQlzdHJ1Y3Qgd29ya19zdHJ1Y3Qgd29yazsKLQotCWlu dCBlbHNwX3N1Ym1pdHRlZDsKLQotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVz dDsKLX07Ci0KIHZvaWQgaW50ZWxfZXhlY2xpc3RzX2hhbmRsZV9jdHhfZXZlbnRzKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogCiAjZW5kaWYgLyogX0lOVEVMX0xSQ19IXyAqLwotLSAK Mi4xLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==