From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Use new i915_gem_object_pin_map for LRC Date: Tue, 12 Apr 2016 09:52:28 +0100 Message-ID: <1460451148-18848-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id B40716E663 for ; Tue, 12 Apr 2016 08:52:33 +0000 (UTC) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGNhbiB1 c2UgdGhlIG5ldyBwaW4vbGF6eSB1bnBpbiBBUEkgZm9yIHNpbXBsaWNpdHkKYW5kIG1vcmUgcGVy Zm9ybWFuY2UgaW4gdGhlIGV4ZWNsaXN0IHN1Ym1pc3Npb24gcGF0aHMuCgp2MjoKICAqIEZpeCBl cnJvciBoYW5kbGluZyBhbmQgY29udmVydCBtb3JlIHVzZXJzLgogICogQ29tcGFjdCBzb21lIG5h bWVzIGZvciByZWFkYWJpbGl0eS4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0 a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgfCAg MiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgOTggKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuaCAgICAgICAgfCAgNyArKy0KIDMgZmlsZXMgY2hhbmdlZCwgNjAgaW5zZXJ0aW9ucygrKSwg NDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmlu ZGV4IGZlNTgwY2I5NTAxYS4uOTEwMjhkOWM2MjY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fY29udGV4dC5jCkBAIC0zNDIsNyArMzQyLDcgQEAgdm9pZCBpOTE1X2dlbV9jb250ZXh0 X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpj dHg7CiAKIAkJbGlzdF9mb3JfZWFjaF9lbnRyeShjdHgsICZkZXZfcHJpdi0+Y29udGV4dF9saXN0 LCBsaW5rKQotCQkJaW50ZWxfbHJfY29udGV4dF9yZXNldChkZXYsIGN0eCk7CisJCQlpbnRlbF9s cl9jb250ZXh0X3Jlc2V0KGRldl9wcml2LCBjdHgpOwogCX0KIAogCWZvciAoaSA9IDA7IGkgPCBJ OTE1X05VTV9FTkdJTkVTOyBpKyspIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggMGQ2 ZGM1ZWM0YTQ2Li4wYzYxZDg0NzI1MmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0y MjksOCArMjI5LDkgQEAgZW51bSB7CiAKIHN0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4dF9waW4o c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpOwotc3RhdGljIHZvaWQgbHJjX3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKLQkJCQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKmRlZmF1bHRfY3R4X29iaik7CitzdGF0aWMgaW50CitscmNfc2V0dXBfaHdzKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKKwkgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqZGVmYXVsdF9jdHhfb2JqKTsKIAogCiAvKioKQEAgLTEwOTMsOCArMTA5NCw4IEBAIHN0 YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4dF9kb19waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0 eCwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdpbmVbZW5n aW5lLT5pZF0uc3RhdGU7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBjdHgt PmVuZ2luZVtlbmdpbmUtPmlkXS5yaW5nYnVmOwotCXN0cnVjdCBwYWdlICpscmNfc3RhdGVfcGFn ZTsKLQl1aW50MzJfdCAqbHJjX3JlZ19zdGF0ZTsKKwl2b2lkICpvYmpfYWRkcjsKKwl1MzIgKmxy Y19yZWdfc3RhdGU7CiAJaW50IHJldDsKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmZW5n aW5lLT5kZXYtPnN0cnVjdF9tdXRleCkpOwpAQCAtMTEwNCwxOSArMTEwNSwyMCBAQCBzdGF0aWMg aW50IGludGVsX2xyX2NvbnRleHRfZG9fcGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCWxyY19zdGF0ZV9wYWdlID0gaTkxNV9nZW1fb2Jq ZWN0X2dldF9kaXJ0eV9wYWdlKGN0eF9vYmosIExSQ19TVEFURV9QTik7Ci0JaWYgKFdBUk5fT04o IWxyY19zdGF0ZV9wYWdlKSkgewotCQlyZXQgPSAtRU5PREVWOworCW9ial9hZGRyID0gaTkxNV9n ZW1fb2JqZWN0X3Bpbl9tYXAoY3R4X29iaik7CisJaWYgKElTX0VSUihvYmpfYWRkcikpIHsKKwkJ cmV0ID0gUFRSX0VSUihvYmpfYWRkcik7CiAJCWdvdG8gdW5waW5fY3R4X29iajsKIAl9CiAKKwls cmNfcmVnX3N0YXRlID0gb2JqX2FkZHIgKyBMUkNfU1RBVEVfUE4gKiBQQUdFX1NJWkU7CisKIAly ZXQgPSBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihlbmdpbmUtPmRldiwgcmluZ2J1 Zik7CiAJaWYgKHJldCkKLQkJZ290byB1bnBpbl9jdHhfb2JqOworCQlnb3RvIHVucGluX21hcDsK IAogCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLmxyY192bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0 dChjdHhfb2JqKTsKIAlpbnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0b3JfdXBkYXRlKGN0eCwgZW5n aW5lKTsKLQlscmNfcmVnX3N0YXRlID0ga21hcChscmNfc3RhdGVfcGFnZSk7CiAJbHJjX3JlZ19z dGF0ZVtDVFhfUklOR19CVUZGRVJfU1RBUlQrMV0gPSByaW5nYnVmLT52bWEtPm5vZGUuc3RhcnQ7 CiAJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ubHJjX3JlZ19zdGF0ZSA9IGxyY19yZWdfc3RhdGU7 CiAJY3R4X29iai0+ZGlydHkgPSB0cnVlOwpAQCAtMTEyNyw2ICsxMTI5LDggQEAgc3RhdGljIGlu dCBpbnRlbF9scl9jb250ZXh0X2RvX3BpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCiAJ cmV0dXJuIHJldDsKIAordW5waW5fbWFwOgorCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAoY3R4 X29iaik7CiB1bnBpbl9jdHhfb2JqOgogCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0eF9v YmopOwogCkBAIC0xMTU5LDcgKzExNjMsNyBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4o c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgm Y3R4LT5pOTE1LT5kZXYtPnN0cnVjdF9tdXRleCkpOwogCWlmICgtLWN0eC0+ZW5naW5lW2VuZ2lu ZS0+aWRdLnBpbl9jb3VudCA9PSAwKSB7Ci0JCWt1bm1hcChrbWFwX3RvX3BhZ2UoY3R4LT5lbmdp bmVbZW5naW5lLT5pZF0ubHJjX3JlZ19zdGF0ZSkpOworCQlpOTE1X2dlbV9vYmplY3RfdW5waW5f bWFwKGN0eF9vYmopOwogCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihjdHgtPmVuZ2luZVtl bmdpbmUtPmlkXS5yaW5nYnVmKTsKIAkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4X29i aik7CiAJCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLmxyY192bWEgPSBOVUxMOwpAQCAtMTU4NCw5 ICsxNTg4LDEyIEBAIHN0YXRpYyBpbnQgZ2VuOF9pbml0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5naW5lLT5k ZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0 ZTsKIAl1bnNpZ25lZCBpbnQgbmV4dF9jb250ZXh0X3N0YXR1c19idWZmZXJfaHc7CisJaW50IHJl dDsKIAotCWxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShlbmdpbmUsCi0JCQkJICAgICAg IGRldl9wcml2LT5rZXJuZWxfY29udGV4dC0+ZW5naW5lW2VuZ2luZS0+aWRdLnN0YXRlKTsKKwly ZXQgPSBscmNfc2V0dXBfaHdzKGVuZ2luZSwKKwkJCSAgICBkZXZfcHJpdi0+a2VybmVsX2NvbnRl eHQtPmVuZ2luZVtlbmdpbmUtPmlkXS5zdGF0ZSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsK IAogCUk5MTVfV1JJVEVfSU1SKGVuZ2luZSwKIAkJICAgICAgIH4oZW5naW5lLT5pcnFfZW5hYmxl X21hc2sgfCBlbmdpbmUtPmlycV9rZWVwX21hc2spKTsKQEAgLTIwNDgsNyArMjA1NSw3IEBAIHZv aWQgaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogCWk5MTVfZ2VtX2JhdGNoX3Bvb2xfZmluaSgmZW5naW5lLT5iYXRjaF9wb29sKTsKIAog CWlmIChlbmdpbmUtPnN0YXR1c19wYWdlLm9iaikgewotCQlrdW5tYXAoc2dfcGFnZShlbmdpbmUt PnN0YXR1c19wYWdlLm9iai0+cGFnZXMtPnNnbCkpOworCQlpOTE1X2dlbV9vYmplY3RfdW5waW5f bWFwKGVuZ2luZS0+c3RhdHVzX3BhZ2Uub2JqKTsKIAkJZW5naW5lLT5zdGF0dXNfcGFnZS5vYmog PSBOVUxMOwogCX0KIApAQCAtMjM3OCwxNSArMjM4NSwxNiBAQCBzdGF0aWMgdTMyIGludGVsX2xy X2luZGlyZWN0X2N0eF9vZmZzZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogfQog CiBzdGF0aWMgaW50Ci1wb3B1bGF0ZV9scl9jb250ZXh0KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpj dHgsIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqLAorcG9wdWxhdGVfbHJfY29u dGV4dChzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAorCQkgICAgc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKmN0eF9vYmosCiAJCSAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUs CiAJCSAgICBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIHsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gZW5naW5lLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQg PSBjdHgtPnBwZ3R0OwotCXN0cnVjdCBwYWdlICpwYWdlOwotCXVpbnQzMl90ICpyZWdfc3RhdGU7 CisJdm9pZCAqb2JqX2FkZHI7CisJdTMyICpyZWdfc3RhdGU7CiAJaW50IHJldDsKIAogCWlmICgh cHBndHQpCkBAIC0yMzk4LDE4ICsyNDA2LDE3IEBAIHBvcHVsYXRlX2xyX2NvbnRleHQoc3RydWN0 IGludGVsX2NvbnRleHQgKmN0eCwgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vCiAJ CXJldHVybiByZXQ7CiAJfQogCi0JcmV0ID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhjdHhf b2JqKTsKLQlpZiAocmV0KSB7Ci0JCURSTV9ERUJVR19EUklWRVIoIkNvdWxkIG5vdCBnZXQgb2Jq ZWN0IHBhZ2VzXG4iKTsKKwlvYmpfYWRkciA9IGk5MTVfZ2VtX29iamVjdF9waW5fbWFwKGN0eF9v YmopOworCWlmIChJU19FUlIob2JqX2FkZHIpKSB7CisJCXJldCA9IFBUUl9FUlIob2JqX2FkZHIp OworCQlEUk1fREVCVUdfRFJJVkVSKCJDb3VsZCBub3QgbWFwIG9iamVjdCBwYWdlcyEgKCVkKVxu IiwgcmV0KTsKIAkJcmV0dXJuIHJldDsKIAl9Ci0KLQlpOTE1X2dlbV9vYmplY3RfcGluX3BhZ2Vz KGN0eF9vYmopOworCWN0eF9vYmotPmRpcnR5ID0gdHJ1ZTsKIAogCS8qIFRoZSBzZWNvbmQgcGFn ZSBvZiB0aGUgY29udGV4dCBvYmplY3QgY29udGFpbnMgc29tZSBmaWVsZHMgd2hpY2ggbXVzdAog CSAqIGJlIHNldCB1cCBwcmlvciB0byB0aGUgZmlyc3QgZXhlY3V0aW9uLiAqLwotCXBhZ2UgPSBp OTE1X2dlbV9vYmplY3RfZ2V0X2RpcnR5X3BhZ2UoY3R4X29iaiwgTFJDX1NUQVRFX1BOKTsKLQly ZWdfc3RhdGUgPSBrbWFwX2F0b21pYyhwYWdlKTsKKwlyZWdfc3RhdGUgPSBvYmpfYWRkciArIExS Q19TVEFURV9QTiAqIFBBR0VfU0laRTsKIAogCS8qIEEgY29udGV4dCBpcyBhY3R1YWxseSBhIGJp ZyBiYXRjaCBidWZmZXIgd2l0aCBzZXZlcmFsIE1JX0xPQURfUkVHSVNURVJfSU1NCiAJICogY29t bWFuZHMgZm9sbG93ZWQgYnkgKHJlZywgdmFsdWUpIHBhaXJzLiBUaGUgdmFsdWVzIHdlIGFyZSBz ZXR0aW5nIGhlcmUgYXJlCkBAIC0yNTE0LDggKzI1MjEsNyBAQCBwb3B1bGF0ZV9scl9jb250ZXh0 KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpj dHhfbwogCQkJICAgICAgIG1ha2VfcnBjcyhkZXYpKTsKIAl9CiAKLQlrdW5tYXBfYXRvbWljKHJl Z19zdGF0ZSk7Ci0JaTkxNV9nZW1fb2JqZWN0X3VucGluX3BhZ2VzKGN0eF9vYmopOworCWk5MTVf Z2VtX29iamVjdF91bnBpbl9tYXAoY3R4X29iaik7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTI1ODgs MjIgKzI1OTQsMjcgQEAgdWludDMyX3QgaW50ZWxfbHJfY29udGV4dF9zaXplKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgdm9pZCBscmNf c2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l LAotCQkJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZGVmYXVsdF9jdHhfb2JqKQor c3RhdGljIGludAorbHJjX3NldHVwX2h3cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUs CisJICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmRlZl9jdHhfb2JqKQogewogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+ZGV2LT5kZXZfcHJpdmF0 ZTsKLQlzdHJ1Y3QgcGFnZSAqcGFnZTsKKwl2b2lkICpod3M7CiAKIAkvKiBUaGUgSFdTUCBpcyBw YXJ0IG9mIHRoZSBkZWZhdWx0IGNvbnRleHQgb2JqZWN0IGluIExSQyBtb2RlLiAqLwotCWVuZ2lu ZS0+c3RhdHVzX3BhZ2UuZ2Z4X2FkZHIgPSBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQoZGVmYXVs dF9jdHhfb2JqKQotCQkJKyBMUkNfUFBIV1NQX1BOICogUEFHRV9TSVpFOwotCXBhZ2UgPSBpOTE1 X2dlbV9vYmplY3RfZ2V0X3BhZ2UoZGVmYXVsdF9jdHhfb2JqLCBMUkNfUFBIV1NQX1BOKTsKLQll bmdpbmUtPnN0YXR1c19wYWdlLnBhZ2VfYWRkciA9IGttYXAocGFnZSk7Ci0JZW5naW5lLT5zdGF0 dXNfcGFnZS5vYmogPSBkZWZhdWx0X2N0eF9vYmo7CisJZW5naW5lLT5zdGF0dXNfcGFnZS5nZnhf YWRkciA9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChkZWZfY3R4X29iaikgKworCQkJCSAgICAg ICBMUkNfUFBIV1NQX1BOICogUEFHRV9TSVpFOworCWh3cyA9IGk5MTVfZ2VtX29iamVjdF9waW5f bWFwKGRlZl9jdHhfb2JqKTsKKwlpZiAoSVNfRVJSKGh3cykpCisJCXJldHVybiBQVFJfRVJSKGh3 cyk7CisJZW5naW5lLT5zdGF0dXNfcGFnZS5wYWdlX2FkZHIgPSBod3MgKyBMUkNfUFBIV1NQX1BO ICogUEFHRV9TSVpFOworCWVuZ2luZS0+c3RhdHVzX3BhZ2Uub2JqID0gZGVmX2N0eF9vYmo7CiAK IAlJOTE1X1dSSVRFKFJJTkdfSFdTX1BHQShlbmdpbmUtPm1taW9fYmFzZSksCi0JCQkodTMyKWVu Z2luZS0+c3RhdHVzX3BhZ2UuZ2Z4X2FkZHIpOworCQkgICAodTMyKWVuZ2luZS0+c3RhdHVzX3Bh Z2UuZ2Z4X2FkZHIpOwogCVBPU1RJTkdfUkVBRChSSU5HX0hXU19QR0EoZW5naW5lLT5tbWlvX2Jh c2UpKTsKKworCXJldHVybiAwOwogfQogCiAvKioKQEAgLTI2ODgsMTAgKzI2OTksOSBAQCBlcnJv cl9kZXJlZl9vYmo6CiAJcmV0dXJuIHJldDsKIH0KIAotdm9pZCBpbnRlbF9scl9jb250ZXh0X3Jl c2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4 KQordm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKKwkJCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQogewotCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3By aXYpIHsKQEAgLTI2OTksMjMgKzI3MDksMjMgQEAgdm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc2V0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0uc3Rh dGU7CiAJCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0KIAkJCQljdHgtPmVuZ2lu ZVtlbmdpbmUtPmlkXS5yaW5nYnVmOworCQl2b2lkICpvYmpfYWRkcjsKIAkJdWludDMyX3QgKnJl Z19zdGF0ZTsKLQkJc3RydWN0IHBhZ2UgKnBhZ2U7CiAKIAkJaWYgKCFjdHhfb2JqKQogCQkJY29u dGludWU7CiAKLQkJaWYgKGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZXMoY3R4X29iaikpIHsKLQkJ CVdBUk4oMSwgIkZhaWxlZCBnZXRfcGFnZXMgZm9yIGNvbnRleHQgb2JqXG4iKTsKKwkJb2JqX2Fk ZHIgPSBpOTE1X2dlbV9vYmplY3RfcGluX21hcChjdHhfb2JqKTsKKwkJaWYgKFdBUk5fT04oSVNf RVJSKG9ial9hZGRyKSkpCiAJCQljb250aW51ZTsKLQkJfQotCQlwYWdlID0gaTkxNV9nZW1fb2Jq ZWN0X2dldF9kaXJ0eV9wYWdlKGN0eF9vYmosIExSQ19TVEFURV9QTik7Ci0JCXJlZ19zdGF0ZSA9 IGttYXBfYXRvbWljKHBhZ2UpOworCisJCXJlZ19zdGF0ZSA9IG9ial9hZGRyICsgTFJDX1NUQVRF X1BOICogUEFHRV9TSVpFOworCQljdHhfb2JqLT5kaXJ0eSA9IHRydWU7CiAKIAkJcmVnX3N0YXRl W0NUWF9SSU5HX0hFQUQrMV0gPSAwOwogCQlyZWdfc3RhdGVbQ1RYX1JJTkdfVEFJTCsxXSA9IDA7 CiAKLQkJa3VubWFwX2F0b21pYyhyZWdfc3RhdGUpOworCQlpOTE1X2dlbV9vYmplY3RfdW5waW5f bWFwKGN0eF9vYmopOwogCiAJCXJpbmdidWYtPmhlYWQgPSAwOwogCQlyaW5nYnVmLT50YWlsID0g MDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKaW5kZXggMGIwODUzZWVlOTFlLi5iZmFhMmY1ODNk OTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCkBAIC0xMDMsOCArMTAzLDExIEBAIGludCBp bnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgs CiAJCQkJICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiB2b2lkIGludGVsX2xy X2NvbnRleHRfdW5waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCSAgICBzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwotdm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc2V0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KTsKKwor c3RydWN0IGRybV9pOTE1X3ByaXZhdGU7CisKK3ZvaWQgaW50ZWxfbHJfY29udGV4dF9yZXNldChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgc3RydWN0IGludGVsX2Nv bnRleHQgKmN0eCk7CiB1aW50NjRfdCBpbnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0b3Ioc3RydWN0 IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSk7CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK