From: John.C.Harrison@Intel.com Subject: [PATCH 06/10] drm/i915: Add extra add_request calls Date: Tue, 9 Dec 2014 12:59:09 +0000 Message-ID: <1418129953-1505-7-git-send-email-John.C.Harrison@Intel.com> References: <1418129953-1505-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 17AF1727F1 for ; Tue, 9 Dec 2014 04:59:21 -0800 (PST) In-Reply-To: <1418129953-1505-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 ZHVsZXIgbmVlZHMgdG8gdHJhY2sgYmF0Y2ggYnVmZmVycyBieSByZXF1ZXN0IHdpdGhvdXQgZXh0 cmEsIG5vbi1iYXRjaApidWZmZXIgd29yayBiZWluZyBhdHRhY2hlZCB0byB0aGUgc2FtZSByZXF1 ZXN0LiBUaGlzIG1lYW5zIHRoYXQgYW55d2hlcmUgd2hpY2gKYWRkcyB3b3JrIHRvIHRoZSByaW5n IHNob3VsZCBleHBsaWNpdGx5IGNhbGwgaTkxNV9hZGRfcmVxdWVzdCgpIHdoZW4gaXQgaGFzCmZp bmlzaGVkIHdyaXRpbmcgdG8gdGhlIHJpbmcuCgpUaGUgYWRkX3JlcXVlc3QoKSBmdW5jdGlvbiBk b2VzIGV4dHJhIHdvcmssIHN1Y2ggYXMgZmx1c2hpbmcgY2FjaGVzLCB0aGF0IGRvZXMKbm90IG5l Y2Vzc2FyaWx5IHdhbnQgdG8gYmUgZG9uZSBldmVyeXdoZXJlLiBJbnN0ZWFkLCBhIG5ldwppOTE1 X2FkZF9yZXF1ZXN0X3dvX2ZsdXNoKCkgZnVuY3Rpb24gaGFzIGJlZW4gYWRkZWQgd2hpY2ggc2tp cHMgdGhlIGNhY2hlIGZsdXNoCmFuZCBqdXN0IHRpZGllcyB1cCB0aGUgcmVxdWVzdCBzdHJ1Y3R1 cmUuCgpOb3RlLCBtdWNoIG9mIHRoaXMgcGF0Y2ggd2FzIGltcGxlbWVudGVkIGJ5IE5hcmVzaCBL dW1hciBLYWNoaGkgZm9yIHBlbmRpbmcKcG93ZXIgbWFuYWdlbWVudCBpbXByb3ZlbWVudHMuIEhv d2V2ZXIsIGl0IGlzIGFsc28gZGlyZWN0bHkgYXBwbGljYWJsZSB0byB0aGUKc2NoZWR1bGVyIHdv cmsgYXMgbm90ZWQgYWJvdmUuCgpDaGFuZ2UtSWQ6IEk2NmE2ODYxMTE4ZWU4ZTdhZDdjYTZjODBj NzFhM2IyNTZkYjkyZTE4CkZvcjogVklaLTE1ODcKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNv biA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oICAgICAgICAgICAgICB8ICAgIDkgKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jICAgICAgICAgICAgICB8ICAgNDUgKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyAgICAgIHwgICAgOSAr KysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyAgIHwgICAg NCArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgICAgICAgIHwgICAg OSArKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jIHwg ICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAgICAgICAgfCAg IDIzICsrKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAg ICAgICAgIHwgICAgNCArLS0KIDggZmlsZXMgY2hhbmdlZCwgNzMgaW5zZXJ0aW9ucygrKSwgMzIg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMTFlODVjYi4uMGUyODBj NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNTUzLDcgKzI1NTMsNyBAQCBzdGF0aWMg aW5saW5lIHZvaWQgaTkxNV9nZW1fb2JqZWN0X3VucGluX3BhZ2VzKHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmopCiAKIGludCBfX211c3RfY2hlY2sgaTkxNV9tdXRleF9sb2NrX2ludGVy cnVwdGlibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1fb2JqZWN0X3N5 bmMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKLQkJCSBzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICp0byk7CisJCQkgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqdG8sIGJvb2wgYWRkX3Jl cXVlc3QpOwogdm9pZCBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShzdHJ1Y3QgaTkxNV92bWEgKnZt YSwKIAkJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiBpbnQgaTkxNV9nZW1f ZHVtYl9jcmVhdGUoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYsCkBAIC0yNjQxLDkgKzI2NDEs MTIgQEAgaW50IF9fbXVzdF9jaGVjayBpOTE1X2dwdV9pZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwogaW50IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLAogCQkgICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlLAotCQkgICAgICAgc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKmJhdGNoX29iaik7CisJCSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqYmF0Y2hfb2JqLAorCQkgICAgICAgYm9vbCBmbHVzaF9jYWNoZXMpOwogI2Rl ZmluZSBpOTE1X2FkZF9yZXF1ZXN0KHJpbmcpIFwKLQlfX2k5MTVfYWRkX3JlcXVlc3QocmluZywg TlVMTCwgTlVMTCkKKwlfX2k5MTVfYWRkX3JlcXVlc3QocmluZywgTlVMTCwgTlVMTCwgdHJ1ZSkK KyNkZWZpbmUgaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChyaW5nKSBcCisJX19pOTE1X2FkZF9y ZXF1ZXN0KHJpbmcsIE5VTEwsIE5VTEwsIGZhbHNlKQogaW50IF9faTkxNV93YWl0X3JlcXVlc3Qo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQl1bnNpZ25lZCByZXNldF9jb3Vu dGVyLAogCQkJYm9vbCBpbnRlcnJ1cHRpYmxlLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXgg ZGUyNDFlYi4uYjAyMmEyZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yNDE5LDcgKzI0 MTksOCBAQCBpOTE1X2dlbV9nZXRfc2Vxbm8oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyICpz ZXFubykKIAogaW50IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLAogCQkgICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlLAotCQkgICAgICAgc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaikKKwkJICAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmosCisJCSAgICAgICBib29sIGZsdXNoX2NhY2hlcykKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKQEAgLTI0NDUsMTIgKzI0NDYsMTEgQEAgaW50 IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCSAqIGlz IHRoYXQgdGhlIGZsdXNoIF9tdXN0XyBoYXBwZW4gYmVmb3JlIHRoZSBuZXh0IHJlcXVlc3QsIG5v IG1hdHRlcgogCSAqIHdoYXQuCiAJICovCi0JaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewot CQlyZXQgPSBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhyaW5nYnVmKTsKLQkJaWYgKHJl dCkKLQkJCXJldHVybiByZXQ7Ci0JfSBlbHNlIHsKLQkJcmV0ID0gaW50ZWxfcmluZ19mbHVzaF9h bGxfY2FjaGVzKHJpbmcpOworCWlmIChmbHVzaF9jYWNoZXMpIHsKKwkJaWYgKGk5MTUuZW5hYmxl X2V4ZWNsaXN0cykKKwkJCXJldCA9IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHJpbmdi dWYpOworCQllbHNlCisJCQlyZXQgPSBpbnRlbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMocmluZyk7 CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0KQEAgLTI0NjIsMTUgKzI0NjIsMTIgQEAg aW50IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCSAq LwogCXJlcXVlc3RfcmluZ19wb3NpdGlvbiA9IGludGVsX3JpbmdfZ2V0X3RhaWwocmluZ2J1Zik7 CiAKLQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CisJaWYgKGk5MTUuZW5hYmxlX2V4ZWNs aXN0cykKIAkJcmV0ID0gcmluZy0+ZW1pdF9yZXF1ZXN0KHJpbmdidWYpOwotCQlpZiAocmV0KQot CQkJcmV0dXJuIHJldDsKLQl9IGVsc2UgeworCWVsc2UKIAkJcmV0ID0gcmluZy0+YWRkX3JlcXVl c3QocmluZyk7Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCX0KKwlpZiAocmV0KQorCQly ZXR1cm4gcmV0OwogCiAJcmVxdWVzdC0+aGVhZCA9IHJlcXVlc3Rfc3RhcnQ7CiAJcmVxdWVzdC0+ dGFpbCA9IHJlcXVlc3RfcmluZ19wb3NpdGlvbjsKQEAgLTI5NzQsNiArMjk3MSw4IEBAIG91dDoK ICAqCiAgKiBAb2JqOiBvYmplY3Qgd2hpY2ggbWF5IGJlIGluIHVzZSBvbiBhbm90aGVyIHJpbmcu CiAgKiBAdG86IHJpbmcgd2Ugd2lzaCB0byB1c2UgdGhlIG9iamVjdCBvbi4gTWF5IGJlIE5VTEwu CisgKiBAYWRkX3JlcXVlc3Q6IGRvIHdlIG5lZWQgdG8gYWRkIGEgcmVxdWVzdCB0byB0cmFjayBv cGVyYXRpb25zCisgKiAgICBzdWJtaXR0ZWQgb24gcmluZyB3aXRoIHN5bmNfdG8gZnVuY3Rpb24K ICAqCiAgKiBUaGlzIGNvZGUgaXMgbWVhbnQgdG8gYWJzdHJhY3Qgb2JqZWN0IHN5bmNocm9uaXph dGlvbiB3aXRoIHRoZSBHUFUuCiAgKiBDYWxsaW5nIHdpdGggTlVMTCBpbXBsaWVzIHN5bmNocm9u aXppbmcgdGhlIG9iamVjdCB3aXRoIHRoZSBDUFUKQEAgLTI5ODMsNyArMjk4Miw3IEBAIG91dDoK ICAqLwogaW50CiBpOTE1X2dlbV9vYmplY3Rfc3luYyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqLAotCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnRvKQorCQkgICAgIHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnRvLCBib29sIGFkZF9yZXF1ZXN0KQogewogCXN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmZyb207CiAJdTMyIHNlcW5vOwpAQCAtMzAxMSwxMyArMzAxMCwxNiBAQCBp OTE1X2dlbV9vYmplY3Rfc3luYyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCiAJ dHJhY2VfaTkxNV9nZW1fcmluZ19zeW5jX3RvKGZyb20sIHRvLCBvYmotPmxhc3RfcmVhZF9yZXEp OwogCXJldCA9IHRvLT5zZW1hcGhvcmUuc3luY190byh0bywgZnJvbSwgc2Vxbm8pOwotCWlmICgh cmV0KQorCWlmICghcmV0KSB7CiAJCS8qIFdlIHVzZSBsYXN0X3JlYWRfcmVxIGJlY2F1c2Ugc3lu Y190bygpCiAJCSAqIG1pZ2h0IGhhdmUganVzdCBjYXVzZWQgc2Vxbm8gd3JhcCB1bmRlcgogCQkg KiB0aGUgcmFkYXIuCiAJCSAqLwogCQlmcm9tLT5zZW1hcGhvcmUuc3luY19zZXFub1tpZHhdID0K IAkJCQlpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhvYmotPmxhc3RfcmVhZF9yZXEpOworCQlp ZiAoYWRkX3JlcXVlc3QpCisJCQlpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHRvKTsKKwl9CiAK IAlyZXR1cm4gcmV0OwogfQpAQCAtMzEyNiw2ICszMTI4LDE1IEBAIGludCBpOTE1X2dwdV9pZGxl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkJcmV0dXJuIHJldDsKIAkJfQogCisJCS8qIE1h a2Ugc3VyZSB0aGUgY29udGV4dCBzd2l0Y2ggKGlmIG9uZSBhY3R1YWxseSBoYXBwZW5lZCkKKwkJ ICogZ2V0cyB3cmFwcGVkIHVwIGFuZCBmaW5pc2hlZCByYXRoZXIgdGhhbiBoYW5naW5nIGFyb3Vu ZAorCQkgKiBhbmQgY29uZnVzaW5nIHRoaW5ncyBsYXRlci4gKi8KKwkJaWYgKHJpbmctPm91dHN0 YW5kaW5nX2xhenlfcmVxdWVzdCkgeworCQkJcmV0ID0gaTkxNV9hZGRfcmVxdWVzdChyaW5nKTsK KwkJCWlmIChyZXQpCisJCQkJcmV0dXJuIHJldDsKKwkJfQorCiAJCXJldCA9IGludGVsX3Jpbmdf aWRsZShyaW5nKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CkBAIC0zOTQ2LDcgKzM5NTcs NyBAQCBpOTE1X2dlbV9vYmplY3RfcGluX3RvX2Rpc3BsYXlfcGxhbmUoc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm9iaiwKIAlpbnQgcmV0OwogCiAJaWYgKHBpcGVsaW5lZCAhPSBpOTE1X2dl bV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSkpIHsKLQkJcmV0ID0gaTkxNV9n ZW1fb2JqZWN0X3N5bmMob2JqLCBwaXBlbGluZWQpOworCQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rf c3luYyhvYmosIHBpcGVsaW5lZCwgdHJ1ZSk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0Owog CX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCA1Y2QyYjk3Li5i MmYxMjk2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC00MjYs NiArNDI2LDE1IEBAIGludCBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQlyZXQgPSBpOTE1X3N3aXRjaF9jb250ZXh0KHJpbmcsIHJp bmctPmRlZmF1bHRfY29udGV4dCk7CiAJCQlpZiAocmV0KQogCQkJCXJldHVybiByZXQ7CisKKwkJ CS8qIE1ha2Ugc3VyZSB0aGUgY29udGV4dCBzd2l0Y2ggKGlmIG9uZSBhY3R1YWxseSBoYXBwZW5l ZCkKKwkJCSAqIGdldHMgd3JhcHBlZCB1cCBhbmQgZmluaXNoZWQgcmF0aGVyIHRoYW4gaGFuZ2lu ZyBhcm91bmQKKwkJCSAqIGFuZCBjb25mdXNpbmcgdGhpbmdzIGxhdGVyLiAqLworCQkJaWYgKHJp bmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCkgeworCQkJCXJldCA9IGk5MTVfYWRkX3JlcXVl c3Rfbm9fZmx1c2gocmluZyk7CisJCQkJaWYgKHJldCkKKwkJCQkJcmV0dXJuIHJldDsKKwkJCX0K IAkJfQogCiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVm ZmVyLmMKaW5kZXggYWE0NTY2ZS4uMTI2OGU4OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtODMyLDcgKzgzMiw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZm ZXJfbW92ZV90b19ncHUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAogCWxpc3RfZm9y X2VhY2hfZW50cnkodm1hLCB2bWFzLCBleGVjX2xpc3QpIHsKIAkJc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaiA9IHZtYS0+b2JqOwotCQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc3luYyhv YmosIHJpbmcpOworCQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc3luYyhvYmosIHJpbmcsIGZhbHNl KTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAKQEAgLTk5Myw3ICs5OTMsNyBAQCBpOTE1 X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21tYW5kcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CXJpbmctPmdwdV9jYWNoZXNfZGlydHkgPSB0cnVlOwogCiAJLyogQWRkIGEgYnJlYWRjcnVtYiBm b3IgdGhlIGNvbXBsZXRpb24gb2YgdGhlIGJhdGNoIGJ1ZmZlciAqLwotCSh2b2lkKV9faTkxNV9h ZGRfcmVxdWVzdChyaW5nLCBmaWxlLCBvYmopOworCSh2b2lkKV9faTkxNV9hZGRfcmVxdWVzdChy aW5nLCBmaWxlLCBvYmosIHRydWUpOwogfQogCiBzdGF0aWMgaW50CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCmluZGV4IGFjMDNhMzguLjdlZWFkOTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCkBAIC0xMTUzLDYgKzExNTMsMTUgQEAgaW50IGk5MTVfcHBndHRfaW5pdF9o dyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJcmV0ID0gcHBndHQtPnN3aXRjaF9tbShwcGd0 dCwgcmluZyk7CiAJCQlpZiAocmV0ICE9IDApCiAJCQkJcmV0dXJuIHJldDsKKworCQkJLyogTWFr ZSBzdXJlIHRoZSBjb250ZXh0IHN3aXRjaCAoaWYgb25lIGFjdHVhbGx5IGhhcHBlbmVkKQorCQkJ ICogZ2V0cyB3cmFwcGVkIHVwIGFuZCBmaW5pc2hlZCByYXRoZXIgdGhhbiBoYW5naW5nIGFyb3Vu ZAorCQkJICogYW5kIGNvbmZ1c2luZyB0aGluZ3MgbGF0ZXIuICovCisJCQlpZiAocmluZy0+b3V0 c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KSB7CisJCQkJcmV0ID0gaTkxNV9hZGRfcmVxdWVzdF9ub19m bHVzaChyaW5nKTsKKwkJCQlpZiAocmV0KQorCQkJCQlyZXR1cm4gcmV0OworCQkJfQogCQl9CiAJ fQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3Rh dGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4 IDUyMTU0OGEuLmFiYTM5YzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX3JlbmRlcl9zdGF0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Jl bmRlcl9zdGF0ZS5jCkBAIC0xNzMsNyArMTczLDcgQEAgaW50IGk5MTVfZ2VtX3JlbmRlcl9zdGF0 ZV9pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAKIAlpOTE1X3ZtYV9tb3ZlX3Rv X2FjdGl2ZShpOTE1X2dlbV9vYmpfdG9fZ2d0dChzby5vYmopLCByaW5nKTsKIAotCXJldCA9IF9f aTkxNV9hZGRfcmVxdWVzdChyaW5nLCBOVUxMLCBzby5vYmopOworCXJldCA9IF9faTkxNV9hZGRf cmVxdWVzdChyaW5nLCBOVUxMLCBzby5vYmosIHRydWUpOwogCS8qIF9faTkxNV9hZGRfcmVxdWVz dCBtb3ZlcyBvYmplY3QgdG8gaW5hY3RpdmUgaWYgaXQgZmFpbHMgKi8KIG91dDoKIAlpOTE1X2dl bV9yZW5kZXJfc3RhdGVfZmluaSgmc28pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IGE5YmRjMTIuLjViOGQ0ZjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTkxMTYsNyArOTExNiw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuMl9xdWV1ZV9mbGlw KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIDApOyAvKiBh dXggZGlzcGxheSBiYXNlIGFkZHJlc3MsIHVudXNlZCAqLwogCiAJaW50ZWxfbWFya19wYWdlX2Zs aXBfYWN0aXZlKGludGVsX2NydGMpOwotCV9faW50ZWxfcmluZ19hZHZhbmNlKHJpbmcpOworCWk5 MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmluZyk7CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTkxNDgs NyArOTE0OCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuM19xdWV1ZV9mbGlwKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX05PT1ApOwogCiAJaW50ZWxf bWFya19wYWdlX2ZsaXBfYWN0aXZlKGludGVsX2NydGMpOwotCV9faW50ZWxfcmluZ19hZHZhbmNl KHJpbmcpOworCWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmluZyk7CiAJcmV0dXJuIDA7CiB9 CiAKQEAgLTkxODcsNyArOTE4Nyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuNF9xdWV1ZV9mbGlw KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIHBmIHwgcGlw ZXNyYyk7CiAKIAlpbnRlbF9tYXJrX3BhZ2VfZmxpcF9hY3RpdmUoaW50ZWxfY3J0Yyk7Ci0JX19p bnRlbF9yaW5nX2FkdmFuY2UocmluZyk7CisJaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChyaW5n KTsKIAlyZXR1cm4gMDsKIH0KIApAQCAtOTIyMyw3ICs5MjIzLDcgQEAgc3RhdGljIGludCBpbnRl bF9nZW42X3F1ZXVlX2ZsaXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpbnRlbF9yaW5nX2Vt aXQocmluZywgcGYgfCBwaXBlc3JjKTsKIAogCWludGVsX21hcmtfcGFnZV9mbGlwX2FjdGl2ZShp bnRlbF9jcnRjKTsKLQlfX2ludGVsX3JpbmdfYWR2YW5jZShyaW5nKTsKKwlpOTE1X2FkZF9yZXF1 ZXN0X25vX2ZsdXNoKHJpbmcpOwogCXJldHVybiAwOwogfQogCkBAIC05MzE4LDcgKzkzMTgsNyBA QCBzdGF0aWMgaW50IGludGVsX2dlbjdfcXVldWVfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCWludGVsX3JpbmdfZW1pdChyaW5nLCAoTUlfTk9PUCkpOwogCiAJaW50ZWxfbWFya19wYWdl X2ZsaXBfYWN0aXZlKGludGVsX2NydGMpOwotCV9faW50ZWxfcmluZ19hZHZhbmNlKHJpbmcpOwor CWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmluZyk7CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTk1 MjgsNyArOTUyOCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuOV9xdWV1ZV9mbGlwKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIGludGVsX2NydGMtPnVucGlu X3dvcmstPmd0dF9vZmZzZXQpOwogCiAJaW50ZWxfbWFya19wYWdlX2ZsaXBfYWN0aXZlKGludGVs X2NydGMpOwotCV9faW50ZWxfcmluZ19hZHZhbmNlKHJpbmcpOworCWk5MTVfYWRkX3JlcXVlc3Rf bm9fZmx1c2gocmluZyk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTk3MzQsOCArOTczNCwxNyBAQCBz dGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJ aWYgKHJldCkKIAkJCWdvdG8gY2xlYW51cF91bnBpbjsKIAorCQkvKiBCb3JrZWQ6IG5lZWQgdG8g Z2V0IHRoZSBzZXFubyBmb3IgdGhlIHJlcXVlc3Qgc3VibWl0dGVkIGluCisJCSAqICdxdWV1ZV9m bGlwKCknIGFib3ZlLiBIb3dldmVyLCBlaXRoZXIgdGhlIHJlcXVlc3QgaGFzIGJlZW4KKwkJICog cG9zdGVkIGFscmVhZHkgYW5kIHRoZSBzZXFubyBpcyBnb25lIChxX2YgY2FsbHMgYWRkX3JlcXVl c3QpLAorCQkgKiBvciB0aGUgcmVxdWVzdCBuZXZlciBnZXRzIHBvc3RlZCBhbmQgaXMgbWVyZ2Vk IGludG8gd2hhdGV2ZXIKKwkJICogcmVuZGVyIGNvbWVzIGFsb25nIG5leHQgKHFfZiBjYWxscyBy aW5nX2FkdmFuY2UpLgorCQkgKgorCQkgKiBPbiB0aGUgb3RoZXIgaGFuZCwgc2Vxbm9zIGFyZSBn b2luZyBhd2F5IHNvb24gYW55d2F5ISBTbworCQkgKiBob3BlZnVsbHkgdGhlIHByb2JsZW0gd2ls bCBkaXNhcHBlYXIuLi4KKwkJICovCiAJCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZ3b3JrLT5m bGlwX3F1ZXVlZF9yZXEsCi0JCQkJCWludGVsX3JpbmdfZ2V0X3JlcXVlc3QocmluZykpOworCQkJ CQlyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QgPyBpbnRlbF9yaW5nX2dldF9yZXF1ZXN0 KHJpbmcpIDogTlVMTCk7CiAJfQogCiAJd29yay0+ZmxpcF9xdWV1ZWRfdmJsYW5rID0gZHJtX3Zi bGFua19jb3VudChkZXYsIGludGVsX2NydGMtPnBpcGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YwppbmRleCA4MmE0N2UzLi42NDNhNTZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAt NjE3LDcgKzYxNyw3IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCB2bWFz LCBleGVjX2xpc3QpIHsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IHZtYS0+ b2JqOwogCi0JCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmluZyk7CisJCXJldCA9 IGk5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmluZywgdHJ1ZSk7CiAJCWlmIChyZXQpCiAJCQly ZXR1cm4gcmV0OwogCkBAIC0xNjMwLDcgKzE2MzAsNyBAQCBpbnQgaW50ZWxfbHJfY29udGV4dF9y ZW5kZXJfc3RhdGVfaW5pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCiAJaTkxNV92 bWFfbW92ZV90b19hY3RpdmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoc28ub2JqKSwgcmluZyk7CiAK LQlyZXQgPSBfX2k5MTVfYWRkX3JlcXVlc3QocmluZywgZmlsZSwgc28ub2JqKTsKKwlyZXQgPSBf X2k5MTVfYWRkX3JlcXVlc3QocmluZywgZmlsZSwgc28ub2JqLCB0cnVlKTsKIAkvKiBpbnRlbF9s b2dpY2FsX3JpbmdfYWRkX3JlcXVlc3QgbW92ZXMgb2JqZWN0IHRvIGluYWN0aXZlIGlmIGl0CiAJ ICogZmFpbHMgKi8KIG91dDoKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==