From: John.C.Harrison@Intel.com Subject: [PATCH v6 16/34] drm/i915: Added scheduler support to __wait_request() calls Date: Wed, 20 Apr 2016 18:13:34 +0100 Message-ID: <1461172435-4256-17-git-send-email-John.C.Harrison@Intel.com> References: <1461172435-4256-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 5458D6EA8E for ; Wed, 20 Apr 2016 17:14:16 +0000 (UTC) In-Reply-To: <1461172435-4256-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBzY2hl ZHVsZXIgY2FuIGNhdXNlIGJhdGNoIGJ1ZmZlcnMsIGFuZCBoZW5jZSByZXF1ZXN0cywgdG8gYmUK c3VibWl0dGVkIHRvIHRoZSByaW5nIG91dCBvZiBvcmRlciBhbmQgYXN5bmNocm9ub3VzbHkgdG8g dGhlaXIKc3VibWlzc2lvbiB0byB0aGUgZHJpdmVyLiBUaHVzIGF0IHRoZSBwb2ludCBvZiB3YWl0 aW5nIGZvciB0aGUKY29tcGxldGlvbiBvZiBhIGdpdmVuIHJlcXVlc3QsIGl0IGlzIG5vdCBldmVu IGd1YXJhbnRlZWQgdGhhdCB0aGUKcmVxdWVzdCBoYXMgYWN0dWFsbHkgYmVlbiBzZW50IHRvIHRo ZSBoYXJkd2FyZSB5ZXQuIEV2ZW4gaXQgaXMgaGFzCmJlZW4gc2VudCwgaXQgaXMgcG9zc2libGUg dGhhdCBpdCBjb3VsZCBiZSBwcmUtZW1wdGVkIGFuZCB0aHVzCid1bnNlbnQnLgoKVGhpcyBtZWFu cyB0aGF0IGl0IGlzIG5lY2Vzc2FyeSB0byBiZSBhYmxlIHRvIHN1Ym1pdCByZXF1ZXN0cyB0byB0 aGUKaGFyZHdhcmUgZHVyaW5nIHRoZSB3YWl0IGNhbGwgaXRzZWxmLiBVbmZvcnR1bmF0ZWx5LCB3 aGlsZSBzb21lCmNhbGxlcnMgb2YgX193YWl0X3JlcXVlc3QoKSByZWxlYXNlIHRoZSBtdXRleCBs b2NrIGZpcnN0LCBvdGhlcnMgZG8Kbm90IChhbmQgYXBwYXJlbnRseSBjYW4gbm90KS4gSGVuY2Ug dGhlcmUgaXMgdGhlIGFiaWxpdHkgdG8gZGVhZGxvY2sKYXMgdGhlIHdhaXQgc3RhbGxzIGZvciBz dWJtaXNzaW9uIGJ1dCB0aGUgYXN5bmNocm9ub3VzIHN1Ym1pc3Npb24gaXMKc3RhbGxlZCBmb3Ig dGhlIG11dGV4IGxvY2suCgpUaGlzIGNoYW5nZSBob29rcyB0aGUgc2NoZWR1bGVyIGluIHRvIHRo ZSBfX3dhaXRfcmVxdWVzdCgpIGNvZGUgdG8KZW5zdXJlIGNvcnJlY3QgYmVoYXZpb3VyLiBUaGF0 IGlzLCBmbHVzaCB0aGUgdGFyZ2V0IGJhdGNoIGJ1ZmZlcgp0aHJvdWdoIHRvIHRoZSBoYXJkd2Fy ZSBhbmQgZG8gbm90IGRlYWRsb2NrIHdhaXRpbmcgZm9yIHNvbWV0aGluZyB0aGF0CmNhbm5vdCBj dXJyZW50bHkgYmUgc3VibWl0dGVkLiBJbnN0ZWFkLCB0aGUgd2FpdCBjYWxsIG11c3QgcmV0dXJu CkVBR0FJTiBhdCBsZWFzdCBhcyBmYXIgYmFjayBhcyBuZWNlc3NhcnkgdG8gcmVsZWFzZSB0aGUg bXV0ZXggbG9jayBhbmQKYWxsb3cgdGhlIHNjaGVkdWxlcidzIGFzeW5jaHJvbm91cyBwcm9jZXNz aW5nIHRvIGdldCBpbiBhbmQgaGFuZGxlIHRoZQpwcmUtZW1wdGlvbiBvcGVyYXRpb24gYW5kIGV2 ZW50dWFsbHkgKHJlLSlzdWJtaXQgdGhlIHdvcmsuCgp2MzogUmVtb3ZlZCB0aGUgZXhwbGljaXQg c2NoZWR1bGVyIGZsdXNoIGZyb20gaTkxNV93YWl0X3JlcXVlc3QoKS4KVGhpcyBpcyBubyBsb25n ZXIgbmVjZXNzYXJ5IGFuZCB3YXMgY2F1c2luZyB1bmludGVuZGVkIGNoYW5nZXMgdG8gdGhlCnNj aGVkdWxlciBwcmlvcml0eSBsZXZlbCB3aGljaCBicm9rZSBhIHZhbGlkYXRpb24gdGVhbSB0ZXN0 LgoKdjQ6IENvcnJlY3RlZCB0aGUgZm9ybWF0IG9mIHNvbWUgY29tbWVudHMgdG8ga2VlcCB0aGUg c3R5bGUgY2hlY2tlcgpoYXBweS4KCnY1OiBBZGRlZCBmdW5jdGlvbiBkZXNjcmlwdGlvbi4gW0pv b25hcyBMYWh0aW5lbl0KCnY2OiBVcGRhdGVkIHRvIG5ld2VyIG5pZ2h0bHkgKGxvdHMgb2Ygcmlu ZyAtPiBlbmdpbmUgcmVuYW1pbmcpLgoKVXBkYXRlZCB0byB1c2UgJ3RvX2k5MTUoKScgaW5zdGVh ZCBvZiBkZXZfcHJpdmF0ZS4gQ2hhbmdlZCBleHRyYQpib29sZWFuIHdhaXRfcmVxdWVzdCgpIHBh cmFtZXRlciB0byBhIGZsYWdzIHdvcmQgYW5kIGNvbnN1bWVkIHRoZQpvcmlnaW5hbCBib29sZWFu IHBhcmFtZXRlciB0b28uIEFsc28sIHJlcGxhY2VkIHRoZQppOTE1X3NjaGVkdWxlcl9pc19yZXF1 ZXN0X3RyYWNrZWQoKSBmdW5jdGlvbiB3aXRoCmk5MTVfc2NoZWR1bGVyX2lzX211dGV4X3JlcXVp cmVkKCkgYXMgdGhlIG5lZWQgZm9yIHRoZSBmb3JtZXIgaGFzIGdvbmUKYXdheSBhbmQgaXQgd2Fz IHJlYWxseSBiZWluZyB1c2VkIHRvIGFzayB0aGUgbGF0dGVyIHF1ZXN0aW9uIGluIGEKY29udm9s dXRlZCBtYW5uZXIuIFtyZXZpZXcgZmVlZGJhY2sgZnJvbSBKb29uYXMgTGFodGluZW5dCgpGb3I6 IFZJWi0xNTg3ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJ bnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDcg KysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8IDQ5ICsrKysr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9z Y2hlZHVsZXIuYyAgIHwgMjYgKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfc2NoZWR1bGVyLmggICB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyAgICB8ICA1ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuYyB8ICA4ICsrKystLQogNiBmaWxlcyBjaGFuZ2VkLCA4MSBpbnNlcnRpb25zKCspLCAxNSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBlZDlkODI5Li42ZmEyNTQx IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMxNTksOSArMzE1OSwxNCBAQCB2b2lkIF9f aTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAlfX2k5 MTVfYWRkX3JlcXVlc3QocmVxLCBOVUxMLCBmYWxzZSkKIGludCBfX2k5MTVfd2FpdF9yZXF1ZXN0 KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJdW5zaWduZWQgcmVzZXRfY291 bnRlciwKLQkJCWJvb2wgaW50ZXJydXB0aWJsZSwKKwkJCXVpbnQzMl90IGZsYWdzLAogCQkJczY0 ICp0aW1lb3V0LAogCQkJc3RydWN0IGludGVsX3Jwc19jbGllbnQgKnJwcyk7CisKKy8qIGZsYWdz IHVzZWQgYnkgdXNlcnMgb2YgX19pOTE1X3dhaXRfcmVxdWVzdCAqLworI2RlZmluZSBJOTE1X1dB SVRfUkVRVUVTVF9JTlRFUlJVUFRJQkxFICAoMSA8PCAwKQorI2RlZmluZSBJOTE1X1dBSVRfUkVR VUVTVF9MT0NLRUQgICAgICAgICAoMSA8PCAxKQorCiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfd2Fp dF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIGludCBpOTE1X2dl bV9mYXVsdChzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSwgc3RydWN0IHZtX2ZhdWx0ICp2bWYp OwogaW50IF9fbXVzdF9jaGVjawpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggY2YwMzE2ZC4u OGY3YmY2ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xMjM0LDcgKzEyMzQsOSBAQCBz dGF0aWMgaW50IF9faTkxNV9zcGluX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEsIGludCBzdGF0ZSkKICAqIF9faTkxNV93YWl0X3JlcXVlc3QgLSB3YWl0IHVudGlsIGV4 ZWN1dGlvbiBvZiByZXF1ZXN0IGhhcyBmaW5pc2hlZAogICogQHJlcTogZHVoIQogICogQHJlc2V0 X2NvdW50ZXI6IHJlc2V0IHNlcXVlbmNlIGFzc29jaWF0ZWQgd2l0aCB0aGUgZ2l2ZW4gcmVxdWVz dAotICogQGludGVycnVwdGlibGU6IGRvIGFuIGludGVycnVwdGlibGUgd2FpdCAobm9ybWFsbHkg eWVzKQorICogQGZsYWdzOiBmbGFncyB0byBkZWZpbmUgdGhlIG5hdHVyZSBvZiB3YWl0CisgKiAg ICBJOTE1X1dBSVRfSU5URVJSVVBUSUJMRSAtIGRvIGFuIGludGVycnVwdGlibGUgd2FpdCAobm9y bWFsbHkgeWVzKQorICogICAgSTkxNV9XQUlUX0xPQ0tFRCAtIGNhbGxlciBpcyBob2xkaW5nIHN0 cnVjdF9tdXRleAogICogQHRpbWVvdXQ6IGluIC0gaG93IGxvbmcgdG8gd2FpdCAoTlVMTCBmb3Jl dmVyKTsgb3V0IC0gaG93IG11Y2ggdGltZSByZW1haW5pbmcKICAqCiAgKiBOb3RlOiBJdCBpcyBv ZiB1dG1vc3QgaW1wb3J0YW5jZSB0aGF0IHRoZSBwYXNzZWQgaW4gc2Vxbm8gYW5kIHJlc2V0X2Nv dW50ZXIKQEAgLTEyNDksMjAgKzEyNTEsMjIgQEAgc3RhdGljIGludCBfX2k5MTVfc3Bpbl9yZXF1 ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCBpbnQgc3RhdGUpCiAgKi8KIGlu dCBfX2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAog CQkJdW5zaWduZWQgcmVzZXRfY291bnRlciwKLQkJCWJvb2wgaW50ZXJydXB0aWJsZSwKKwkJCXVp bnQzMl90IGZsYWdzLAogCQkJczY0ICp0aW1lb3V0LAogCQkJc3RydWN0IGludGVsX3Jwc19jbGll bnQgKnJwcykKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSBpOTE1X2dlbV9y ZXF1ZXN0X2dldF9lbmdpbmUocmVxKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5naW5l LT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKKwlib29sIGludGVycnVwdGlibGUgPSBmbGFncyAmIEk5MTVfV0FJVF9SRVFVRVNUX0lO VEVSUlVQVElCTEU7CiAJaW50IHN0YXRlID0gaW50ZXJydXB0aWJsZSA/IFRBU0tfSU5URVJSVVBU SUJMRSA6IFRBU0tfVU5JTlRFUlJVUFRJQkxFOwogCXVpbnQzMl90IHNlcW5vOwogCURFRklORV9X QUlUKHdhaXQpOwogCXVuc2lnbmVkIGxvbmcgdGltZW91dF9leHBpcmU7CiAJczY0IGJlZm9yZSA9 IDA7IC8qIE9ubHkgdG8gc2lsZW5jZSBhIGNvbXBpbGVyIHdhcm5pbmcuICovCi0JaW50IHJldDsK KwlpbnQgcmV0ID0gMDsKIAorCW1pZ2h0X3NsZWVwKCk7CiAJV0FSTighaW50ZWxfaXJxc19lbmFi bGVkKGRldl9wcml2KSwgIklSUXMgZGlzYWJsZWQiKTsKIAogCWlmIChpOTE1X2dlbV9yZXF1ZXN0 X2NvbXBsZXRlZChyZXEpKQpAQCAtMTMxNyw2ICsxMzIxLDE5IEBAIGludCBfX2k5MTVfd2FpdF9y ZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJYnJlYWs7CiAJCX0K IAorCQlpZiAoZmxhZ3MgJiBJOTE1X1dBSVRfUkVRVUVTVF9MT0NLRUQpIHsKKwkJCS8qCisJCQkg KiBJZiB0aGlzIHJlcXVlc3QgaXMgYmVpbmcgcHJvY2Vzc2VkIGJ5IHRoZSBzY2hlZHVsZXIKKwkJ CSAqIHRoZW4gaXQgaXMgdW5zYWZlIHRvIHNsZWVwIHdpdGggdGhlIG11dGV4IGxvY2sgaGVsZAor CQkJICogYXMgdGhlIHNjaGVkdWxlciBtYXkgcmVxdWlyZSB0aGUgbG9jayBpbiBvcmRlciB0bwor CQkJICogcHJvZ3Jlc3MgdGhlIHJlcXVlc3QuCisJCQkgKi8KKwkJCWlmIChpOTE1X3NjaGVkdWxl cl9pc19tdXRleF9yZXF1aXJlZChyZXEpKSB7CisJCQkJcmV0ID0gLUVBR0FJTjsKKwkJCQlicmVh azsKKwkJCX0KKwkJfQorCiAJCWlmIChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEpKSB7 CiAJCQlyZXQgPSAwOwogCQkJYnJlYWs7CkBAIC0xNTIxLDYgKzE1MzgsNyBAQCBpOTE1X3dhaXRf cmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXY7CiAJYm9vbCBpbnRlcnJ1cHRpYmxlOwogCWludCByZXQ7CisJ dWludDMyX3QgZmxhZ3M7CiAKIAlCVUdfT04ocmVxID09IE5VTEwpOwogCkBAIC0xNTM0LDkgKzE1 NTIsMTMgQEAgaTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEpCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAorCWZsYWdzID0gSTkxNV9XQUlUX1JFUVVF U1RfTE9DS0VEOworCWlmIChpbnRlcnJ1cHRpYmxlKQorCQlmbGFncyB8PSBJOTE1X1dBSVRfUkVR VUVTVF9JTlRFUlJVUFRJQkxFOworCiAJcmV0ID0gX19pOTE1X3dhaXRfcmVxdWVzdChyZXEsCiAJ CQkJICBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKSwKLQkJ CQkgIGludGVycnVwdGlibGUsIE5VTEwsIE5VTEwpOworCQkJCSAgZmxhZ3MsIE5VTEwsIE5VTEwp OwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTE2NDgsNyArMTY3MCw4IEBAIGk5MTVf Z2VtX29iamVjdF93YWl0X3JlbmRlcmluZ19fbm9uYmxvY2tpbmcoc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaiwKIAogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCWZv ciAoaSA9IDA7IHJldCA9PSAwICYmIGkgPCBuOyBpKyspCi0JCXJldCA9IF9faTkxNV93YWl0X3Jl cXVlc3QocmVxdWVzdHNbaV0sIHJlc2V0X2NvdW50ZXIsIHRydWUsCisJCXJldCA9IF9faTkxNV93 YWl0X3JlcXVlc3QocmVxdWVzdHNbaV0sIHJlc2V0X2NvdW50ZXIsCisJCQkJCSAgSTkxNV9XQUlU X1JFUVVFU1RfSU5URVJSVVBUSUJMRSwKIAkJCQkJICBOVUxMLCBycHMpOwogCW11dGV4X2xvY2so JmRldi0+c3RydWN0X211dGV4KTsKIApAQCAtMzU4OSw3ICszNjEyLDggQEAgaTkxNV9nZW1fd2Fp dF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2Zp bGUgKmZpbGUpCiAKIAlmb3IgKGkgPSAwOyBpIDwgbjsgaSsrKSB7CiAJCWlmIChyZXQgPT0gMCkK LQkJCXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3QocmVxW2ldLCByZXNldF9jb3VudGVyLCB0cnVl LAorCQkJcmV0ID0gX19pOTE1X3dhaXRfcmVxdWVzdChyZXFbaV0sIHJlc2V0X2NvdW50ZXIsCisJ CQkJCQkgIEk5MTVfV0FJVF9SRVFVRVNUX0lOVEVSUlVQVElCTEUsCiAJCQkJCQkgIGFyZ3MtPnRp bWVvdXRfbnMgPiAwID8gJmFyZ3MtPnRpbWVvdXRfbnMgOiBOVUxMLAogCQkJCQkJICB0b19ycHNf Y2xpZW50KGZpbGUpKTsKIAkJaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZShyZXFbaV0pOwpA QCAtMzYyMCwxMSArMzY0NCwxNSBAQCBfX2k5MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmosCiAKIAlpZiAoIWk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQo b2JqLT5iYXNlLmRldikpIHsKIAkJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSB0b19p OTE1KG9iai0+YmFzZS5kZXYpOworCQl1aW50MzJfdCBmbGFnczsKKworCQlmbGFncyA9IEk5MTVf V0FJVF9SRVFVRVNUX0xPQ0tFRDsKKwkJaWYgKGk5MTUtPm1tLmludGVycnVwdGlibGUpCisJCQlm bGFncyB8PSBJOTE1X1dBSVRfUkVRVUVTVF9JTlRFUlJVUFRJQkxFOworCiAJCXJldCA9IF9faTkx NV93YWl0X3JlcXVlc3QoZnJvbV9yZXEsCiAJCQkJCSAgYXRvbWljX3JlYWQoJmk5MTUtPmdwdV9l cnJvci5yZXNldF9jb3VudGVyKSwKLQkJCQkJICBpOTE1LT5tbS5pbnRlcnJ1cHRpYmxlLAotCQkJ CQkgIE5VTEwsCi0JCQkJCSAgJmk5MTUtPnJwcy5zZW1hcGhvcmVzKTsKKwkJCQkJICBmbGFncywg TlVMTCwgJmk5MTUtPnJwcy5zZW1hcGhvcmVzKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7 CiAKQEAgLTQ2MTAsNyArNDYzOCw4IEBAIGk5MTVfZ2VtX3JpbmdfdGhyb3R0bGUoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCWlmICh0YXJnZXQgPT0gTlVM TCkKIAkJcmV0dXJuIDA7CiAKLQlyZXQgPSBfX2k5MTVfd2FpdF9yZXF1ZXN0KHRhcmdldCwgcmVz ZXRfY291bnRlciwgdHJ1ZSwgTlVMTCwgTlVMTCk7CisJcmV0ID0gX19pOTE1X3dhaXRfcmVxdWVz dCh0YXJnZXQsIHJlc2V0X2NvdW50ZXIsCisJCQkJICBJOTE1X1dBSVRfUkVRVUVTVF9JTlRFUlJV UFRJQkxFLCBOVUxMLCBOVUxMKTsKIAlpZiAocmV0ID09IDApCiAJCXF1ZXVlX2RlbGF5ZWRfd29y ayhkZXZfcHJpdi0+d3EsICZkZXZfcHJpdi0+bW0ucmV0aXJlX3dvcmssIDApOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwppbmRleCBjZGI4NmRhLi5jZjhiNTBhIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKQEAgLTkxMCw2ICs5MTAsMzIgQEAgdm9pZCBp OTE1X3NjaGVkdWxlcl93b3JrX2hhbmRsZXIoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogfQog CiAvKioKKyAqIGk5MTVfc2NoZWR1bGVyX2lzX211dGV4X3JlcXVpcmVkIC0gcXVlcnkgaWYgaXQg aXMgc2FmZSB0byBob2xkIHRoZSBtdXRleAorICogbG9jayB3aGlsZSB3YWl0aW5nIGZvciB0aGUg Z2l2ZW4gcmVxdWVzdC4KKyAqIEByZXE6IHJlcXVlc3QgdG8gYmUgcXVlcmllZAorICoKKyAqIExv b2tzIHVwIHRoZSBnaXZlbiByZXF1ZXN0IGluIHRoZSBzY2hlZHVsZXIncyBpbnRlcm5hbCBxdWV1 ZSBhbmQgcmVwb3J0cworICogb24gd2hldGhlciB0aGUgc2NoZWR1bGVyIHdpbGwgbmVlZCB0byBh Y3F1aXJlIHRoZSBkcml2ZXIncyBtdXRleCBsb2NrIGluCisgKiBvcmRlciBmb3IgdGhlIHRoYXQg cmVxdWVzdCB0byBjb21wbGV0ZS4KKyAqLworYm9vbCBpOTE1X3NjaGVkdWxlcl9pc19tdXRleF9y ZXF1aXJlZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKK3sKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHJlcS0+ZW5naW5lLT5kZXYpOworCXN0 cnVjdCBpOTE1X3NjaGVkdWxlciAqc2NoZWR1bGVyID0gZGV2X3ByaXYtPnNjaGVkdWxlcjsKKwor CWlmICghc2NoZWR1bGVyKQorCQlyZXR1cm4gZmFsc2U7CisKKwlpZiAocmVxLT5zY2hlZHVsZXJf cWUgPT0gTlVMTCkKKwkJcmV0dXJuIGZhbHNlOworCisJaWYgKEk5MTVfU1FTX0lTX1FVRVVFRChy ZXEtPnNjaGVkdWxlcl9xZSkpCisJCXJldHVybiB0cnVlOworCisJcmV0dXJuIGZhbHNlOworfQor CisvKioKICAqIGk5MTVfc2NoZWR1bGVyX2Nsb3NlZmlsZSAtIG5vdGlmeSB0aGUgc2NoZWR1bGVy IHRoYXQgYSBEUk0gZmlsZSBoYW5kbGUKICAqIGhhcyBiZWVuIGNsb3NlZC4KICAqIEBkZXY6IERS TSBkZXZpY2UKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVy LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oCmluZGV4IGI4ZDRhMzQz Li4zOGU4NjBkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxl ci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgKQEAgLTExMSw1 ICsxMTEsNiBAQCBpbnQgaTkxNV9zY2hlZHVsZXJfcXVldWVfZXhlY2J1ZmZlcihzdHJ1Y3QgaTkx NV9zY2hlZHVsZXJfcXVldWVfZW50cnkgKnFlKTsKIGJvb2wgaTkxNV9zY2hlZHVsZXJfbm90aWZ5 X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogdm9pZCBpOTE1X3Nj aGVkdWxlcl93YWtldXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVfc2NoZWR1 bGVyX3dvcmtfaGFuZGxlcihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspOworYm9vbCBpOTE1X3Nj aGVkdWxlcl9pc19tdXRleF9yZXF1aXJlZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cSk7CiAKICNlbmRpZiAgLyogX0k5MTVfU0NIRURVTEVSX0hfICovCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKaW5kZXggOTQwNzkzNC4uZjFkNzMwYSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTEzNzEsNyArMTEzNzEsNyBAQCBzdGF0aWMgdm9pZCBpbnRl bF9tbWlvX2ZsaXBfd29ya19mdW5jKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAlpZiAobW1p b19mbGlwLT5yZXEpIHsKIAkJV0FSTl9PTihfX2k5MTVfd2FpdF9yZXF1ZXN0KG1taW9fZmxpcC0+ cmVxLAogCQkJCQkgICAgbW1pb19mbGlwLT5jcnRjLT5yZXNldF9jb3VudGVyLAotCQkJCQkgICAg ZmFsc2UsIE5VTEwsCisJCQkJCSAgICAwLCBOVUxMLAogCQkJCQkgICAgJm1taW9fZmxpcC0+aTkx NS0+cnBzLm1taW9mbGlwcykpOwogCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKG1taW9f ZmxpcC0+cmVxKTsKIAl9CkBAIC0xMzQzOSw3ICsxMzQzOSw4IEBAIHN0YXRpYyBpbnQgaW50ZWxf YXRvbWljX3ByZXBhcmVfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJY29udGlu dWU7CiAKIAkJCXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3QoaW50ZWxfcGxhbmVfc3RhdGUtPndh aXRfcmVxLAotCQkJCQkJICByZXNldF9jb3VudGVyLCB0cnVlLAorCQkJCQkJICByZXNldF9jb3Vu dGVyLAorCQkJCQkJICBJOTE1X1dBSVRfUkVRVUVTVF9JTlRFUlJVUFRJQkxFLAogCQkJCQkJICBO VUxMLCBOVUxMKTsKIAogCQkJLyogU3dhbGxvdyAtRUlPIGVycm9ycyB0byBhbGxvdyB1cGRhdGVz IGR1cmluZyBodyBsb2NrdXAuICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmMKaW5kZXggZTNmMjIzNy4uNjAyMTY1NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYwpAQCAtMjM2Miw2ICsyMzYyLDcgQEAgc3RhdGljIHZvaWQgX193cmFwX3Jpbmdf YnVmZmVyKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogaW50IGludGVsX2VuZ2lu ZV9pZGxlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcTsKKwl1aW50MzJfdCBmbGFnczsKIAogCS8qIFdhaXQgdXBvbiB0 aGUgbGFzdCByZXF1ZXN0IHRvIGJlIGNvbXBsZXRlZCAqLwogCWlmIChsaXN0X2VtcHR5KCZlbmdp bmUtPnJlcXVlc3RfbGlzdCkpCkBAIC0yMzcxLDExICsyMzcyLDE0IEBAIGludCBpbnRlbF9lbmdp bmVfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCQkgc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0LAogCQkJIGxpc3QpOwogCisJZmxhZ3MgPSBJOTE1X1dBSVRfUkVRVUVT VF9MT0NLRUQ7CisJaWYgKHRvX2k5MTUoZW5naW5lLT5kZXYpLT5tbS5pbnRlcnJ1cHRpYmxlKQor CQlmbGFncyB8PSBJOTE1X1dBSVRfUkVRVUVTVF9JTlRFUlJVUFRJQkxFOworCiAJLyogTWFrZSBz dXJlIHdlIGRvIG5vdCB0cmlnZ2VyIGFueSByZXRpcmVzICovCiAJcmV0dXJuIF9faTkxNV93YWl0 X3JlcXVlc3QocmVxLAogCQkJCSAgIGF0b21pY19yZWFkKCZ0b19pOTE1KGVuZ2luZS0+ZGV2KS0+ Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpLAotCQkJCSAgIHRvX2k5MTUoZW5naW5lLT5kZXYpLT5t bS5pbnRlcnJ1cHRpYmxlLAotCQkJCSAgIE5VTEwsIE5VTEwpOworCQkJCSAgIGZsYWdzLCBOVUxM LCBOVUxMKTsKIH0KIAogaW50IGludGVsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQotLSAKMS45LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=