From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 28/59] drm/i915: Update i915_gem_object_sync() to take a request structure Date: Thu, 19 Mar 2015 12:30:33 +0000 Message-ID: <1426768264-16996-29-git-send-email-John.C.Harrison@Intel.com> References: <1426768264-16996-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 032006EA18 for ; Thu, 19 Mar 2015 05:31:38 -0700 (PDT) In-Reply-To: <1426768264-16996-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBwbGFu IGlzIHRvIHBhc3MgcmVxdWVzdHMgYXJvdW5kIGFzIHRoZSBiYXNpYyBzdWJtaXNzaW9uIHRyYWNr aW5nIHN0cnVjdHVyZQpyYXRoZXIgdGhhbiByaW5ncyBhbmQgY29udGV4dHMuIFRoaXMgcGF0Y2gg dXBkYXRlcyB0aGUgaTkxNV9nZW1fb2JqZWN0X3N5bmMoKQpjb2RlIHBhdGguCgp2MjogTXVjaCBt b3JlIGNvbXBsZXggcGF0Y2ggdG8gc2hhcmUgYSBzaW5nbGUgcmVxdWVzdCBiZXR3ZWVuIHRoZSBz eW5jIGFuZCB0aGUKcGFnZSBmbGlwLiBUaGUgX3N5bmMoKSBmdW5jdGlvbiBub3cgc3VwcG9ydHMg bGF6eSBhbGxvY2F0aW9uIG9mIHRoZSByZXF1ZXN0CnN0cnVjdHVyZS4gVGhhdCBpcywgaWYgb25l IGlzIHBhc3NlZCBpbiB0aGVuIHRoYXQgd2lsbCBiZSB1c2VkLiBJZiBvbmUgaXMgbm90LAp0aGVu IGEgcmVxdWVzdCB3aWxsIGJlIGFsbG9jYXRlZCBhbmQgcGFzc2VkIGJhY2sgb3V0LiBOb3RlIHRo YXQgdGhlIF9zeW5jKCkgY29kZQpkb2VzIG5vdCBuZWNlc3NhcmlseSByZXF1aXJlIGEgcmVxdWVz dC4gVGh1cyBvbmUgd2lsbCBvbmx5IGJlIGNyZWF0ZWQgdW50aWwKY2VydGFpbiBzaXR1YXRpb25z LiBUaGUgcmVhc29uIHRoZSBsYXp5IGFsbG9jYXRpb24gbXVzdCBiZSBkb25lIHdpdGhpbiB0aGUK X3N5bmMoKSBjb2RlIGl0c2VsZiBpcyBiZWNhdXNlIHRoZSBkZWNpc2lvbiB0byBuZWVkIG9uZSBv ciBub3QgaXMgbm90IHJlYWxseQpzb21ldGhpbmcgdGhhdCBjb2RlIGFib3ZlIGNhbiBzZWNvbmQg Z3Vlc3MgKGV4Y2VwdCBpbiB0aGUgY2FzZSB3aGVyZSBvbmUgaXMKZGVmaW5pdGVseSBub3QgcmVx dWlyZWQgYmVjYXVzZSBubyByaW5nIGlzIHBhc3NlZCBpbikuCgpUaGUgY2FsbCBjaGFpbnMgYWJv dmUgX3N5bmMoKSBub3cgc3VwcG9ydCBwYXNzaW5nIGEgcmVxdWVzdCB0aHJvdWdoIHdoaWNoIG1v c3QKY2FsbGVycyBwYXNzaW5nIGluIE5VTEwgYW5kIGFzc3VtaW5nIHRoYXQgbm8gcmVxdWVzdCB3 aWxsIGJlIHJlcXVpcmVkIChiZWNhdXNlCnRoZXkgYWxzbyBwYXNzIGluIE5VTEwgZm9yIHRoZSBy aW5nIGFuZCB0aGVyZWZvcmUgY2FuJ3QgYmUgZ2VuZXJhdGluZyBhbnkgcmluZwpjb2RlKS4KClRo ZSBleGVjZXB0aW9uIGlzIGludGVsX2NydGNfcGFnZV9mbGlwKCkgd2hpY2ggbm93IHN1cHBvcnRz IGhhdmluZyBhIHJlcXVlc3QKcmV0dXJuZWQgZnJvbSBfc3luYygpLiBJZiBvbmUgaXMsIHRoZW4g dGhhdCByZXF1ZXN0IGlzIHNoYXJlZCBieSB0aGUgcGFnZSBmbGlwCihpZiB0aGUgcGFnZSBmbGlw IGlzIG9mIGEgdHlwZSB0byBuZWVkIGEgcmVxdWVzdCkuIElmIF9zeW5jKCkgZG9lcyBub3QgZ2Vu ZXJhdGUKYSByZXF1ZXN0IGJ1dCB0aGUgcGFnZSBmbGlwIGRvZXMgbmVlZCBvbmUsIHRoZW4gdGhl IHBhZ2UgZmxpcCBwYXRoIHdpbGwgY3JlYXRlCml0J3Mgb3duIHJlcXVlc3QuCgpGb3I6IFZJWi01 MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgICAg NiArKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICB8ICAg MTkgKysrKysrKysrKysrKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl Y2J1ZmZlci5jIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j ICAgICAgIHwgICAxNyArKysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmggICAgICAgICAgIHwgICAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2ZiZGV2LmMgICAgICAgICB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jICAgICAgICAgICB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJs YXkuYyAgICAgICB8ICAgIDIgKy0KIDggZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwg MTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggY2EwNzBkMy4uNTVk ODJhNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNjY1LDcgKzI2NjUsOCBAQCBzdGF0 aWMgaW5saW5lIHZvaWQgaTkxNV9nZW1fb2JqZWN0X3VucGluX3BhZ2VzKHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpvYmopCiAKIGludCBfX211c3RfY2hlY2sgaTkxNV9tdXRleF9sb2NrX2lu dGVycnVwdGlibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1fb2JqZWN0 X3N5bmMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKLQkJCSBzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICp0byk7CisJCQkgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqdG8sCisJCQkgc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICoqdG9fcmVxKTsKIHZvaWQgaTkxNV92bWFfbW92ZV90 b19hY3RpdmUoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpOwogaW50IGk5MTVfZ2VtX2R1bWJfY3JlYXRlKHN0cnVjdCBkcm1fZmlsZSAq ZmlsZV9wcml2LApAQCAtMjc3Myw3ICsyNzc0LDggQEAgaTkxNV9nZW1fb2JqZWN0X3NldF90b19j cHVfZG9tYWluKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosIGJvb2wgd3JpdGUpOwog aW50IF9fbXVzdF9jaGVjawogaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkJICAgICB1MzIgYWxpZ25tZW50LAot CQkJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcGlwZWxpbmVkKTsKKwkJCQkgICAgIHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnBpcGVsaW5lZCwKKwkJCQkgICAgIHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqKnBpcGVsaW5lZF9yZXF1ZXN0KTsKIHZvaWQgaTkxNV9nZW1fb2JqZWN0 X3VucGluX2Zyb21fZGlzcGxheV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq KTsKIGludCBpOTE1X2dlbV9vYmplY3RfYXR0YWNoX3BoeXMoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaiwKIAkJCQlpbnQgYWxpZ24pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXgg MGEyNTQ2MS4uOTExNDA3MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yOTU3LDYgKzI5 NTcsOSBAQCBvdXQ6CiAgKgogICogQG9iajogb2JqZWN0IHdoaWNoIG1heSBiZSBpbiB1c2Ugb24g YW5vdGhlciByaW5nLgogICogQHRvOiByaW5nIHdlIHdpc2ggdG8gdXNlIHRoZSBvYmplY3Qgb24u IE1heSBiZSBOVUxMLgorICogQHRvX3JlcTogcmVxdWVzdCB3ZSB3aXNoIHRvIHVzZSB0aGUgb2Jq ZWN0IGZvci4gTWF5IGJlIE5VTEwuCisgKiAgICAgICAgICBUaGlzIHdpbGwgYmUgYWxsb2NhdGVk IGFuZCByZXR1cm5lZCBpZiBhIHJlcXVlc3QgaXMKKyAqICAgICAgICAgIHJlcXVpcmVkIGJ1dCBu b3QgcGFzc2VkIGluLgogICoKICAqIFRoaXMgY29kZSBpcyBtZWFudCB0byBhYnN0cmFjdCBvYmpl Y3Qgc3luY2hyb25pemF0aW9uIHdpdGggdGhlIEdQVS4KICAqIENhbGxpbmcgd2l0aCBOVUxMIGlt cGxpZXMgc3luY2hyb25pemluZyB0aGUgb2JqZWN0IHdpdGggdGhlIENQVQpAQCAtMjk2Niw3ICsy OTY5LDggQEAgb3V0OgogICovCiBpbnQKIGk5MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmosCi0JCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqdG8p CisJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqdG8sCisJCSAgICAgc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICoqdG9fcmVxKQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmZy b207CiAJdTMyIHNlcW5vOwpAQCAtMjk4MCw2ICsyOTg0LDggQEAgaTkxNV9nZW1fb2JqZWN0X3N5 bmMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlpZiAodG8gPT0gTlVMTCB8fCAh aTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChvYmotPmJhc2UuZGV2KSkKIAkJcmV0dXJuIGk5MTVf Z2VtX29iamVjdF93YWl0X3JlbmRlcmluZyhvYmosIGZhbHNlKTsKIAorCVdBUk5fT04oIXRvX3Jl cSk7CisKIAlpZHggPSBpbnRlbF9yaW5nX3N5bmNfaW5kZXgoZnJvbSwgdG8pOwogCiAJc2Vxbm8g PSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhvYmotPmxhc3RfcmVhZF9yZXEpOwpAQCAtMjk4 OCw2ICsyOTk0LDEyIEBAIGk5MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmosCiAJaWYgKHNlcW5vIDw9IGZyb20tPnNlbWFwaG9yZS5zeW5jX3NlcW5vW2lk eF0pCiAJCXJldHVybiAwOwogCisJaWYgKCp0b19yZXEgPT0gTlVMTCkgeworCQlyZXQgPSBpOTE1 X2dlbV9yZXF1ZXN0X2FsbG9jKHRvLCB0by0+ZGVmYXVsdF9jb250ZXh0LCB0b19yZXEpOworCQlp ZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CisKIAlyZXQgPSBpOTE1X2dlbV9jaGVja19vbHIo b2JqLT5sYXN0X3JlYWRfcmVxKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwpAQCAtMzk1Mywx NCArMzk2NSwxNSBAQCBzdGF0aWMgYm9vbCBpc19waW5fZGlzcGxheShzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqKQogaW50CiBpOTE1X2dlbV9vYmplY3RfcGluX3RvX2Rpc3BsYXlfcGxh bmUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQkgICAgIHUzMiBhbGlnbm1l bnQsCi0JCQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpwaXBlbGluZWQpCisJCQkJICAg ICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpwaXBlbGluZWQsCisJCQkJICAgICBzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKipwaXBlbGluZWRfcmVxdWVzdCkKIHsKIAl1MzIgb2xkX3JlYWRf ZG9tYWlucywgb2xkX3dyaXRlX2RvbWFpbjsKIAlib29sIHdhc19waW5fZGlzcGxheTsKIAlpbnQg cmV0OwogCiAJaWYgKHBpcGVsaW5lZCAhPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+ bGFzdF9yZWFkX3JlcSkpIHsKLQkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3N5bmMob2JqLCBwaXBl bGluZWQpOworCQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc3luYyhvYmosIHBpcGVsaW5lZCwgcGlw ZWxpbmVkX3JlcXVlc3QpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAl9CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggZWNhODhhNi4uMTk3OGY5 YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtOTAy LDcgKzkwMiw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgdm1hcywg ZXhlY19saXN0KSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSB2bWEtPm9i ajsKLQkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3N5bmMob2JqLCByZXEtPnJpbmcpOworCQlyZXQg PSBpOTE1X2dlbV9vYmplY3Rfc3luYyhvYmosIHJlcS0+cmluZywgJnJlcSk7CiAJCWlmIChyZXQp CiAJCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg ZjFjMDI5NS4uYzcxYzUyMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt MjI0NSw3ICsyMjQ1LDggQEAgaW50ZWxfZmJfYWxpZ25faGVpZ2h0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIGludCBoZWlnaHQsCiBpbnQKIGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCi0J CQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpwaXBlbGluZWQpCisJCQkgICBzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpwaXBlbGluZWQsCisJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKipwaXBlbGluZWRfcmVxdWVzdCkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZmIt PmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwpAQCAtMjMwNCw3ICsyMzA1LDcgQEAgaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwog CiAJZGV2X3ByaXYtPm1tLmludGVycnVwdGlibGUgPSBmYWxzZTsKLQlyZXQgPSBpOTE1X2dlbV9v YmplY3RfcGluX3RvX2Rpc3BsYXlfcGxhbmUob2JqLCBhbGlnbm1lbnQsIHBpcGVsaW5lZCk7CisJ cmV0ID0gaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKG9iaiwgYWxpZ25tZW50 LCBwaXBlbGluZWQsIHBpcGVsaW5lZF9yZXF1ZXN0KTsKIAlpZiAocmV0KQogCQlnb3RvIGVycl9p bnRlcnJ1cHRpYmxlOwogCkBAIC05ODgyLDYgKzk4ODMsNyBAQCBzdGF0aWMgaW50IGludGVsX2Ny dGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAllbnVtIHBpcGUgcGlwZSA9IGlu dGVsX2NydGMtPnBpcGU7CiAJc3RydWN0IGludGVsX3VucGluX3dvcmsgKndvcms7CiAJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZzsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3QgPSBOVUxMOwogCWludCByZXQ7CiAKIAkvKgpAQCAtOTk3OSw3ICs5OTgxLDcgQEAgc3Rh dGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCXJp bmcgPSAmZGV2X3ByaXYtPnJpbmdbUkNTXTsKIAl9CiAKLQlyZXQgPSBpbnRlbF9waW5fYW5kX2Zl bmNlX2ZiX29iaihjcnRjLT5wcmltYXJ5LCBmYiwgcmluZyk7CisJcmV0ID0gaW50ZWxfcGluX2Fu ZF9mZW5jZV9mYl9vYmooY3J0Yy0+cHJpbWFyeSwgZmIsIHJpbmcsICZyZXF1ZXN0KTsKIAlpZiAo cmV0KQogCQlnb3RvIGNsZWFudXBfcGVuZGluZzsKIApAQCAtMTAwMDQsNiArMTAwMDYsOSBAQCBz dGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJ CQkJaW50ZWxfcmluZ19nZXRfcmVxdWVzdChyaW5nKSk7CiAJfQogCisJaWYgKHJlcXVlc3QpCisJ CWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxdWVzdC0+cmluZyk7CisKIAl3b3JrLT5mbGlw X3F1ZXVlZF92YmxhbmsgPSBkcm1fY3J0Y192YmxhbmtfY291bnQoY3J0Yyk7CiAJd29yay0+ZW5h YmxlX3N0YWxsX2NoZWNrID0gdHJ1ZTsKIApAQCAtMTAwMjEsNiArMTAwMjYsOCBAQCBzdGF0aWMg aW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIGNsZWFudXBf dW5waW46CiAJaW50ZWxfdW5waW5fZmJfb2JqKG9iaik7CiBjbGVhbnVwX3BlbmRpbmc6CisJaWYg KHJlcXVlc3QpCisJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcXVlc3QpOwogCWF0b21pY19k ZWMoJmludGVsX2NydGMtPnVucGluX3dvcmtfY291bnQpOwogCW11dGV4X3VubG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOwogY2xlYW51cDoKQEAgLTExOTc1LDcgKzExOTgyLDcgQEAgaW50ZWxfcHJl cGFyZV9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJaWYgKHJldCkKIAkJCURS TV9ERUJVR19LTVMoImZhaWxlZCB0byBhdHRhY2ggcGh5cyBvYmplY3RcbiIpOwogCX0gZWxzZSB7 Ci0JCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHBsYW5lLCBmYiwgTlVMTCk7CisJ CXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHBsYW5lLCBmYiwgTlVMTCwgTlVMTCk7 CiAJfQogCiAJaWYgKHJldCA9PSAwKQpAQCAtMTM5MDAsNyArMTM5MDcsNyBAQCB2b2lkIGludGVs X21vZGVzZXRfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCQlpZiAoaW50ZWxf cGluX2FuZF9mZW5jZV9mYl9vYmooYy0+cHJpbWFyeSwKIAkJCQkJICAgICAgIGMtPnByaW1hcnkt PmZiLAotCQkJCQkgICAgICAgTlVMTCkpIHsKKwkJCQkJICAgICAgIE5VTEwsIE5VTEwpKSB7CiAJ CQlEUk1fRVJST1IoImZhaWxlZCB0byBwaW4gYm9vdCBmYiBvbiBwaXBlICVkXG4iLAogCQkJCSAg dG9faW50ZWxfY3J0YyhjKS0+cGlwZSk7CiAJCQlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2Uo Yy0+cHJpbWFyeS0+ZmIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA4YmIxOGU1Li42 YWQyODIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtOTYxLDcgKzk2MSw4IEBAIHZv aWQgaW50ZWxfcmVsZWFzZV9sb2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uZWN0b3IsCiAJCQkJICAgIHN0cnVjdCBpbnRlbF9sb2FkX2RldGVjdF9waXBlICpvbGQpOwog aW50IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog CQkJICAgICAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAotCQkJICAgICAgIHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnBpcGVsaW5lZCk7CisJCQkgICAgICAgc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcGlwZWxpbmVkLAorCQkJICAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq KnBpcGVsaW5lZF9yZXF1ZXN0KTsKIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKgogX19pbnRlbF9m cmFtZWJ1ZmZlcl9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSAgIHN0cnVjdCBk cm1fbW9kZV9mYl9jbWQyICptb2RlX2NtZCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCmlu ZGV4IDc1N2MwZDIuLjRlN2U3ZGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwpAQCAt MTUxLDcgKzE1MSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3QgZHJtX2ZiX2hl bHBlciAqaGVscGVyLAogCX0KIAogCS8qIEZsdXNoIGV2ZXJ5dGhpbmcgb3V0LCB3ZSdsbCBiZSBk b2luZyBHVFQgb25seSBmcm9tIG5vdyBvbiAqLwotCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2Vf ZmJfb2JqKE5VTEwsIGZiLCBOVUxMKTsKKwlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29i aihOVUxMLCBmYiwgTlVMTCwgTlVMTCk7CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoImZhaWxl ZCB0byBwaW4gb2JqOiAlZFxuIiwgcmV0KTsKIAkJZ290byBvdXRfZmI7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCmluZGV4IDA0ODBhZDQuLjkzZmFmMTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCkBAIC01OTAsNyArNTkwLDcgQEAgc3RhdGljIGludCBleGVjbGlzdHNfbW92ZV90b19ncHUo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2 bWEsIHZtYXMsIGV4ZWNfbGlzdCkgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq ID0gdm1hLT5vYmo7CiAKLQkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3N5bmMob2JqLCByZXEtPnJp bmcpOworCQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc3luYyhvYmosIHJlcS0+cmluZywgJnJlcSk7 CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9vdmVybGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVy bGF5LmMKaW5kZXggNmFmMjU4MS4uY2U3Nzk3YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfb3ZlcmxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292 ZXJsYXkuYwpAQCAtNzIwLDcgKzcyMCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfb3ZlcmxheV9kb19w dXRfaW1hZ2Uoc3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJsYXksCiAJaWYgKHJldCAhPSAwKQog CQlyZXR1cm4gcmV0OwogCi0JcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3Bs YW5lKG5ld19ibywgMCwgTlVMTCk7CisJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNw bGF5X3BsYW5lKG5ld19ibywgMCwgTlVMTCwgTlVMTCk7CiAJaWYgKHJldCAhPSAwKQogCQlyZXR1 cm4gcmV0OwogCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=