From: Nick Hoath Subject: [PATCH] drm/i915: Split alloc from init for lrc Date: Thu, 10 Sep 2015 14:32:56 +0100 Message-ID: <1441891976-8480-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 3580F6EC65 for ; Thu, 10 Sep 2015 06:33:08 -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 List-Id: intel-gfx@lists.freedesktop.org RXh0ZW5kIGluaXQvaW5pdF9odyBzcGxpdCB0byBjb250ZXh0IGluaXQuCiAgIC0gTW92ZSBjb250 ZXh0IGluaXRpYWxpc2F0aW9uIGluIHRvIGk5MTVfZ2VtX2luaXRfaHcKICAgLSBNb3ZlIG9uZSBv ZmYgaW5pdGlhbGlzYXRpb24gZm9yIHJlbmRlciByaW5nIHRvCiAgICAgICAgaTkxNV9nZW1fdmFs aWRhdGVfY29udGV4dAogICAtIE1vdmUgZGVmYXVsdCBjb250ZXh0IGluaXRpYWxpc2F0aW9uIHRv IGxvZ2ljYWxfcmluZ19pbml0CgpSZW5hbWUgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVh dGUgdG8KaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9hbGxvYywgdG8gcmVmbGVjdCByZWR1Y2Vk IGZ1bmN0aW9uYWxpdHkgJgphbGxvYy9pbml0IHNwbGl0LgoKVGhpcyBwYXRjaCBpcyBpbnRlbmRl ZCB0byBzcGxpdCBvdXQgdGhlIGFsbG9jYXRpb24gb2YgcmVzb3VyY2VzICYKaW5pdGlhbGlzYXRp b24gdG8gYWxsb3cgZWFzaWVyIHJldXNlIG9mIGNvZGUgZm9yIHJlc3VtZS9ncHUgcmVzZXQuCgp2 MjogUmVtb3ZlZCBmdW5jdGlvbiBwdHIgd3JhcHBpbmcgb2YgZG9fc3dpdGNoX2NvbnRleHQgKERh bmllbCBWZXR0ZXIpCiAgICBMZWZ0IC0+aW5pdF9jb250ZXh0IGludCBpbnRlbF9scl9jb250ZXh0 X2RlZmVycmVkX2FsbG9jCiAgICAoRGFuaWVsIFZldHRlcikKICAgIFJlbW92ZSB1bm5lY2Vzc2Fy eSBpbml0IGZsYWcgJiByaW5nIHR5cGUgdGVzdC4gKERhbmllbCBWZXR0ZXIpCiAgICBJbXByb3Zl IGNvbW1pdCBtZXNzYWdlIChEYW5pZWwgVmV0dGVyKQp2MzogT24gaW5pdC9yZWluaXQsIHNldCB0 aGUgaHcgbmV4dCBzZXF1ZW5jZSBudW1iZXIgdG8gdGhlIHN3IG5leHQKICAgIHNlcXVlbmNlIG51 bWJlci4gVGhpcyBpcyBzZXQgdG8gMSBhdCBkcml2ZXIgbG9hZCB0aW1lLiBUaGlzIHByZXZlbnRz CiAgICB0aGUgc2Vxbm8gYmVpbmcgcmVzZXQgb24gcmVpbml0IChDaHJpcyBXaWxzb24pCnY0OiBT ZXQgc2Vxbm8gYmFjayB0byB+MCAtIDB4MTAwMCBhdCBzdGFydC1vZi1kYXksIGFuZCBpbmNyZW1l bnQgYnkgMHgxMDAKICAgIG9uIHJlc2V0LgogICAgVGhpcyBtYWtlcyBpdCBvYnZpb3VzIHdoaWNo IGJicyBhcmUgd2hpY2ggYWZ0ZXIgYSByZXNldC4gKERhdmlkIEdvcmRvbgogICAgJiBKb2huIEhh cnJpc29uKQogICAgUmViYXNlLgp2NTogUmViYXNlLiBGaXhlZCByZWJhc2UgYnJlYWthZ2UuIFB1 dCBjb250ZXh0IHBpbm5pbmcgaW4gc2VwYXJhdGUKICAgIGZ1bmN0aW9uLiBSZW1vdmVkIGNvZGUg Y2h1cm4uIChUaG9tYXMgRGFuaWVsKQoKSXNzdWU6IFZJWi00Nzk4ClNpZ25lZC1vZmYtYnk6IE5p Y2sgSG9hdGggPG5pY2hvbGFzLmhvYXRoQGludGVsLmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRh bmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KQ2M6IEpvaG4gSGFycmlzb24gPGpvaG4uYy5oYXJyaXNvbkBpbnRlbC5jb20+CkNj OiBEYXZpZCBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KQ2M6IFRob21hcyBEYW5p ZWwgPHRob21hcy5kYW5pZWxAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggICAgICAgICAgICB8ICAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jICAgICAgICAgICAgfCAgMjIgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f ZXhlY2J1ZmZlci5jIHwgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAg ICAgICAgICAgfCAxNjQgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5oICAgICAgICAgICB8ICAgNCArLQogNSBmaWxlcyBjaGFuZ2Vk LCA5OSBpbnNlcnRpb25zKCspLCA5NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAppbmRleCAyZWY4M2M1Li5lZDYyZWFlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTg5 MCw3ICs4OTAsNiBAQCBzdHJ1Y3QgaW50ZWxfY29udGV4dCB7CiAJfSBsZWdhY3lfaHdfY3R4Owog CiAJLyogRXhlY2xpc3RzICovCi0JYm9vbCByY3NfaW5pdGlhbGl6ZWQ7CiAJc3RydWN0IHsKIAkJ c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKnN0YXRlOwogCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1ZjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDQxMjYzY2QuLmM4MzAy ZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDYxMywxNCArNDYxMyw4IEBAIGludCBp OTE1X2dlbV9pbml0X3JpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlnb3RvIGNsZWFu dXBfdmVib3hfcmluZzsKIAl9CiAKLQlyZXQgPSBpOTE1X2dlbV9zZXRfc2Vxbm8oZGV2LCAoKHUz Mil+MCAtIDB4MTAwMCkpOwotCWlmIChyZXQpCi0JCWdvdG8gY2xlYW51cF9ic2QyX3Jpbmc7Ci0K IAlyZXR1cm4gMDsKIAotY2xlYW51cF9ic2QyX3Jpbmc6Ci0JaW50ZWxfY2xlYW51cF9yaW5nX2J1 ZmZlcigmZGV2X3ByaXYtPnJpbmdbVkNTMl0pOwogY2xlYW51cF92ZWJveF9yaW5nOgogCWludGVs X2NsZWFudXBfcmluZ19idWZmZXIoJmRldl9wcml2LT5yaW5nW1ZFQ1NdKTsKIGNsZWFudXBfYmx0 X3Jpbmc6CkBAIC00NzA2LDYgKzQ3MDAsMTQgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCQkJZ290byBvdXQ7CiAJfQogCisJLyoKKwkgKiBJbmNyZW1lbnQgdGhl IG5leHQgc2Vxbm8gYnkgMHgxMDAgc28gd2UgaGF2ZSBhIHZpc2libGUgYnJlYWsKKwkgKiBvbiBy ZS1pbml0aWFsaXNhdGlvbgorCSAqLworCXJldCA9IGk5MTVfZ2VtX3NldF9zZXFubyhkZXYsIGRl dl9wcml2LT5uZXh0X3NlcW5vKzB4MTAwKTsKKwlpZiAocmV0KQorCQlnb3RvIG91dDsKKwogCS8q IE5vdyBpdCBpcyBzYWZlIHRvIGdvIGJhY2sgcm91bmQgYW5kIGRvIGV2ZXJ5dGhpbmcgZWxzZTog Ki8KIAlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7CiAJCXN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxOwpAQCAtNDkwNyw2ICs0OTA5LDE0IEBAIGk5MTVfZ2VtX2xvYWQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJZGV2X3ByaXYtPm51bV9mZW5jZV9yZWdzID0KIAkJ CQlJOTE1X1JFQUQodmd0aWZfcmVnKGF2YWlsX3JzLmZlbmNlX251bSkpOwogCisJLyoKKwkgKiBT ZXQgaW5pdGlhbCBzZXF1ZW5jZSBudW1iZXIgZm9yIHJlcXVlc3RzLgorCSAqIFVzaW5nIHRoaXMg bnVtYmVyIGFsbG93cyB0aGUgd3JhcGFyb3VuZCB0byBoYXBwZW4gZWFybHksCisJICogY2F0Y2hp bmcgYW55IG9idmlvdXMgcHJvYmxlbXMuCisJICovCisJZGV2X3ByaXYtPm5leHRfc2Vxbm8gPSAo KHUzMil+MCAtIDB4MTEwMCk7CisJZGV2X3ByaXYtPmxhc3Rfc2Vxbm8gPSAoKHUzMil+MCAtIDB4 MTEwMSk7CisKIAkvKiBJbml0aWFsaXplIGZlbmNlIHJlZ2lzdGVycyB0byB6ZXJvICovCiAJSU5J VF9MSVNUX0hFQUQoJmRldl9wcml2LT5tbS5mZW5jZV9saXN0KTsKIAlpOTE1X2dlbV9yZXN0b3Jl X2ZlbmNlcyhkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f ZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j CmluZGV4IGE5NTNkNDkuLjY3ZWYxMTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9leGVjYnVmZmVyLmMKQEAgLTEwMDksNyArMTAwOSw3IEBAIGk5MTVfZ2VtX3ZhbGlkYXRlX2Nv bnRleHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlLAogCX0K IAogCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMgJiYgIWN0eC0+ZW5naW5lW3JpbmctPmlkXS5z dGF0ZSkgewotCQlpbnQgcmV0ID0gaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUoY3R4 LCByaW5nKTsKKwkJaW50IHJldCA9IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfYWxsb2MoY3R4 LCByaW5nKTsKIAkJaWYgKHJldCkgewogCQkJRFJNX0RFQlVHKCJDb3VsZCBub3QgY3JlYXRlIExS QyAldTogJWRcbiIsIGN0eF9pZCwgcmV0KTsKIAkJCXJldHVybiBFUlJfUFRSKHJldCk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDI4YTcxMmUuLjAyNDhkMTEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCkBAIC0xMDA4LDM5ICsxMDA4LDU0IEBAIGludCBsb2dpY2FsX3JpbmdfZmx1 c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlyZXR1cm4g MDsKIH0KIAotc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3BpbihzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJxKQorc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X2RvX3BpbihzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq Y3R4X29iaiwKKwkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCiB7Ci0Jc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcnEtPmk5MTU7Ci0Jc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZyA9IHJxLT5yaW5nOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpj dHhfb2JqID0gcnEtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZTsKLQlzdHJ1Y3QgaW50ZWxf cmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJxLT5yaW5nYnVmOworCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSByaW5nLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKIAlpbnQgcmV0ID0gMDsKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tl ZCgmcmluZy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKLQlpZiAocnEtPmN0eC0+ZW5naW5lW3Jpbmct PmlkXS5waW5fY291bnQrKyA9PSAwKSB7Ci0JCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3Bpbihj dHhfb2JqLCBHRU44X0xSX0NPTlRFWFRfQUxJR04sCi0JCQkJUElOX09GRlNFVF9CSUFTIHwgR1VD X1dPUENNX1RPUCk7Ci0JCWlmIChyZXQpCi0JCQlnb3RvIHJlc2V0X3Bpbl9jb3VudDsKKwlyZXQg PSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4oY3R4X29iaiwgR0VOOF9MUl9DT05URVhUX0FMSUdOLAor CQkJUElOX09GRlNFVF9CSUFTIHwgR1VDX1dPUENNX1RPUCk7CisJaWYgKHJldCkKKwkJcmV0dXJu IHJldDsKIAotCQlyZXQgPSBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihyaW5nLT5k ZXYsIHJpbmdidWYpOwotCQlpZiAocmV0KQotCQkJZ290byB1bnBpbl9jdHhfb2JqOworCXJldCA9 IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKHJpbmctPmRldiwgcmluZ2J1Zik7CisJ aWYgKHJldCkKKwkJZ290byB1bnBpbl9jdHhfb2JqOwogCi0JCWN0eF9vYmotPmRpcnR5ID0gdHJ1 ZTsKKwljdHhfb2JqLT5kaXJ0eSA9IHRydWU7CiAKLQkJLyogSW52YWxpZGF0ZSBHdUMgVExCLiAq LwotCQlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pCi0JCQlJOTE1X1dSSVRFKEdFTjhf R1RDUiwgR0VOOF9HVENSX0lOVkFMSURBVEUpOwotCX0KKwkvKiBJbnZhbGlkYXRlIEd1QyBUTEIu ICovCisJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQorCQlJOTE1X1dSSVRFKEdFTjhf R1RDUiwgR0VOOF9HVENSX0lOVkFMSURBVEUpOwogCiAJcmV0dXJuIHJldDsKIAogdW5waW5fY3R4 X29iajoKIAlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKKworCXJldHVybiBy ZXQ7Cit9CisKK3N0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4dF9waW4oc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpycSkKK3sKKwlpbnQgcmV0ID0gMDsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nID0gcnEtPnJpbmc7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9v YmogPSBycS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOworCXN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmID0gcnEtPnJpbmdidWY7CisKKwlpZiAocnEtPmN0eC0+ZW5naW5lW3Jp bmctPmlkXS5waW5fY291bnQrKyA9PSAwKSB7CisJCXJldCA9IGludGVsX2xyX2NvbnRleHRfZG9f cGluKHJpbmcsIGN0eF9vYmosIHJpbmdidWYpOworCQlpZiAocmV0KQorCQkJZ290byByZXNldF9w aW5fY291bnQ7CisJfQorCXJldHVybiByZXQ7CisKIHJlc2V0X3Bpbl9jb3VudDoKIAlycS0+Y3R4 LT5lbmdpbmVbcmluZy0+aWRdLnBpbl9jb3VudCA9IDA7Ci0KIAlyZXR1cm4gcmV0OwogfQogCkBA IC0xNDQ1LDExICsxNDYwLDE3IEBAIG91dDoKIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgdm9p ZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZywKKwkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmRlZmF1bHRfY3R4X29iaik7CisK IHN0YXRpYyBpbnQgZ2VuOF9pbml0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCisJbHJjX3Nl dHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHJpbmcsCisJCQkJcmluZy0+ZGVmYXVsdF9jb250ZXh0 LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlKTsKKwogCUk5MTVfV1JJVEVfSU1SKHJpbmcsIH4ocmlu Zy0+aXJxX2VuYWJsZV9tYXNrIHwgcmluZy0+aXJxX2tlZXBfbWFzaykpOwogCUk5MTVfV1JJVEUo UklOR19IV1NUQU0ocmluZy0+bW1pb19iYXNlKSwgMHhmZmZmZmZmZik7CiAKQEAgLTE4ODksNyAr MTkxMCwyMSBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbgogCWlmIChyZXQpCiAJCXJldHVybiBy ZXQ7CiAKLQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShyaW5nLT5kZWZh dWx0X2NvbnRleHQsIHJpbmcpOworCXJldCA9IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfYWxs b2MocmluZy0+ZGVmYXVsdF9jb250ZXh0LCByaW5nKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0 OworCisJLyogQXMgdGhpcyBpcyB0aGUgZGVmYXVsdCBjb250ZXh0LCBhbHdheXMgcGluIGl0ICov CisJcmV0ID0gaW50ZWxfbHJfY29udGV4dF9kb19waW4oCisJCQlyaW5nLAorCQkJcmluZy0+ZGVm YXVsdF9jb250ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlLAorCQkJcmluZy0+ZGVmYXVsdF9j b250ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWYpOworCWlmIChyZXQpIHsKKwkJRFJNX0VS Uk9SKAorCQkJIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVmZmVyICVzOiAlZFxuIiwKKwkJ CXJpbmctPm5hbWUsIHJldCk7CisJCXJldHVybiByZXQ7CisJfQogCiAJcmV0dXJuIHJldDsKIH0K QEAgLTIxMTIsMTQgKzIxNDcsOCBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nc19pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCQlnb3RvIGNsZWFudXBfdmVib3hfcmluZzsKIAl9CiAKLQly ZXQgPSBpOTE1X2dlbV9zZXRfc2Vxbm8oZGV2LCAoKHUzMil+MCAtIDB4MTAwMCkpOwotCWlmIChy ZXQpCi0JCWdvdG8gY2xlYW51cF9ic2QyX3Jpbmc7Ci0KIAlyZXR1cm4gMDsKIAotY2xlYW51cF9i c2QyX3Jpbmc6Ci0JaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoJmRldl9wcml2LT5yaW5nW1ZD UzJdKTsKIGNsZWFudXBfdmVib3hfcmluZzoKIAlpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cCgm ZGV2X3ByaXYtPnJpbmdbVkVDU10pOwogY2xlYW51cF9ibHRfcmluZzoKQEAgLTIzODksNyArMjQx OCw3IEBAIHN0YXRpYyB2b2lkIGxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nLAogfQogCiAvKioKLSAqIGludGVsX2xyX2NvbnRleHRfZGVm ZXJyZWRfY3JlYXRlKCkgLSBjcmVhdGUgdGhlIExSQyBzcGVjaWZpYyBiaXRzIG9mIGEgY29udGV4 dAorICogaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9hbGxvYygpIC0gY3JlYXRlIHRoZSBMUkMg c3BlY2lmaWMgYml0cyBvZiBhIGNvbnRleHQKICAqIEBjdHg6IExSIGNvbnRleHQgdG8gY3JlYXRl LgogICogQHJpbmc6IGVuZ2luZSB0byBiZSB1c2VkIHdpdGggdGhlIGNvbnRleHQuCiAgKgpAQCAt MjQwMSwxMiArMjQzMCwxMSBAQCBzdGF0aWMgdm9pZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVz X3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKICAqCiAgKiBSZXR1cm46IG5vbi16 ZXJvIG9uIGVycm9yLgogICovCi1pbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUo c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKworaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJy ZWRfYWxsb2Moc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgICAgIHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcpCiB7Ci0JY29uc3QgYm9vbCBpc19nbG9iYWxfZGVmYXVsdF9jdHgg PSAoY3R4ID09IHJpbmctPmRlZmF1bHRfY29udGV4dCk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IHJpbmctPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqOwogCXVp bnQzMl90IGNvbnRleHRfc2l6ZTsKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZjsK QEAgLTI0MjYsODIgKzI0NTQsNTAgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3Jl YXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCXJldHVybiAtRU5PTUVNOwogCX0KIAot CWlmIChpc19nbG9iYWxfZGVmYXVsdF9jdHgpIHsKLQkJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRf cGluKGN0eF9vYmosIEdFTjhfTFJfQ09OVEVYVF9BTElHTiwKLQkJCQlQSU5fT0ZGU0VUX0JJQVMg fCBHVUNfV09QQ01fVE9QKTsKLQkJaWYgKHJldCkgewotCQkJRFJNX0RFQlVHX0RSSVZFUigiUGlu IExSQyBiYWNraW5nIG9iaiBmYWlsZWQ6ICVkXG4iLAotCQkJCQlyZXQpOwotCQkJZHJtX2dlbV9v YmplY3RfdW5yZWZlcmVuY2UoJmN0eF9vYmotPmJhc2UpOwotCQkJcmV0dXJuIHJldDsKLQkJfQot Ci0JCS8qIEludmFsaWRhdGUgR3VDIFRMQi4gKi8KLQkJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJt aXNzaW9uKQotCQkJSTkxNV9XUklURShHRU44X0dUQ1IsIEdFTjhfR1RDUl9JTlZBTElEQVRFKTsK LQl9Ci0KIAlyaW5nYnVmID0gaW50ZWxfZW5naW5lX2NyZWF0ZV9yaW5nYnVmZmVyKHJpbmcsIDQg KiBQQUdFX1NJWkUpOwogCWlmIChJU19FUlIocmluZ2J1ZikpIHsKIAkJcmV0ID0gUFRSX0VSUihy aW5nYnVmKTsKLQkJZ290byBlcnJvcl91bnBpbl9jdHg7Ci0JfQotCi0JaWYgKGlzX2dsb2JhbF9k ZWZhdWx0X2N0eCkgewotCQlyZXQgPSBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihk ZXYsIHJpbmdidWYpOwotCQlpZiAocmV0KSB7Ci0JCQlEUk1fRVJST1IoCi0JCQkJICAiRmFpbGVk IHRvIHBpbiBhbmQgbWFwIHJpbmdidWZmZXIgJXM6ICVkXG4iLAotCQkJCSAgcmluZy0+bmFtZSwg cmV0KTsKLQkJCWdvdG8gZXJyb3JfcmluZ2J1ZjsKLQkJfQorCQlnb3RvIGVycm9yX2RlcmVmX29i ajsKIAl9CiAKIAlyZXQgPSBwb3B1bGF0ZV9scl9jb250ZXh0KGN0eCwgY3R4X29iaiwgcmluZywg cmluZ2J1Zik7CiAJaWYgKHJldCkgewogCQlEUk1fREVCVUdfRFJJVkVSKCJGYWlsZWQgdG8gcG9w dWxhdGUgTFJDOiAlZFxuIiwgcmV0KTsKLQkJZ290byBlcnJvcjsKKwkJZ290byBlcnJvcl9yaW5n YnVmOwogCX0KIAogCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVmID0gcmluZ2J1ZjsKIAlj dHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUgPSBjdHhfb2JqOwogCi0JaWYgKGN0eCA9PSByaW5n LT5kZWZhdWx0X2NvbnRleHQpCi0JCWxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShyaW5n LCBjdHhfb2JqKTsKLQllbHNlIGlmIChyaW5nLT5pZCA9PSBSQ1MgJiYgIWN0eC0+cmNzX2luaXRp YWxpemVkKSB7Ci0JCWlmIChyaW5nLT5pbml0X2NvbnRleHQpIHsKLQkJCXN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxOwotCi0JCQlyZXQgPSBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJp bmcsIGN0eCwgJnJlcSk7Ci0JCQlpZiAocmV0KQotCQkJCXJldHVybiByZXQ7Ci0KLQkJCXJldCA9 IHJpbmctPmluaXRfY29udGV4dChyZXEpOwotCQkJaWYgKHJldCkgewotCQkJCURSTV9FUlJPUigi cmluZyBpbml0IGNvbnRleHQ6ICVkXG4iLCByZXQpOwotCQkJCWk5MTVfZ2VtX3JlcXVlc3RfY2Fu Y2VsKHJlcSk7Ci0JCQkJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWYgPSBOVUxMOwotCQkJ CWN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSA9IE5VTEw7Ci0JCQkJZ290byBlcnJvcjsKLQkJ CX0KKwlpZiAoY3R4ICE9IHJpbmctPmRlZmF1bHRfY29udGV4dCAmJiByaW5nLT5pbml0X2NvbnRl eHQpIHsKKwkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7CiAKLQkJCWk5MTVfYWRk X3JlcXVlc3Rfbm9fZmx1c2gocmVxKTsKKwkJcmV0ID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhy aW5nLAorCQkJcmluZy0+ZGVmYXVsdF9jb250ZXh0LCAmcmVxKTsKKwkJaWYgKHJldCkgeworCQkJ RFJNX0VSUk9SKCJyaW5nIGNyZWF0ZSByZXE6ICVkXG4iLAorCQkJCXJldCk7CisJCQlpOTE1X2dl bV9yZXF1ZXN0X2NhbmNlbChyZXEpOworCQkJZ290byBlcnJvcl9yaW5nYnVmOwogCQl9CiAKLQkJ Y3R4LT5yY3NfaW5pdGlhbGl6ZWQgPSB0cnVlOworCQlyZXQgPSByaW5nLT5pbml0X2NvbnRleHQo cmVxKTsKKwkJaWYgKHJldCkgeworCQkJRFJNX0VSUk9SKCJyaW5nIGluaXQgY29udGV4dDogJWRc biIsCisJCQkJcmV0KTsKKwkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7CisJCQlnb3Rv IGVycm9yX3JpbmdidWY7CisJCX0KKwkJaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChyZXEpOwog CX0KLQogCXJldHVybiAwOwogCi1lcnJvcjoKLQlpZiAoaXNfZ2xvYmFsX2RlZmF1bHRfY3R4KQot CQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihyaW5nYnVmKTsKIGVycm9yX3JpbmdidWY6CiAJ aW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmdidWYpOwotZXJyb3JfdW5waW5fY3R4OgotCWlmIChp c19nbG9iYWxfZGVmYXVsdF9jdHgpCi0JCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0eF9v YmopOworZXJyb3JfZGVyZWZfb2JqOgogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHhf b2JqLT5iYXNlKTsKKwljdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZiA9IE5VTEw7CisJY3R4 LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlID0gTlVMTDsKIAlyZXR1cm4gcmV0OwogfQogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IDRjYzU0YjMuLjY5ZDk5ZjAgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5oCkBAIC03NSw4ICs3NSw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBpbnRlbF9s b2dpY2FsX3JpbmdfZW1pdChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKICNkZWZp bmUgTFJDX1NUQVRFX1BOCShMUkNfUFBIV1NQX1BOICsgMSkKIAogdm9pZCBpbnRlbF9scl9jb250 ZXh0X2ZyZWUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7Ci1pbnQgaW50ZWxfbHJfY29udGV4 dF9kZWZlcnJlZF9jcmVhdGUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKLQkJCQkgICAgIHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOworaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJy ZWRfYWxsb2Moc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCQkgICAgc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZyk7CiB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogdm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc2V0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KTsKLS0g CjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=