From: Matthew Auld Subject: [PATCH 5/5] drm/i915: Propagate error from drm_gem_object_init() Date: Tue, 12 Apr 2016 16:57:43 +0100 Message-ID: <1460476663-24890-5-git-send-email-matthew.auld@intel.com> References: <1460476663-24890-1-git-send-email-matthew.auld@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 382E96E714 for ; Tue, 12 Apr 2016 15:58:08 +0000 (UTC) In-Reply-To: <1460476663-24890-1-git-send-email-matthew.auld@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 RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpGcm9tOiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KClByb3BhZ2F0ZSB0aGUgcmVhbCBl cnJvciBmcm9tIGRybV9nZW1fb2JqZWN0X2luaXQoKS4gTm90ZSB0aGlzIGFsc28KZml4ZXMgc29t ZSBjb25mdXNpb24gaW4gdGhlIGVycm9yIHJldHVybiBmcm9tIGk5MTVfZ2VtX2FsbG9jX29iamVj dC4uLgoKdjI6CihNYXR0aGV3IEF1bGQpCiAgLSB1cGRhdGVkIG5ldyB1c2VycyBvZiBnZW1fYWxs b2Nfb2JqZWN0IGZyb20gbGF0ZXN0IGRybS1uaWdodGx5CiAgLSByZXBsYWNlZCBvY2N1cnJlbmNl cyBvZiBJU19FUlJfT1JfTlVMTCgpIHdpdGggSVNfRVJSKCkKClNpZ25lZC1vZmYtYnk6IE1hdHRo ZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYyAgICAgICAgICAgICAgfCAxNCArKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fYmF0Y2hfcG9vbC5jICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jIHwgIDcgKysrKystLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jICAgICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9mYmRldi5jICAgICAgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jICAgICAgICAgICAgIHwgMTAgKysrKysrLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jICAgICAgfCAxOSArKysrKysrKysrLS0tLS0tLS0tCiAx MCBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYwppbmRleCBiMzdmZmVhLi42YTY5OThjIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKQEAgLTM4Nyw4ICszODcsOCBAQCBpOTE1X2dlbV9jcmVhdGUoc3RydWN0IGRybV9m aWxlICpmaWxlLAogCiAJLyogQWxsb2NhdGUgdGhlIG5ldyBvYmplY3QgKi8KIAlvYmogPSBpOTE1 X2dlbV9hbGxvY19vYmplY3QoZGV2LCBzaXplKTsKLQlpZiAob2JqID09IE5VTEwpCi0JCXJldHVy biAtRU5PTUVNOworCWlmIChJU19FUlIob2JqKSkKKwkJcmV0dXJuIFBUUl9FUlIob2JqKTsKIAog CXJldCA9IGRybV9nZW1faGFuZGxlX2NyZWF0ZShmaWxlLCAmb2JqLT5iYXNlLCAmaGFuZGxlKTsK IAkvKiBkcm9wIHJlZmVyZW5jZSBmcm9tIGFsbG9jYXRlIC0gaGFuZGxlIGhvbGRzIGl0IG5vdyAq LwpAQCAtNDUyNywxNCArNDUyNywxNiBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqaTkx NV9nZW1fYWxsb2Nfb2JqZWN0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iajsKIAlzdHJ1Y3QgYWRkcmVzc19zcGFjZSAqbWFwcGluZzsKIAln ZnBfdCBtYXNrOworCWludCByZXQ7CiAKIAlvYmogPSBpOTE1X2dlbV9vYmplY3RfYWxsb2MoZGV2 KTsKIAlpZiAob2JqID09IE5VTEwpCi0JCXJldHVybiBOVUxMOworCQlyZXR1cm4gRVJSX1BUUigt RU5PTUVNKTsKIAotCWlmIChkcm1fZ2VtX29iamVjdF9pbml0KGRldiwgJm9iai0+YmFzZSwgc2l6 ZSkgIT0gMCkgeworCXJldCA9IGRybV9nZW1fb2JqZWN0X2luaXQoZGV2LCAmb2JqLT5iYXNlLCBz aXplKTsKKwlpZiAocmV0KSB7CiAJCWk5MTVfZ2VtX29iamVjdF9mcmVlKG9iaik7Ci0JCXJldHVy biBOVUxMOworCQlyZXR1cm4gRVJSX1BUUihyZXQpOwogCX0KIAogCW1hc2sgPSBHRlBfSElHSFVT RVIgfCBfX0dGUF9SRUNMQUlNQUJMRTsKQEAgLTUzOTAsNyArNTM5Miw3IEBAIGk5MTVfZ2VtX29i amVjdF9jcmVhdGVfZnJvbV9kYXRhKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50IHJldDsK IAogCW9iaiA9IGk5MTVfZ2VtX2FsbG9jX29iamVjdChkZXYsIHJvdW5kX3VwKHNpemUsIFBBR0Vf U0laRSkpOwotCWlmIChJU19FUlJfT1JfTlVMTChvYmopKQorCWlmIChJU19FUlIob2JqKSkKIAkJ cmV0dXJuIG9iajsKIAogCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fY3B1X2RvbWFpbihv YmosIHRydWUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fYmF0 Y2hfcG9vbC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fYmF0Y2hfcG9vbC5jCmlu ZGV4IDdiZjJmM2YuLmQ3OWNhYTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2JhdGNoX3Bvb2wuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9i YXRjaF9wb29sLmMKQEAgLTEzNSw4ICsxMzUsOCBAQCBpOTE1X2dlbV9iYXRjaF9wb29sX2dldChz dHJ1Y3QgaTkxNV9nZW1fYmF0Y2hfcG9vbCAqcG9vbCwKIAkJaW50IHJldDsKIAogCQlvYmogPSBp OTE1X2dlbV9hbGxvY19vYmplY3QocG9vbC0+ZGV2LCBzaXplKTsKLQkJaWYgKG9iaiA9PSBOVUxM KQotCQkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CisJCWlmIChJU19FUlIob2JqKSkKKwkJCXJl dHVybiBvYmo7CiAKIAkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhvYmopOwogCQlp ZiAocmV0KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4 dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGZlNTgw Y2IuLmE1YWRjNjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Nv bnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAg LTE3OSw4ICsxNzksOCBAQCBpOTE1X2dlbV9hbGxvY19jb250ZXh0X29iaihzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBzaXplX3Qgc2l6ZSkKIAlpbnQgcmV0OwogCiAJb2JqID0gaTkxNV9nZW1fYWxs b2Nfb2JqZWN0KGRldiwgc2l6ZSk7Ci0JaWYgKG9iaiA9PSBOVUxMKQotCQlyZXR1cm4gRVJSX1BU UigtRU5PTUVNKTsKKwlpZiAoSVNfRVJSKG9iaikpCisJCXJldHVybiBvYmo7CiAKIAkvKgogCSAq IFRyeSB0byBtYWtlIHRoZSBjb250ZXh0IHV0aWxpemUgTDMgYXMgd2VsbCBhcyBMTEMuCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4IDcxNjExYmYu LjA3MWMxMWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRl cl9zdGF0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0 ZS5jCkBAIC01OCw4ICs1OCwxMSBAQCBzdGF0aWMgaW50IHJlbmRlcl9zdGF0ZV9pbml0KHN0cnVj dCByZW5kZXJfc3RhdGUgKnNvLCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXR1cm4gLUVJ TlZBTDsKIAogCXNvLT5vYmogPSBpOTE1X2dlbV9hbGxvY19vYmplY3QoZGV2LCA0MDk2KTsKLQlp ZiAoc28tPm9iaiA9PSBOVUxMKQotCQlyZXR1cm4gLUVOT01FTTsKKwlpZiAoSVNfRVJSKHNvLT5v YmopKSB7CisJCXJldCA9IFBUUl9FUlIoc28tPm9iaik7CisJCXNvLT5vYmogPSBOVUxMOworCQly ZXR1cm4gcmV0OworCX0KIAogCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3Bpbihzby0+b2JqLCA0 MDk2LCAwKTsKIAlpZiAocmV0KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jCmluZGV4IGRhODZiZGIuLjAwNGY4ZjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTYxNyw3ICs2MTcsNyBAQCBzdGF0aWMgc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKmdlbV9hbGxvY2F0ZV9ndWNfb2JqKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAogCW9iaiA9IGk5MTVf Z2VtX2FsbG9jX29iamVjdChkZXYsIHNpemUpOwotCWlmICghb2JqKQorCWlmIChJU19FUlIob2Jq KSkKIAkJcmV0dXJuIE5VTEw7CiAKIAlpZiAoaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhvYmop KSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNTUxNTQxYjMwMy4uMjI0 N2JkYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTAyODMsOCArMTAy ODMsOCBAQCBpbnRlbF9mcmFtZWJ1ZmZlcl9jcmVhdGVfZm9yX21vZGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAogCW9iaiA9IGk5MTVfZ2VtX2FsbG9jX29iamVjdChkZXYsCiAJCQkJICAgIGlu dGVsX2ZyYW1lYnVmZmVyX3NpemVfZm9yX21vZGUobW9kZSwgYnBwKSk7Ci0JaWYgKG9iaiA9PSBO VUxMKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKwlpZiAoSVNfRVJSKG9iaikpCisJCXJl dHVybiBFUlJfQ0FTVChvYmopOwogCiAJbW9kZV9jbWQud2lkdGggPSBtb2RlLT5oZGlzcGxheTsK IAltb2RlX2NtZC5oZWlnaHQgPSBtb2RlLT52ZGlzcGxheTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9m YmRldi5jCmluZGV4IDc5YWMyMDIuLjcwNDdiMzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJk ZXYuYwpAQCAtMTUxLDkgKzE1MSw5IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3Qg ZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0 b2xlbihkZXYsIHNpemUpOwogCWlmIChvYmogPT0gTlVMTCkKIAkJb2JqID0gaTkxNV9nZW1fYWxs b2Nfb2JqZWN0KGRldiwgc2l6ZSk7Ci0JaWYgKCFvYmopIHsKKwlpZiAoSVNfRVJSKG9iaikpIHsK IAkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gYWxsb2NhdGUgZnJhbWVidWZmZXJcbiIpOwotCQlyZXQg PSAtRU5PTUVNOworCQlyZXQgPSBQVFJfRVJSKG9iaik7CiAJCWdvdG8gb3V0OwogCX0KIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAwZDZkYzVlLi5jMDU0M2JiIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYwpAQCAtMTQ4Myw5ICsxNDgzLDExIEBAIHN0YXRpYyBpbnQgbHJjX3NldHVw X3dhX2N0eF9vYmooc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1MzIgc2l6ZSkKIAog CWVuZ2luZS0+d2FfY3R4Lm9iaiA9IGk5MTVfZ2VtX2FsbG9jX29iamVjdChlbmdpbmUtPmRldiwK IAkJCQkJCSAgIFBBR0VfQUxJR04oc2l6ZSkpOwotCWlmICghZW5naW5lLT53YV9jdHgub2JqKSB7 CisJaWYgKElTX0VSUihlbmdpbmUtPndhX2N0eC5vYmopKSB7CiAJCURSTV9ERUJVR19EUklWRVIo ImFsbG9jIExSQyBXQSBjdHggYmFja2luZyBvYmogZmFpbGVkLlxuIik7Ci0JCXJldHVybiAtRU5P TUVNOworCQlyZXQgPSBQVFJfRVJSKGVuZ2luZS0+d2FfY3R4Lm9iaik7CisJCWVuZ2luZS0+d2Ff Y3R4Lm9iaiA9IE5VTEw7CisJCXJldHVybiByZXQ7CiAJfQogCiAJcmV0ID0gaTkxNV9nZW1fb2Jq X2dndHRfcGluKGVuZ2luZS0+d2FfY3R4Lm9iaiwgUEFHRV9TSVpFLCAwKTsKQEAgLTI2MzgsOSAr MjY0MCw5IEBAIGludCBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKHN0cnVjdCBpbnRl bF9jb250ZXh0ICpjdHgsCiAJY29udGV4dF9zaXplICs9IFBBR0VfU0laRSAqIExSQ19QUEhXU1Bf UE47CiAKIAljdHhfb2JqID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGRldiwgY29udGV4dF9zaXpl KTsKLQlpZiAoIWN0eF9vYmopIHsKKwlpZiAoSVNfRVJSKGN0eF9vYmopKSB7CiAJCURSTV9ERUJV R19EUklWRVIoIkFsbG9jIExSQyBiYWNraW5nIG9iaiBmYWlsZWQuXG4iKTsKLQkJcmV0dXJuIC1F Tk9NRU07CisJCXJldHVybiBQVFJfRVJSKGN0eF9vYmopOwogCX0KIAogCXJpbmdidWYgPSBpbnRl bF9lbmdpbmVfY3JlYXRlX3JpbmdidWZmZXIoZW5naW5lLCA0ICogUEFHRV9TSVpFKTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYwppbmRleCA2Njk0ZTkyLi43N2VlMTJmIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCkBAIC0xMzk3LDcgKzEzOTcsNyBAQCB2b2lkIGlu dGVsX3NldHVwX292ZXJsYXkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmVnX2JvID0gaTkx NV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oZGV2LCBQQUdFX1NJWkUpOwogCWlmIChyZWdfYm8g PT0gTlVMTCkKIAkJcmVnX2JvID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGRldiwgUEFHRV9TSVpF KTsKLQlpZiAocmVnX2JvID09IE5VTEwpCisJaWYgKElTX0VSUihyZWdfYm8pKQogCQlnb3RvIG91 dF9mcmVlOwogCW92ZXJsYXktPnJlZ19ibyA9IHJlZ19ibzsKIApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDQxYjYwNGUuLmIyMGNmOTEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTY3Miw5ICs2NzIsMTAgQEAgaW50ZWxfaW5p dF9waXBlX2NvbnRyb2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCVdBUk5fT04o ZW5naW5lLT5zY3JhdGNoLm9iaik7CiAKIAllbmdpbmUtPnNjcmF0Y2gub2JqID0gaTkxNV9nZW1f YWxsb2Nfb2JqZWN0KGVuZ2luZS0+ZGV2LCA0MDk2KTsKLQlpZiAoZW5naW5lLT5zY3JhdGNoLm9i aiA9PSBOVUxMKSB7CisJaWYgKElTX0VSUihlbmdpbmUtPnNjcmF0Y2gub2JqKSkgewogCQlEUk1f RVJST1IoIkZhaWxlZCB0byBhbGxvY2F0ZSBzZXFubyBwYWdlXG4iKTsKLQkJcmV0ID0gLUVOT01F TTsKKwkJcmV0ID0gUFRSX0VSUihlbmdpbmUtPnNjcmF0Y2gub2JqKTsKKwkJZW5naW5lLT5zY3Jh dGNoLm9iaiA9IE5VTEw7CiAJCWdvdG8gZXJyOwogCX0KIApAQCAtMjAyMSw5ICsyMDIyLDkgQEAg c3RhdGljIGludCBpbml0X3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKIAkJaW50IHJldDsKIAogCQlvYmogPSBpOTE1X2dlbV9hbGxvY19vYmplY3QoZW5naW5lLT5k ZXYsIDQwOTYpOwotCQlpZiAob2JqID09IE5VTEwpIHsKKwkJaWYgKElTX0VSUihvYmopKSB7CiAJ CQlEUk1fRVJST1IoIkZhaWxlZCB0byBhbGxvY2F0ZSBzdGF0dXMgcGFnZVxuIik7Ci0JCQlyZXR1 cm4gLUVOT01FTTsKKwkJCXJldHVybiBQVFJfRVJSKG9iaik7CiAJCX0KIAogCQlyZXQgPSBpOTE1 X2dlbV9vYmplY3Rfc2V0X2NhY2hlX2xldmVsKG9iaiwgSTkxNV9DQUNIRV9MTEMpOwpAQCAtMjE1 Niw4ICsyMTU3LDggQEAgc3RhdGljIGludCBpbnRlbF9hbGxvY19yaW5nYnVmZmVyX29iaihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xl bihkZXYsIHJpbmdidWYtPnNpemUpOwogCWlmIChvYmogPT0gTlVMTCkKIAkJb2JqID0gaTkxNV9n ZW1fYWxsb2Nfb2JqZWN0KGRldiwgcmluZ2J1Zi0+c2l6ZSk7Ci0JaWYgKG9iaiA9PSBOVUxMKQot CQlyZXR1cm4gLUVOT01FTTsKKwlpZiAoSVNfRVJSKG9iaikpCisJCXJldHVybiBQVFJfRVJSKG9i aik7CiAKIAkvKiBtYXJrIHJpbmcgYnVmZmVycyBhcyByZWFkLW9ubHkgZnJvbSBHUFUgc2lkZSBi eSBkZWZhdWx0ICovCiAJb2JqLT5ndF9ybyA9IDE7CkBAIC0yNzgwLDcgKzI3ODEsNyBAQCBpbnQg aW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlp ZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOCkgewogCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNf ZW5hYmxlZChkZXYpKSB7CiAJCQlvYmogPSBpOTE1X2dlbV9hbGxvY19vYmplY3QoZGV2LCA0MDk2 KTsKLQkJCWlmIChvYmogPT0gTlVMTCkgeworCQkJaWYgKElTX0VSUihvYmopKSB7CiAJCQkJRFJN X0VSUk9SKCJGYWlsZWQgdG8gYWxsb2NhdGUgc2VtYXBob3JlIGJvLiBEaXNhYmxpbmcgc2VtYXBo b3Jlc1xuIik7CiAJCQkJaTkxNS5zZW1hcGhvcmVzID0gMDsKIAkJCX0gZWxzZSB7CkBAIC0yODg5 LDkgKzI4OTAsOSBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkvKiBXb3JrYXJvdW5kIGJhdGNoYnVmZmVyIHRvIGNvbWJhdCBDUyB0 bGIgYnVnLiAqLwogCWlmIChIQVNfQlJPS0VOX0NTX1RMQihkZXYpKSB7CiAJCW9iaiA9IGk5MTVf Z2VtX2FsbG9jX29iamVjdChkZXYsIEk4MzBfV0FfU0laRSk7Ci0JCWlmIChvYmogPT0gTlVMTCkg eworCQlpZiAoSVNfRVJSKG9iaikpIHsKIAkJCURSTV9FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRl IGJhdGNoIGJvXG4iKTsKLQkJCXJldHVybiAtRU5PTUVNOworCQkJcmV0dXJuIFBUUl9FUlIob2Jq KTsKIAkJfQogCiAJCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihvYmosIDAsIDApOwotLSAK Mi40LjExCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK