From: Nick Hoath Subject: [PATCH] drm/i915: Split alloc from init for lrc Date: Tue, 18 Aug 2015 15:23:32 +0100 Message-ID: <1439907812-27133-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id C88AF6E423 for ; Tue, 18 Aug 2015 07:23:56 -0700 (PDT) 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 Cc: daniel.vetter@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org RXh0ZW5kIGluaXQvaW5pdF9odyBzcGxpdCB0byBjb250ZXh0IGluaXQuCiAgIC0gTW92ZSBjb250 ZXh0IGluaXRpYWxpc2F0aW9uIGluIHRvIGk5MTVfZ2VtX2luaXRfaHcKICAgLSBNb3ZlIG9uZSBv ZmYgaW5pdGlhbGlzYXRpb24gZm9yIHJlbmRlciByaW5nIHRvCiAgICAgICAgaTkxNV9nZW1fdmFs aWRhdGVfY29udGV4dAogICAtIE1vdmUgZGVmYXVsdCBjb250ZXh0IGluaXRpYWxpc2F0aW9uIHRv IGxvZ2ljYWxfcmluZ19pbml0CgpSZW5hbWUgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVh dGUgdG8KaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9hbGxvYywgdG8gcmVmbGVjdCByZWR1Y2Vk IGZ1bmN0aW9uYWxpdHkgJgphbGxvYy9pbml0IHNwbGl0LgoKVGhpcyBwYXRjaCBpcyBpbnRlbmRl ZCB0byBzcGxpdCBvdXQgdGhlIGFsbG9jYXRpb24gb2YgcmVzb3VyY2VzICYgaW5pdGlhbGlzYXRp b24KdG8gYWxsb3cgZWFzaWVyIHJldXNlIG9mIGNvZGUgZm9yIHJlc3VtZS9ncHUgcmVzZXQuCgp2 MjogUmVtb3ZlZCBmdW5jdGlvbiBwdHIgd3JhcHBpbmcgb2YgZG9fc3dpdGNoX2NvbnRleHQgKERh bmllbCBWZXR0ZXIpCiAgICBMZWZ0IC0+aW5pdF9jb250ZXh0IGludCBpbnRlbF9scl9jb250ZXh0 X2RlZmVycmVkX2FsbG9jIChEYW5pZWwgVmV0dGVyKQogICAgUmVtb3ZlIHVubmVjZXNzYXJ5IGlu aXQgZmxhZyAmIHJpbmcgdHlwZSB0ZXN0LiAoRGFuaWVsIFZldHRlcikKICAgIEltcHJvdmUgY29t bWl0IG1lc3NhZ2UgKERhbmllbCBWZXR0ZXIpCgpJc3N1ZTogVklaLTQ3OTgKU2lnbmVkLW9mZi1i eTogTmljayBIb2F0aCA8bmljaG9sYXMuaG9hdGhAaW50ZWwuY29tPgpDYzogRGFuaWVsIFZldHRl ciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oICAgICAgICAgICAgfCAgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyAgICAgICAgICAgIHwgIDEyICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl Y2J1ZmZlci5jIHwgICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAg ICAgICAgfCAxNDcgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5oICAgICAgICAgICB8ICAgNCArLQogNSBmaWxlcyBjaGFuZ2VkLCA4 MCBpbnNlcnRpb25zKCspLCA4NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApp bmRleCBmN2ZkNTE5Li44NDRjY2YwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTg4MCw3 ICs4ODAsNiBAQCBzdHJ1Y3QgaW50ZWxfY29udGV4dCB7CiAJfSBsZWdhY3lfaHdfY3R4OwogCiAJ LyogRXhlY2xpc3RzICovCi0JYm9vbCByY3NfaW5pdGlhbGl6ZWQ7CiAJc3RydWN0IHsKIAkJc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKnN0YXRlOwogCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl ciAqcmluZ2J1ZjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDczMjkzYjQuLjNjY2VmMmQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDYwMywxNCArNDYwMyw4IEBAIGludCBpOTE1 X2dlbV9pbml0X3JpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlnb3RvIGNsZWFudXBf dmVib3hfcmluZzsKIAl9CiAKLQlyZXQgPSBpOTE1X2dlbV9zZXRfc2Vxbm8oZGV2LCAoKHUzMil+ MCAtIDB4MTAwMCkpOwotCWlmIChyZXQpCi0JCWdvdG8gY2xlYW51cF9ic2QyX3Jpbmc7Ci0KIAly ZXR1cm4gMDsKIAotY2xlYW51cF9ic2QyX3Jpbmc6Ci0JaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZl cigmZGV2X3ByaXYtPnJpbmdbVkNTMl0pOwogY2xlYW51cF92ZWJveF9yaW5nOgogCWludGVsX2Ns ZWFudXBfcmluZ19idWZmZXIoJmRldl9wcml2LT5yaW5nW1ZFQ1NdKTsKIGNsZWFudXBfYmx0X3Jp bmc6CkBAIC00NjI5LDYgKzQ2MjMsNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZf cHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwogCWludCByZXQsIGksIGo7 CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7CiAKIAlpZiAoSU5URUxfSU5GTyhk ZXYpLT5nZW4gPCA2ICYmICFpbnRlbF9lbmFibGVfZ3R0KCkpCiAJCXJldHVybiAtRUlPOwpAQCAt NDY4MCw5ICs0Njc1LDEyIEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkJCWdvdG8gb3V0OwogCX0KIAorCXJldCA9IGk5MTVfZ2VtX3NldF9zZXFubyhkZXYsICgo dTMyKX4wIC0gMHgxMDAwKSk7CisJaWYgKHJldCkKKwkJZ290byBvdXQ7CisKIAkvKiBOb3cgaXQg aXMgc2FmZSB0byBnbyBiYWNrIHJvdW5kIGFuZCBkbyBldmVyeXRoaW5nIGVsc2U6ICovCiAJZm9y X2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgewotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcTsKIAogCQlXQVJOX09OKCFyaW5nLT5kZWZhdWx0X2NvbnRleHQpOwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggOTIzYTNjNC4uOTVm MWEwZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAt OTk0LDYgKzk5NCw3IEBAIGk5MTVfZ2VtX3ZhbGlkYXRlX2NvbnRleHQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlLAogewogCXN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHggPSBOVUxMOwogCXN0cnVjdCBpOTE1X2N0eF9oYW5nX3N0YXRzICpoczsKKwlpbnQgcmV0 OwogCiAJaWYgKHJpbmctPmlkICE9IFJDUyAmJiBjdHhfaWQgIT0gREVGQVVMVF9DT05URVhUX0hB TkRMRSkKIAkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7CkBAIC0xMDA5LDcgKzEwMTAsNyBAQCBp OTE1X2dlbV92YWxpZGF0ZV9jb250ZXh0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBk cm1fZmlsZSAqZmlsZSwKIAl9CiAKIAlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzICYmICFjdHgt PmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUpIHsKLQkJaW50IHJldCA9IGludGVsX2xyX2NvbnRleHRf ZGVmZXJyZWRfY3JlYXRlKGN0eCwgcmluZyk7CisJCXJldCA9IGludGVsX2xyX2NvbnRleHRfZGVm ZXJyZWRfYWxsb2MoY3R4LCByaW5nKTsKIAkJaWYgKHJldCkgewogCQkJRFJNX0RFQlVHKCJDb3Vs ZCBub3QgY3JlYXRlIExSQyAldTogJWRcbiIsIGN0eF9pZCwgcmV0KTsKIAkJCXJldHVybiBFUlJf UFRSKHJldCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDEzODk2NGEuLmQwZGM2YjUg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xNDI2LDExICsxNDI2LDMxIEBAIG91dDoK IAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgdm9pZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVz X3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKKwkJc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKmRlZmF1bHRfY3R4X29iaikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOworCisJLyogVGhlIHN0YXR1cyBwYWdl IGlzIG9mZnNldCAwIGZyb20gdGhlIGRlZmF1bHQgY29udGV4dCBvYmplY3QKKwkgKiBpbiBMUkMg bW9kZS4gKi8KKwlyaW5nLT5zdGF0dXNfcGFnZS5nZnhfYWRkciA9IGk5MTVfZ2VtX29ial9nZ3R0 X29mZnNldChkZWZhdWx0X2N0eF9vYmopOworCXJpbmctPnN0YXR1c19wYWdlLnBhZ2VfYWRkciA9 CisJCQlrbWFwKHNnX3BhZ2UoZGVmYXVsdF9jdHhfb2JqLT5wYWdlcy0+c2dsKSk7CisJcmluZy0+ c3RhdHVzX3BhZ2Uub2JqID0gZGVmYXVsdF9jdHhfb2JqOworCisJSTkxNV9XUklURShSSU5HX0hX U19QR0EocmluZy0+bW1pb19iYXNlKSwKKwkJCSh1MzIpcmluZy0+c3RhdHVzX3BhZ2UuZ2Z4X2Fk ZHIpOworCVBPU1RJTkdfUkVBRChSSU5HX0hXU19QR0EocmluZy0+bW1pb19iYXNlKSk7Cit9CisK IHN0YXRpYyBpbnQgZ2VuOF9pbml0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCisJbHJjX3Nl dHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHJpbmcsCisJCQkJcmluZy0+ZGVmYXVsdF9jb250ZXh0 LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlKTsKKwogCUk5MTVfV1JJVEVfSU1SKHJpbmcsIH4ocmlu Zy0+aXJxX2VuYWJsZV9tYXNrIHwgcmluZy0+aXJxX2tlZXBfbWFzaykpOwogCUk5MTVfV1JJVEUo UklOR19IV1NUQU0ocmluZy0+bW1pb19iYXNlKSwgMHhmZmZmZmZmZik7CiAKQEAgLTE4NDEsOCAr MTg2MSwzMyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbgogCWlmIChyZXQpCiAJCXJldHVybiBy ZXQ7CiAKLQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShyaW5nLT5kZWZh dWx0X2NvbnRleHQsIHJpbmcpOworCXJldCA9IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfYWxs b2MocmluZy0+ZGVmYXVsdF9jb250ZXh0LCByaW5nKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0 OwogCisJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKAorCQlyaW5nLT5kZWZhdWx0X2NvbnRl eHQtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUsCisJCUdFTjhfTFJfQ09OVEVYVF9BTElHTiwgMCk7 CisJaWYgKHJldCkgeworCQlEUk1fREVCVUdfRFJJVkVSKCJQaW4gTFJDIGJhY2tpbmcgb2JqIGZh aWxlZDogJWRcbiIsCisJCQkJcmV0KTsKKwkJcmV0dXJuIHJldDsKKwl9CisKKwlyZXQgPSBpbnRl bF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihkZXYsCisJCXJpbmctPmRlZmF1bHRfY29udGV4 dC0+ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVmKTsKKwlpZiAocmV0KSB7CisJCURSTV9FUlJPUigK KwkJCSJGYWlsZWQgdG8gcGluIGFuZCBtYXAgcmluZ2J1ZmZlciAlczogJWRcbiIsCisJCQlyaW5n LT5uYW1lLCByZXQpOworCQlnb3RvIGVycm9yX3VucGluX2dndHQ7CisJfQorCisJcmV0dXJuIHJl dDsKKworZXJyb3JfdW5waW5fZ2d0dDoKKwlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbigKKwkJ cmluZy0+ZGVmYXVsdF9jb250ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlKTsKIAlyZXR1cm4g cmV0OwogfQogCkBAIC0yMDQ0LDE0ICsyMDg5LDggQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ3Nf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJZ290byBjbGVhbnVwX3ZlYm94X3Jpbmc7 CiAJfQogCi0JcmV0ID0gaTkxNV9nZW1fc2V0X3NlcW5vKGRldiwgKCh1MzIpfjAgLSAweDEwMDAp KTsKLQlpZiAocmV0KQotCQlnb3RvIGNsZWFudXBfYnNkMl9yaW5nOwotCiAJcmV0dXJuIDA7CiAK LWNsZWFudXBfYnNkMl9yaW5nOgotCWludGVsX2xvZ2ljYWxfcmluZ19jbGVhbnVwKCZkZXZfcHJp di0+cmluZ1tWQ1MyXSk7CiBjbGVhbnVwX3ZlYm94X3Jpbmc6CiAJaW50ZWxfbG9naWNhbF9yaW5n X2NsZWFudXAoJmRldl9wcml2LT5yaW5nW1ZFQ1NdKTsKIGNsZWFudXBfYmx0X3Jpbmc6CkBAIC0y MzAzLDI1ICsyMzQyLDggQEAgc3RhdGljIHVpbnQzMl90IGdldF9scl9jb250ZXh0X3NpemUoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgdm9p ZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZywKLQkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmRlZmF1bHRfY3R4X29iaikKLXsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2 YXRlOwotCi0JLyogVGhlIHN0YXR1cyBwYWdlIGlzIG9mZnNldCAwIGZyb20gdGhlIGRlZmF1bHQg Y29udGV4dCBvYmplY3QKLQkgKiBpbiBMUkMgbW9kZS4gKi8KLQlyaW5nLT5zdGF0dXNfcGFnZS5n ZnhfYWRkciA9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChkZWZhdWx0X2N0eF9vYmopOwotCXJp bmctPnN0YXR1c19wYWdlLnBhZ2VfYWRkciA9Ci0JCQlrbWFwKHNnX3BhZ2UoZGVmYXVsdF9jdHhf b2JqLT5wYWdlcy0+c2dsKSk7Ci0JcmluZy0+c3RhdHVzX3BhZ2Uub2JqID0gZGVmYXVsdF9jdHhf b2JqOwotCi0JSTkxNV9XUklURShSSU5HX0hXU19QR0EocmluZy0+bW1pb19iYXNlKSwKLQkJCSh1 MzIpcmluZy0+c3RhdHVzX3BhZ2UuZ2Z4X2FkZHIpOwotCVBPU1RJTkdfUkVBRChSSU5HX0hXU19Q R0EocmluZy0+bW1pb19iYXNlKSk7Ci19Ci0KIC8qKgotICogaW50ZWxfbHJfY29udGV4dF9kZWZl cnJlZF9jcmVhdGUoKSAtIGNyZWF0ZSB0aGUgTFJDIHNwZWNpZmljIGJpdHMgb2YgYSBjb250ZXh0 CisgKiBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKCkgLSBjcmVhdGUgdGhlIExSQyBz cGVjaWZpYyBiaXRzIG9mIGEgY29udGV4dAogICogQGN0eDogTFIgY29udGV4dCB0byBjcmVhdGUu CiAgKiBAcmluZzogZW5naW5lIHRvIGJlIHVzZWQgd2l0aCB0aGUgY29udGV4dC4KICAqCkBAIC0y MzMzLDEwICsyMzU1LDEwIEBAIHN0YXRpYyB2b2lkIGxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNf cGFnZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogICoKICAqIFJldHVybjogbm9uLXpl cm8gb24gZXJyb3IuCiAgKi8KLWludCBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShz dHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAorCitpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJl ZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJCSAgICAgc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZykKIHsKLQljb25zdCBib29sIGlzX2dsb2JhbF9kZWZhdWx0X2N0eCA9 IChjdHggPT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0KTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gcmluZy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqOwogCXVp bnQzMl90IGNvbnRleHRfc2l6ZTsKQEAgLTIzNTQsMjIgKzIzNzYsMTIgQEAgaW50IGludGVsX2xy X2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCXJl dHVybiAtRU5PTUVNOwogCX0KIAotCWlmIChpc19nbG9iYWxfZGVmYXVsdF9jdHgpIHsKLQkJcmV0 ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKGN0eF9vYmosIEdFTjhfTFJfQ09OVEVYVF9BTElHTiwg MCk7Ci0JCWlmIChyZXQpIHsKLQkJCURSTV9ERUJVR19EUklWRVIoIlBpbiBMUkMgYmFja2luZyBv YmogZmFpbGVkOiAlZFxuIiwKLQkJCQkJcmV0KTsKLQkJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJl bmNlKCZjdHhfb2JqLT5iYXNlKTsKLQkJCXJldHVybiByZXQ7Ci0JCX0KLQl9Ci0KIAlyaW5nYnVm ID0ga3phbGxvYyhzaXplb2YoKnJpbmdidWYpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXJpbmdidWYp IHsKIAkJRFJNX0RFQlVHX0RSSVZFUigiRmFpbGVkIHRvIGFsbG9jYXRlIHJpbmdidWZmZXIgJXNc biIsCiAJCQkJcmluZy0+bmFtZSk7CiAJCXJldCA9IC1FTk9NRU07Ci0JCWdvdG8gZXJyb3JfdW5w aW5fY3R4OworCQlnb3RvIGVycm9yX2RlcmVmX29iajsKIAl9CiAKIAlyaW5nYnVmLT5yaW5nID0g cmluZzsKQEAgLTIzODksNjYgKzI0MDEsNDkgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJy ZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJcmluZy0+bmFtZSwgcmV0 KTsKIAkJCWdvdG8gZXJyb3JfZnJlZV9yYnVmOwogCQl9Ci0KLQkJaWYgKGlzX2dsb2JhbF9kZWZh dWx0X2N0eCkgewotCQkJcmV0ID0gaW50ZWxfcGluX2FuZF9tYXBfcmluZ2J1ZmZlcl9vYmooZGV2 LCByaW5nYnVmKTsKLQkJCWlmIChyZXQpIHsKLQkJCQlEUk1fRVJST1IoCi0JCQkJCSJGYWlsZWQg dG8gcGluIGFuZCBtYXAgcmluZ2J1ZmZlciAlczogJWRcbiIsCi0JCQkJCXJpbmctPm5hbWUsIHJl dCk7Ci0JCQkJZ290byBlcnJvcl9kZXN0cm95X3JidWY7Ci0JCQl9Ci0JCX0KLQogCX0KIAogCXJl dCA9IHBvcHVsYXRlX2xyX2NvbnRleHQoY3R4LCBjdHhfb2JqLCByaW5nLCByaW5nYnVmKTsKIAlp ZiAocmV0KSB7CiAJCURSTV9ERUJVR19EUklWRVIoIkZhaWxlZCB0byBwb3B1bGF0ZSBMUkM6ICVk XG4iLCByZXQpOwotCQlnb3RvIGVycm9yOworCQlnb3RvIGVycm9yX2Rlc3Ryb3lfcmJ1ZjsKIAl9 CiAKIAljdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZiA9IHJpbmdidWY7CiAJY3R4LT5lbmdp bmVbcmluZy0+aWRdLnN0YXRlID0gY3R4X29iajsKIAotCWlmIChjdHggPT0gcmluZy0+ZGVmYXVs dF9jb250ZXh0KQotCQlscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2UocmluZywgY3R4X29i aik7Ci0JZWxzZSBpZiAocmluZy0+aWQgPT0gUkNTICYmICFjdHgtPnJjc19pbml0aWFsaXplZCkg ewotCQlpZiAocmluZy0+aW5pdF9jb250ZXh0KSB7Ci0JCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcTsKKwlpZiAoY3R4ICE9IHJpbmctPmRlZmF1bHRfY29udGV4dCAmJiByaW5nLT5p bml0X2NvbnRleHQpIHsKKwkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7CiAKLQkJ CXJldCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MocmluZywgY3R4LCAmcmVxKTsKLQkJCWlmIChy ZXQpCi0JCQkJcmV0dXJuIHJldDsKLQotCQkJcmV0ID0gcmluZy0+aW5pdF9jb250ZXh0KHJlcSk7 Ci0JCQlpZiAocmV0KSB7Ci0JCQkJRFJNX0VSUk9SKCJyaW5nIGluaXQgY29udGV4dDogJWRcbiIs IHJldCk7Ci0JCQkJaTkxNV9nZW1fcmVxdWVzdF9jYW5jZWwocmVxKTsKLQkJCQljdHgtPmVuZ2lu ZVtyaW5nLT5pZF0ucmluZ2J1ZiA9IE5VTEw7Ci0JCQkJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0 YXRlID0gTlVMTDsKLQkJCQlnb3RvIGVycm9yOwotCQkJfQotCi0JCQlpOTE1X2FkZF9yZXF1ZXN0 X25vX2ZsdXNoKHJlcSk7CisJCXJldCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MocmluZywKKwkJ CXJpbmctPmRlZmF1bHRfY29udGV4dCwgJnJlcSk7CisJCWlmIChyZXQpIHsKKwkJCURSTV9FUlJP UigicmluZyBjcmVhdGUgcmVxOiAlZFxuIiwKKwkJCQkgIHJldCk7CisJCQlpOTE1X2dlbV9yZXF1 ZXN0X2NhbmNlbChyZXEpOworCQkJZ290byBlcnJvcl9kZXN0cm95X3JidWY7CiAJCX0KIAotCQlj dHgtPnJjc19pbml0aWFsaXplZCA9IHRydWU7CisJCXJldCA9IHJpbmctPmluaXRfY29udGV4dChy ZXEpOworCQlpZiAocmV0KSB7CisJCQlEUk1fRVJST1IoInJpbmcgaW5pdCBjb250ZXh0OiAlZFxu IiwKKwkJCQkgIHJldCk7CisJCQlpOTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEpOworCQkJZ290 byBlcnJvcl9kZXN0cm95X3JidWY7CisJCX0KKwkJaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChy ZXEpOwogCX0KIAogCXJldHVybiAwOwogCi1lcnJvcjoKLQlpZiAoaXNfZ2xvYmFsX2RlZmF1bHRf Y3R4KQotCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihyaW5nYnVmKTsKIGVycm9yX2Rlc3Ry b3lfcmJ1ZjoKIAlpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHJpbmdidWYpOwogZXJyb3Jf ZnJlZV9yYnVmOgogCWtmcmVlKHJpbmdidWYpOwotZXJyb3JfdW5waW5fY3R4OgotCWlmIChpc19n bG9iYWxfZGVmYXVsdF9jdHgpCi0JCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmop OworZXJyb3JfZGVyZWZfb2JqOgogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHhfb2Jq LT5iYXNlKTsKKwljdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZiA9IE5VTEw7CisJY3R4LT5l bmdpbmVbcmluZy0+aWRdLnN0YXRlID0gTlVMTDsKIAlyZXR1cm4gcmV0OwogfQogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5oCmluZGV4IDY0Zjg5Zjk5Li4xMDkxNDdlIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuaApAQCAtNjksOCArNjksOCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxfbG9n aWNhbF9yaW5nX2VtaXQoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAKIC8qIExv Z2ljYWwgUmluZyBDb250ZXh0cyAqLwogdm9pZCBpbnRlbF9scl9jb250ZXh0X2ZyZWUoc3RydWN0 IGludGVsX2NvbnRleHQgKmN0eCk7Ci1pbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVh dGUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKLQkJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpOworaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfYWxsb2Moc3RydWN0 IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCQkgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu Zyk7CiB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpOwogdm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KTsKLS0gCjIuMS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=