From: Tvrtko Ursulin Subject: [PATCH v2 2/7] drm/i915: Do not call API requiring struct_mutex where it is not available Date: Tue, 12 Jan 2016 11:41:12 +0000 Message-ID: <1452598872-35340-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1452521321-4032-3-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 9777F6E2BD for ; Tue, 12 Jan 2016 03:41:18 -0800 (PST) In-Reply-To: <1452521321-4032-3-git-send-email-tvrtko.ursulin@linux.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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkxSQyBjb2Rl IHdhcyBjYWxsaW5nIEdFTSBBUEkgbGlrZSBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQgZnJvbQpw bGFjZXMgd2hlcmUgdGhlIHN0cnVjdF9tdXRleCBjYW5ub3QgYmUgZ3JhYmJlZCAoaXJxIGhhbmRs ZXJzKS4KClRvIGF2b2lkIHRoYXQgdGhpcyBwYXRjaCBjYWNoZXMgc29tZSBpbnRlcmVzdGluZyBi aXRzIGFuZCB2YWx1ZXMKaW4gdGhlIGVuZ2luZSBhbmQgY29udGV4dCBzdHJ1Y3R1cmVzLgoKU29t ZSB1c2FnZXMgYXJlIGFsc28gcmVtb3ZlZCB3aGVyZSB0aGV5IGFyZSBub3QgbmVlZGVkIGxpa2Ug YQpmZXcgYXNzZXJ0cyB3aGljaCBhcmUgZWl0aGVyIGltcG9zc2libGUgb3IgaGF2ZSBiZWVuIGNo ZWNrZWQKYWxyZWFkeSBkdXJpbmcgZW5naW5lIGluaXRpYWxpemF0aW9uLgoKU2lkZSBiZW5lZml0 IGlzIGFsc28gdGhhdCBpbnRlcnJ1cHQgaGFuZGxlcnMgYW5kIGNvbW1hbmQKc3VibWlzc2lvbiBz dG9wIGV2YWx1YXRpbmcgaW52YXJpYW50IGNvbmRpdGlvbmFscywgbGlrZSB3aGF0CkdlbiB3ZSBh cmUgcnVubmluZyBvbiwgb24gZXZlcnkgaW50ZXJydXB0IGFuZCBldmVyeSBjb21tYW5kCnN1Ym1p dHRlZC4KClRoaXMgcGF0Y2ggZGVhbHMgd2l0aCBsb2dpY2FsIHJpbmcgY29udGV4dCBpZCBhbmQg ZGVzY3JpcHRvcnMKd2hpbGUgc3Vic2VxdWVudCBwYXRjaGVzIHdpbGwgZGVhbCB3aXRoIHRoZSBy ZW1haW5pbmcgaXNzdWVzLgoKdjI6CiAqIENhY2hlIHRoZSBWTUEgaW5zdGVhZCBvZiB0aGUgYWRk cmVzcy4gKENocmlzIFdpbHNvbikKICogSW5jb3Jwb3JhdGUgRGF2ZSBHb3Jkb24ncyBnb29kIGNv bW1lbnRzIGFuZCBmdW5jdGlvbiBuYW1lLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4g PHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0 ZXJAZmZ3bGwuY2g+CkNjOiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICB8ICAxNSArKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAgIDIgKwogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggICAgIHwgICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jICAgICAgICB8IDEyNiArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggICAgICAgIHwgICA0ICstCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgIDIgKwogNiBmaWxlcyBj aGFuZ2VkLCA5MCBpbnNlcnRpb25zKCspLCA2MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jCmluZGV4IGUzMzc3YWJjMGQ0ZC4uMGIzNTUwZjA1MDI2IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMTk5NCwxMiArMTk5NCwxMyBAQCBzdGF0aWMg aW50IGk5MTVfY29udGV4dF9zdGF0dXMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQp CiB9CiAKIHN0YXRpYyB2b2lkIGk5MTVfZHVtcF9scmNfb2JqKHN0cnVjdCBzZXFfZmlsZSAqbSwK LQkJCSAgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkgICAgICBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaikKKwkJCSAgICAgIHN0cnVjdCBpbnRlbF9jb250 ZXh0ICpjdHgsCisJCQkgICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXN0 cnVjdCBwYWdlICpwYWdlOwogCXVpbnQzMl90ICpyZWdfc3RhdGU7CiAJaW50IGo7CisJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPSBjdHgtPmVuZ2luZVtyaW5nLT5pZF0uc3Rh dGU7CiAJdW5zaWduZWQgbG9uZyBnZ3R0X29mZnNldCA9IDA7CiAKIAlpZiAoY3R4X29iaiA9PSBO VUxMKSB7CkBAIC0yMDA5LDcgKzIwMTAsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2R1bXBfbHJjX29i aihzdHJ1Y3Qgc2VxX2ZpbGUgKm0sCiAJfQogCiAJc2VxX3ByaW50ZihtLCAiQ09OVEVYVDogJXMg JXVcbiIsIHJpbmctPm5hbWUsCi0JCSAgIGludGVsX2V4ZWNsaXN0c19jdHhfaWQoY3R4X29iaikp OworCQkgICBpbnRlbF9leGVjbGlzdHNfY3R4X2lkKGN0eCwgcmluZykpOwogCiAJaWYgKCFpOTE1 X2dlbV9vYmpfZ2d0dF9ib3VuZChjdHhfb2JqKSkKIAkJc2VxX3B1dHMobSwgIlx0Tm90IGJvdW5k IGluIEdHVFRcbiIpOwpAQCAtMjA1OCw4ICsyMDU5LDcgQEAgc3RhdGljIGludCBpOTE1X2R1bXBf bHJjKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCWxpc3RfZm9yX2VhY2hfZW50 cnkoY3R4LCAmZGV2X3ByaXYtPmNvbnRleHRfbGlzdCwgbGluaykgewogCQlmb3JfZWFjaF9yaW5n KHJpbmcsIGRldl9wcml2LCBpKSB7CiAJCQlpZiAocmluZy0+ZGVmYXVsdF9jb250ZXh0ICE9IGN0 eCkKLQkJCQlpOTE1X2R1bXBfbHJjX29iaihtLCByaW5nLAotCQkJCQkJICBjdHgtPmVuZ2luZVtp XS5zdGF0ZSk7CisJCQkJaTkxNV9kdW1wX2xyY19vYmoobSwgY3R4LCByaW5nKTsKIAkJfQogCX0K IApAQCAtMjEzMywxMSArMjEzMyw4IEBAIHN0YXRpYyBpbnQgaTkxNV9leGVjbGlzdHMoc3RydWN0 IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCiAJCXNlcV9wcmludGYobSwgIlx0JWQgcmVxdWVz dHMgaW4gcXVldWVcbiIsIGNvdW50KTsKIAkJaWYgKGhlYWRfcmVxKSB7Ci0JCQlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqY3R4X29iajsKLQotCQkJY3R4X29iaiA9IGhlYWRfcmVxLT5jdHgt PmVuZ2luZVtyaW5nX2lkXS5zdGF0ZTsKIAkJCXNlcV9wcmludGYobSwgIlx0SGVhZCByZXF1ZXN0 IGlkOiAldVxuIiwKLQkJCQkgICBpbnRlbF9leGVjbGlzdHNfY3R4X2lkKGN0eF9vYmopKTsKKwkJ CQkgICBpbnRlbF9leGVjbGlzdHNfY3R4X2lkKGhlYWRfcmVxLT5jdHgsIHJpbmcpKTsKIAkJCXNl cV9wcmludGYobSwgIlx0SGVhZCByZXF1ZXN0IHRhaWw6ICV1XG4iLAogCQkJCSAgIGhlYWRfcmVx LT50YWlsKTsKIAkJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNzQ3ZDJkODRhMThjLi43 OWJiMzY3MWExNWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtODgzLDYgKzg4Myw4IEBA IHN0cnVjdCBpbnRlbF9jb250ZXh0IHsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKnN0 YXRlOwogCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZjsKIAkJaW50IHBpbl9jb3Vu dDsKKwkJc3RydWN0IGk5MTVfdm1hICpscmNfdm1hOworCQl1NjQgbHJjX2Rlc2M7CiAJfSBlbmdp bmVbSTkxNV9OVU1fUklOR1NdOwogCiAJc3RydWN0IGxpc3RfaGVhZCBsaW5rOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCBiNDQ4YWQ4MzJkY2YuLmU1NzM3OTYzYWI3OSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTQ0LDcgKzQ0LDYgQEAgdHlwZWRlZiB1 aW50NjRfdCBnZW44X3BwZ3R0X3BtbDRlX3Q7CiAKICNkZWZpbmUgZ3R0X3RvdGFsX2VudHJpZXMo Z3R0KSAoKGd0dCkuYmFzZS50b3RhbCA+PiBQQUdFX1NISUZUKQogCi0KIC8qIGdlbjYtaHN3IGhh cyBiaXQgMTEtNCBmb3IgcGh5c2ljYWwgYWRkciBiaXQgMzktMzIgKi8KICNkZWZpbmUgR0VONl9H VFRfQUREUl9FTkNPREUoYWRkcikJKChhZGRyKSB8ICgoKGFkZHIpID4+IDI4KSAmIDB4ZmYwKSkK ICNkZWZpbmUgR0VONl9QVEVfQUREUl9FTkNPREUoYWRkcikJR0VONl9HVFRfQUREUl9FTkNPREUo YWRkcikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggYWIzNDRlMGI4NzhjLi41MDQwMzBj ZTdmOTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0yNjUsNyArMjY1LDggQEAgaW50 IGludGVsX3Nhbml0aXplX2VuYWJsZV9leGVjbGlzdHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg aW50IGVuYWJsZV9leGVjbGlzdHMKIAogLyoqCiAgKiBpbnRlbF9leGVjbGlzdHNfY3R4X2lkKCkg LSBnZXQgdGhlIEV4ZWNsaXN0cyBDb250ZXh0IElECi0gKiBAY3R4X29iajogTG9naWNhbCBSaW5n IENvbnRleHQgYmFja2luZyBvYmplY3QuCisgKiBAY3R4OiBDb250ZXh0IHRvIGdldCB0aGUgSUQg Zm9yCisgKiBAcmluZzogRW5naW5lIHRvIGdldCB0aGUgSUQgZm9yCiAgKgogICogRG8gbm90IGNv bmZ1c2Ugd2l0aCBjdHgtPmlkISBVbmZvcnR1bmF0ZWx5IHdlIGhhdmUgYSBuYW1lIG92ZXJsb2Fk CiAgKiBoZXJlOiB0aGUgb2xkIGNvbnRleHQgSUQgd2UgcGFzcyB0byB1c2Vyc3BhY2UgYXMgYSBo YW5kbGVyIHNvIHRoYXQKQEAgLTI3MywxNiArMjc0LDE1IEBAIGludCBpbnRlbF9zYW5pdGl6ZV9l bmFibGVfZXhlY2xpc3RzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBlbmFibGVfZXhlY2xp c3RzCiAgKiBFTFNQIHNvIHRoYXQgdGhlIEdQVSBjYW4gaW5mb3JtIHVzIG9mIHRoZSBjb250ZXh0 IHN0YXR1cyB2aWEKICAqIGludGVycnVwdHMuCiAgKgorICogVGhlIGNvbnRleHQgSUQgaXMgYSBw b3J0aW9uIG9mIHRoZSBjb250ZXh0IGRlc2NyaXB0b3IsIHNvIHdlIGNhbgorICoganVzdCBleHRy YWN0IHRoZSByZXF1aXJlZCBwYXJ0IGZyb20gdGhlIGNhY2hlZCBkZXNjcmlwdG9yLgorICoKICAq IFJldHVybjogMjAtYml0cyBnbG9iYWxseSB1bmlxdWUgY29udGV4dCBJRC4KICAqLwotdTMyIGlu dGVsX2V4ZWNsaXN0c19jdHhfaWQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmop Cit1MzIgaW50ZWxfZXhlY2xpc3RzX2N0eF9pZChzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAor CQkJICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKLQl1MzIgbHJjYSA9IGk5MTVf Z2VtX29ial9nZ3R0X29mZnNldChjdHhfb2JqKSArCi0JCQlMUkNfUFBIV1NQX1BOICogUEFHRV9T SVpFOwotCi0JLyogTFJDQSBpcyByZXF1aXJlZCB0byBiZSA0SyBhbGlnbmVkIHNvIHRoZSBtb3Jl IHNpZ25pZmljYW50IDIwIGJpdHMKLQkgKiBhcmUgZ2xvYmFsbHkgdW5pcXVlICovCi0JcmV0dXJu IGxyY2EgPj4gMTI7CisJcmV0dXJuIGN0eC0+ZW5naW5lW3JpbmctPmlkXS5scmNfZGVzYyA+PiBH RU44X0NUWF9JRF9TSElGVDsKIH0KIAogc3RhdGljIGJvb2wgZGlzYWJsZV9saXRlX3Jlc3RvcmVf d2Eoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKQEAgLTI5NywzMSArMjk3LDcgQEAgc3Rh dGljIGJvb2wgZGlzYWJsZV9saXRlX3Jlc3RvcmVfd2Eoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZykKIHVpbnQ2NF90IGludGVsX2xyX2NvbnRleHRfZGVzY3JpcHRvcihzdHJ1Y3QgaW50ZWxf Y29udGV4dCAqY3R4LAogCQkJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsK LQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9IGN0eC0+ZW5naW5lW3Jpbmct PmlkXS5zdGF0ZTsKLQl1aW50NjRfdCBkZXNjOwotCXVpbnQ2NF90IGxyY2EgPSBpOTE1X2dlbV9v YmpfZ2d0dF9vZmZzZXQoY3R4X29iaikgKwotCQkJTFJDX1BQSFdTUF9QTiAqIFBBR0VfU0laRTsK LQotCVdBUk5fT04obHJjYSAmIDB4RkZGRkZGRkYwMDAwMEZGRlVMTCk7Ci0KLQlkZXNjID0gR0VO OF9DVFhfVkFMSUQ7Ci0JZGVzYyB8PSBHRU44X0NUWF9BRERSRVNTSU5HX01PREUoZGV2KSA8PCBH RU44X0NUWF9BRERSRVNTSU5HX01PREVfU0hJRlQ7Ci0JaWYgKElTX0dFTjgoY3R4X29iai0+YmFz ZS5kZXYpKQotCQlkZXNjIHw9IEdFTjhfQ1RYX0wzTExDX0NPSEVSRU5UOwotCWRlc2MgfD0gR0VO OF9DVFhfUFJJVklMRUdFOwotCWRlc2MgfD0gbHJjYTsKLQlkZXNjIHw9ICh1NjQpaW50ZWxfZXhl Y2xpc3RzX2N0eF9pZChjdHhfb2JqKSA8PCBHRU44X0NUWF9JRF9TSElGVDsKLQotCS8qIFRPRE86 IFdhRGlzYWJsZUxpdGVSZXN0b3JlIHdoZW4gd2Ugc3RhcnQgdXNpbmcgc2VtYXBob3JlCi0JICog c2lnbmFsbGluZyBiZXR3ZWVuIENvbW1hbmQgU3RyZWFtZXJzICovCi0JLyogZGVzYyB8PSBHRU44 X0NUWF9GT1JDRV9SRVNUT1JFOyAqLwotCi0JLyogV2FFbmFibGVGb3JjZVJlc3RvcmVJbkN0eHRE ZXNjRm9yVkNTOnNrbCAqLwotCS8qIFdhRW5hYmxlRm9yY2VSZXN0b3JlSW5DdHh0RGVzY0ZvclZD UzpieHQgKi8KLQlpZiAoZGlzYWJsZV9saXRlX3Jlc3RvcmVfd2EocmluZykpCi0JCWRlc2MgfD0g R0VOOF9DVFhfRk9SQ0VfUkVTVE9SRTsKLQotCXJldHVybiBkZXNjOworCXJldHVybiBjdHgtPmVu Z2luZVtyaW5nLT5pZF0ubHJjX2Rlc2M7CiB9CiAKIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19lbHNw X3dyaXRlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEwLApAQCAtMzY5LDggKzM0NSw2 IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX3VwZGF0ZV9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcnEpCiAJdWludDMyX3QgKnJlZ19zdGF0ZTsKIAogCUJVR19PTighY3R4X29i aik7Ci0JV0FSTl9PTighaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChjdHhfb2JqKSk7Ci0JV0FSTl9P TighaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChyYl9vYmopKTsKIAogCXBhZ2UgPSBpOTE1X2dlbV9v YmplY3RfZ2V0X2RpcnR5X3BhZ2UoY3R4X29iaiwgTFJDX1NUQVRFX1BOKTsKIAlyZWdfc3RhdGUg PSBrbWFwX2F0b21pYyhwYWdlKTsKQEAgLTQ3Nyw5ICs0NTEsNyBAQCBzdGF0aWMgYm9vbCBleGVj bGlzdHNfY2hlY2tfcmVtb3ZlX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywK IAkJCQkJICAgIGV4ZWNsaXN0X2xpbmspOwogCiAJaWYgKGhlYWRfcmVxICE9IE5VTEwpIHsKLQkJ c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPQotCQkJCWhlYWRfcmVxLT5jdHgt PmVuZ2luZVtyaW5nLT5pZF0uc3RhdGU7Ci0JCWlmIChpbnRlbF9leGVjbGlzdHNfY3R4X2lkKGN0 eF9vYmopID09IHJlcXVlc3RfaWQpIHsKKwkJaWYgKGludGVsX2V4ZWNsaXN0c19jdHhfaWQoaGVh ZF9yZXEtPmN0eCwgcmluZykgPT0gcmVxdWVzdF9pZCkgewogCQkJV0FSTihoZWFkX3JlcS0+ZWxz cF9zdWJtaXR0ZWQgPT0gMCwKIAkJCSAgICAgIk5ldmVyIHN1Ym1pdHRlZCBoZWFkIHJlcXVlc3Rc biIpOwogCkBAIC01NTYsNyArNTI4LDcgQEAgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJfQogCX0KIAotCWlmIChkaXNhYmxlX2xpdGVf cmVzdG9yZV93YShyaW5nKSkgeworCWlmIChyaW5nLT5kaXNhYmxlX2xpdGVfcmVzdG9yZV93YSkg ewogCQkvKiBQcmV2ZW50IGEgY3R4IHRvIHByZWVtcHQgaXRzZWxmICovCiAJCWlmICgoc3RhdHVz ICYgR0VOOF9DVFhfU1RBVFVTX0FDVElWRV9JRExFKSAmJgogCQkgICAgKHN1Ym1pdF9jb250ZXh0 cyAhPSAwKSkKQEAgLTEwMzgsMTUgKzEwMTAsNTEgQEAgaW50IGxvZ2ljYWxfcmluZ19mbHVzaF9h bGxfY2FjaGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCXJldHVybiAwOwog fQogCisvKioKKyAqIGludGVsX2xyX2NvbnRleHRfZGVzY3JpcHRvcl91cGRhdGUoKSAtIGNhbGN1 bGF0ZSAmIGNhY2hlIHRoZQorICogICAgICAgICAgICAgICAgICAgICAgZGVzY3JpcHRvciBmb3Ig YSBwaW5uZWQKKyAqICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0CisgKiBAY3R4OiBDb250 ZXh0IHRvIHdvcmsgb24KKyAqIEByaW5nOiBFbmdpbmUgdGhlIGRlc2NyaXB0b3Igd2lsbCBiZSB1 c2VkIHdpdGgKKyAqCisgKiBUaGUgY29udGV4dCBkZXNjcmlwdG9yIGVuY29kZXMgdmFyaW91cyBh dHRyaWJ1dGVzIG9mIGEgY29udGV4dCwKKyAqIGluY2x1ZGluZyBpdHMgR1RUIGFkZHJlc3MgYW5k IHNvbWUgZmxhZ3MuIEJlY2F1c2UgaXQncyBmYWlybHkKKyAqIGV4cGVuc2l2ZSB0byBjYWxjdWxh dGUsIHdlJ2xsIGp1c3QgZG8gaXQgb25jZSBhbmQgY2FjaGUgdGhlIHJlc3VsdCwKKyAqIHdoaWNo IHJlbWFpbnMgdmFsaWQgdW50aWwgdGhlIGNvbnRleHQgaXMgdW5waW5uZWQuCisgKgorICogVGhp cyBpcyB3aGF0IGEgZGVzY3JpcHRvciBsb29rcyBsaWtlLCBmcm9tIExTQiB0byBNU0I6CisgKiAg ICBiaXRzIDAtMTE6ICAgIGZsYWdzLCBHRU44X0NUWF8qIChjYWNoZWQgaW4gY3R4X2Rlc2NfdGVt cGxhdGUpCisgKiAgICBiaXRzIDEyLTMxOiAgICBMUkNBLCBHVFQgYWRkcmVzcyBvZiAodGhlIEhX U1Agb2YpIHRoaXMgY29udGV4dAorICogICAgYml0cyAzMi01MTogICAgY3R4IElELCBhIGdsb2Jh bGx5IHVuaXF1ZSB0YWcgKHRoZSBMUkNBIGFnYWluISkKKyAqICAgIGJpdHMgNTItNjM6ICAgIHJl c2VydmVkLCBtYXkgZW5jb2RlIHRoZSBlbmdpbmUgSUQgKGZvciBHdUMpCisgKi8KK3N0YXRpYyB2 b2lkCitpbnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0b3JfdXBkYXRlKHN0cnVjdCBpbnRlbF9jb250 ZXh0ICpjdHgsCisJCQkJICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKK3sKKwl1aW50 NjRfdCBscmNhLCBkZXNjOworCisJbHJjYSA9IGN0eC0+ZW5naW5lW3JpbmctPmlkXS5scmNfdm1h LT5ub2RlLnN0YXJ0ICsKKwkgICAgICAgTFJDX1BQSFdTUF9QTiAqIFBBR0VfU0laRTsKKworCWRl c2MgPSByaW5nLT5jdHhfZGVzY190ZW1wbGF0ZTsJCQkgICAvKiBiaXRzICAwLTExICovCisJZGVz YyB8PSBscmNhOwkJCQkJICAgLyogYml0cyAxMi0zMSAqLworCWRlc2MgfD0gKGxyY2EgPj4gUEFH RV9TSElGVCkgPDwgR0VOOF9DVFhfSURfU0hJRlQ7IC8qIGJpdHMgMzItNTEgKi8KKworCWN0eC0+ ZW5naW5lW3JpbmctPmlkXS5scmNfZGVzYyA9IGRlc2M7Cit9CisKIHN0YXRpYyBpbnQgaW50ZWxf bHJfY29udGV4dF9kb19waW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKLQkJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmosCi0JCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmKQorCQkJCSAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCiB7CiAJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCWludCByZXQgPSAwOworCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOwor CXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gY3R4LT5lbmdpbmVbcmluZy0+aWRd LnJpbmdidWY7CisJaW50IHJldDsKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmcmluZy0+ ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKKwogCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihjdHhf b2JqLCBHRU44X0xSX0NPTlRFWFRfQUxJR04sCiAJCQlQSU5fT0ZGU0VUX0JJQVMgfCBHVUNfV09Q Q01fVE9QKTsKIAlpZiAocmV0KQpAQCAtMTA1Niw2ICsxMDY0LDggQEAgc3RhdGljIGludCBpbnRl bF9scl9jb250ZXh0X2RvX3BpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCWlmIChy ZXQpCiAJCWdvdG8gdW5waW5fY3R4X29iajsKIAorCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5scmNf dm1hID0gaTkxNV9nZW1fb2JqX3RvX2dndHQoY3R4X29iaik7CisJaW50ZWxfbHJfY29udGV4dF9k ZXNjcmlwdG9yX3VwZGF0ZShjdHgsIHJpbmcpOwogCWN0eF9vYmotPmRpcnR5ID0gdHJ1ZTsKIAog CS8qIEludmFsaWRhdGUgR3VDIFRMQi4gKi8KQEAgLTEwNzQsMTEgKzEwODQsOSBAQCBzdGF0aWMg aW50IGludGVsX2xyX2NvbnRleHRfcGluKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEp CiB7CiAJaW50IHJldCA9IDA7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJxLT5y aW5nOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gcnEtPmN0eC0+ZW5n aW5lW3JpbmctPmlkXS5zdGF0ZTsKLQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9 IHJxLT5yaW5nYnVmOwogCiAJaWYgKHJxLT5jdHgtPmVuZ2luZVtyaW5nLT5pZF0ucGluX2NvdW50 KysgPT0gMCkgewotCQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X2RvX3BpbihyaW5nLCBjdHhfb2Jq LCByaW5nYnVmKTsKKwkJcmV0ID0gaW50ZWxfbHJfY29udGV4dF9kb19waW4ocmluZywgcnEtPmN0 eCk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIHJlc2V0X3Bpbl9jb3VudDsKIAl9CkBAIC0xMTAwLDYg KzExMDgsOCBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpycSkKIAkJaWYgKC0tcnEtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5waW5fY291 bnQgPT0gMCkgewogCQkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7CiAJCQlp OTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKKwkJCXJxLT5jdHgtPmVuZ2luZVty aW5nLT5pZF0ubHJjX3ZtYSA9IE5VTEw7CisJCQlycS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLmxy Y19kZXNjID0gMDsKIAkJfQogCX0KIH0KQEAgLTE5MzgsNiArMTk0OCw5IEBAIHZvaWQgaW50ZWxf bG9naWNhbF9yaW5nX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJcmlu Zy0+c3RhdHVzX3BhZ2Uub2JqID0gTlVMTDsKIAl9CiAKKwlyaW5nLT5kaXNhYmxlX2xpdGVfcmVz dG9yZV93YSA9IGZhbHNlOworCXJpbmctPmN0eF9kZXNjX3RlbXBsYXRlID0gMDsKKwogCWxyY19k ZXN0cm95X3dhX2N0eF9vYmoocmluZyk7CiAJcmluZy0+ZGV2ID0gTlVMTDsKIH0KQEAgLTE5NjAs NiArMTk3MywyNCBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbgogCUlOSVRfTElTVF9IRUFEKCZy aW5nLT5leGVjbGlzdF9yZXRpcmVkX3JlcV9saXN0KTsKIAlzcGluX2xvY2tfaW5pdCgmcmluZy0+ ZXhlY2xpc3RfbG9jayk7CiAKKwlyaW5nLT5kaXNhYmxlX2xpdGVfcmVzdG9yZV93YSA9IGRpc2Fi bGVfbGl0ZV9yZXN0b3JlX3dhKHJpbmcpOworCisJcmluZy0+Y3R4X2Rlc2NfdGVtcGxhdGUgPSBH RU44X0NUWF9WQUxJRDsKKwlyaW5nLT5jdHhfZGVzY190ZW1wbGF0ZSB8PSBHRU44X0NUWF9BRERS RVNTSU5HX01PREUoZGV2KSA8PAorCQkJCSAgIEdFTjhfQ1RYX0FERFJFU1NJTkdfTU9ERV9TSElG VDsKKwlpZiAoSVNfR0VOOChkZXYpKQorCQlyaW5nLT5jdHhfZGVzY190ZW1wbGF0ZSB8PSBHRU44 X0NUWF9MM0xMQ19DT0hFUkVOVDsKKwlyaW5nLT5jdHhfZGVzY190ZW1wbGF0ZSB8PSBHRU44X0NU WF9QUklWSUxFR0U7CisKKwkvKiBUT0RPOiBXYURpc2FibGVMaXRlUmVzdG9yZSB3aGVuIHdlIHN0 YXJ0IHVzaW5nIHNlbWFwaG9yZQorCSAqIHNpZ25hbGxpbmcgYmV0d2VlbiBDb21tYW5kIFN0cmVh bWVycyAqLworCS8qIHJpbmctPmN0eF9kZXNjX3RlbXBsYXRlIHw9IEdFTjhfQ1RYX0ZPUkNFX1JF U1RPUkU7ICovCisKKwkvKiBXYUVuYWJsZUZvcmNlUmVzdG9yZUluQ3R4dERlc2NGb3JWQ1M6c2ts ICovCisJLyogV2FFbmFibGVGb3JjZVJlc3RvcmVJbkN0eHREZXNjRm9yVkNTOmJ4dCAqLworCWlm IChyaW5nLT5kaXNhYmxlX2xpdGVfcmVzdG9yZV93YSkKKwkJcmluZy0+Y3R4X2Rlc2NfdGVtcGxh dGUgfD0gR0VOOF9DVFhfRk9SQ0VfUkVTVE9SRTsKKwogCXJldCA9IGk5MTVfY21kX3BhcnNlcl9p bml0X3JpbmcocmluZyk7CiAJaWYgKHJldCkKIAkJZ290byBlcnJvcjsKQEAgLTE5NjksMTAgKzIw MDAsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbgogCQlnb3RvIGVycm9yOwogCiAJLyogQXMg dGhpcyBpcyB0aGUgZGVmYXVsdCBjb250ZXh0LCBhbHdheXMgcGluIGl0ICovCi0JcmV0ID0gaW50 ZWxfbHJfY29udGV4dF9kb19waW4oCi0JCQlyaW5nLAotCQkJcmluZy0+ZGVmYXVsdF9jb250ZXh0 LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlLAotCQkJcmluZy0+ZGVmYXVsdF9jb250ZXh0LT5lbmdp bmVbcmluZy0+aWRdLnJpbmdidWYpOworCXJldCA9IGludGVsX2xyX2NvbnRleHRfZG9fcGluKHJp bmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCk7CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoCiAJ CQkiRmFpbGVkIHRvIHBpbiBhbmQgbWFwIHJpbmdidWZmZXIgJXM6ICVkXG4iLApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuaAppbmRleCBkZTQxYWQ2Y2Q2M2QuLjQ5YWY2MzhmNjIxMyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmgKQEAgLTEwNywxMyArMTA3LDE1IEBAIHZvaWQgaW50ZWxfbHJfY29u dGV4dF9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogdWludDY0X3QgaW50ZWxfbHJfY29u dGV4dF9kZXNjcmlwdG9yKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJICAgICBzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIAordTMyIGludGVsX2V4ZWNsaXN0c19jdHhfaWQo c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCSAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpOworCiAvKiBFeGVjbGlzdHMgKi8KIGludCBpbnRlbF9zYW5pdGl6ZV9lbmFibGVfZXhl Y2xpc3RzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBlbmFibGVfZXhlY2xpc3RzKTsKIHN0 cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zOwogaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNz aW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMsCiAJCQkgICAgICAgc3Ry dWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAqYXJncywKIAkJCSAgICAgICBzdHJ1Y3QgbGlz dF9oZWFkICp2bWFzKTsKLXUzMiBpbnRlbF9leGVjbGlzdHNfY3R4X2lkKHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpjdHhfb2JqKTsKIAogdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiB2b2lkIGludGVsX2V4ZWNsaXN0c19yZXRpcmVf cmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggNzM0OWQ5MjU4MTkxLi44NWNlMjI3MmY5MmMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTI2OSw2ICsyNjksOCBA QCBzdHJ1Y3QgIGludGVsX2VuZ2luZV9jcyB7CiAJc3RydWN0IGxpc3RfaGVhZCBleGVjbGlzdF9x dWV1ZTsKIAlzdHJ1Y3QgbGlzdF9oZWFkIGV4ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3Q7CiAJdTgg bmV4dF9jb250ZXh0X3N0YXR1c19idWZmZXI7CisJYm9vbCBkaXNhYmxlX2xpdGVfcmVzdG9yZV93 YTsKKwl1MzIgY3R4X2Rlc2NfdGVtcGxhdGU7CiAJdTMyICAgICAgICAgICAgIGlycV9rZWVwX21h c2s7IC8qIGJpdG1hc2sgZm9yIGludGVycnVwdHMgdGhhdCBzaG91bGQgbm90IGJlIG1hc2tlZCAq LwogCWludAkJKCplbWl0X3JlcXVlc3QpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx dWVzdCk7CiAJaW50CQkoKmVtaXRfZmx1c2gpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxdWVzdCwKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=