From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH] drm/i915: Propagate error from drm_gem_object_init() Date: Fri, 22 Apr 2016 11:57:57 +0100 Message-ID: <1461322677-20728-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 29A896E2E4 for ; Fri, 22 Apr 2016 10:58:03 +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 RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpQcm9wYWdhdGUg dGhlIHJlYWwgZXJyb3IgZnJvbSBkcm1fZ2VtX29iamVjdF9pbml0KCkuIE5vdGUgdGhpcyBhbHNv CmZpeGVzIHNvbWUgY29uZnVzaW9uIGluIHRoZSBlcnJvciByZXR1cm4gZnJvbSBpOTE1X2dlbV9h bGxvY19vYmplY3QuLi4KCnYyOgooTWF0dGhldyBBdWxkKQogIC0gdXBkYXRlZCBuZXcgdXNlcnMg b2YgZ2VtX2FsbG9jX29iamVjdCBmcm9tIGxhdGVzdCBkcm0tbmlnaHRseQogIC0gcmVwbGFjZWQg b2NjdXJyZW5jZXMgb2YgSVNfRVJSX09SX05VTEwoKSB3aXRoIElTX0VSUigpCnYzOgooSm9vbmFz IExhaHRpbmVuKQogIC0gZml4IGRvdWJsZSAiRnJvbToiIGluIGNvbW1pdCBtZXNzYWdlCiAgLSBh ZGQgZ290byB0ZWFyZG93biBwYXRoCgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRo ZXcuYXVsZEBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFo dGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgICAgICAgICAgICAgIHwgMjEgKysrKysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9iYXRjaF9wb29sLmMgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyAgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgfCAgNyArKysrKy0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2ZiZGV2LmMgICAgICAgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMgICAgICAgICAgICAgfCAxMCArKysrKystLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9vdmVybGF5LmMgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgICB8IDE5ICsrKysrKysrKystLS0tLS0tLS0KIDEw IGZpbGVzIGNoYW5nZWQsIDQ0IGluc2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCmluZGV4IDI2MWEzZWYuLmM2YzE3ZGQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYwpAQCAtMzgyLDggKzM4Miw4IEBAIGk5MTVfZ2VtX2NyZWF0ZShzdHJ1Y3QgZHJtX2Zp bGUgKmZpbGUsCiAKIAkvKiBBbGxvY2F0ZSB0aGUgbmV3IG9iamVjdCAqLwogCW9iaiA9IGk5MTVf Z2VtX2FsbG9jX29iamVjdChkZXYsIHNpemUpOwotCWlmIChvYmogPT0gTlVMTCkKLQkJcmV0dXJu IC1FTk9NRU07CisJaWYgKElTX0VSUihvYmopKQorCQlyZXR1cm4gUFRSX0VSUihvYmopOwogCiAJ cmV0ID0gZHJtX2dlbV9oYW5kbGVfY3JlYXRlKGZpbGUsICZvYmotPmJhc2UsICZoYW5kbGUpOwog CS8qIGRyb3AgcmVmZXJlbmNlIGZyb20gYWxsb2NhdGUgLSBoYW5kbGUgaG9sZHMgaXQgbm93ICov CkBAIC00NDk4LDE1ICs0NDk4LDE1IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICppOTE1 X2dlbV9hbGxvY19vYmplY3Qoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqOwogCXN0cnVjdCBhZGRyZXNzX3NwYWNlICptYXBwaW5nOwogCWdm cF90IG1hc2s7CisJaW50IHJldDsKIAogCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9hbGxvYyhkZXYp OwogCWlmIChvYmogPT0gTlVMTCkKLQkJcmV0dXJuIE5VTEw7CisJCXJldHVybiBFUlJfUFRSKC1F Tk9NRU0pOwogCi0JaWYgKGRybV9nZW1fb2JqZWN0X2luaXQoZGV2LCAmb2JqLT5iYXNlLCBzaXpl KSAhPSAwKSB7Ci0JCWk5MTVfZ2VtX29iamVjdF9mcmVlKG9iaik7Ci0JCXJldHVybiBOVUxMOwot CX0KKwlyZXQgPSBkcm1fZ2VtX29iamVjdF9pbml0KGRldiwgJm9iai0+YmFzZSwgc2l6ZSk7CisJ aWYgKHJldCkKKwkJZ290byBmYWlsOwogCiAJbWFzayA9IEdGUF9ISUdIVVNFUiB8IF9fR0ZQX1JF Q0xBSU1BQkxFOwogCWlmIChJU19DUkVTVExJTkUoZGV2KSB8fCBJU19CUk9BRFdBVEVSKGRldikp IHsKQEAgLTQ1NDMsNiArNDU0MywxMSBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqaTkx NV9nZW1fYWxsb2Nfb2JqZWN0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJdHJhY2VfaTkxNV9n ZW1fb2JqZWN0X2NyZWF0ZShvYmopOwogCiAJcmV0dXJuIG9iajsKKworZmFpbDoKKwlpOTE1X2dl bV9vYmplY3RfZnJlZShvYmopOworCisJcmV0dXJuIEVSUl9QVFIocmV0KTsKIH0KIAogc3RhdGlj IGJvb2wgZGlzY2FyZF9iYWNraW5nX3N0b3JhZ2Uoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaikKQEAgLTUzNjIsNyArNTM2Nyw3IEBAIGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfZnJvbV9k YXRhKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50IHJldDsKIAogCW9iaiA9IGk5MTVfZ2Vt X2FsbG9jX29iamVjdChkZXYsIHJvdW5kX3VwKHNpemUsIFBBR0VfU0laRSkpOwotCWlmIChJU19F UlJfT1JfTlVMTChvYmopKQorCWlmIChJU19FUlIob2JqKSkKIAkJcmV0dXJuIG9iajsKIAogCXJl dCA9IGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fY3B1X2RvbWFpbihvYmosIHRydWUpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fYmF0Y2hfcG9vbC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fYmF0Y2hfcG9vbC5jCmluZGV4IDdiZjJmM2YuLmQ3OWNh YTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2JhdGNoX3Bvb2wu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9iYXRjaF9wb29sLmMKQEAgLTEz NSw4ICsxMzUsOCBAQCBpOTE1X2dlbV9iYXRjaF9wb29sX2dldChzdHJ1Y3QgaTkxNV9nZW1fYmF0 Y2hfcG9vbCAqcG9vbCwKIAkJaW50IHJldDsKIAogCQlvYmogPSBpOTE1X2dlbV9hbGxvY19vYmpl Y3QocG9vbC0+ZGV2LCBzaXplKTsKLQkJaWYgKG9iaiA9PSBOVUxMKQotCQkJcmV0dXJuIEVSUl9Q VFIoLUVOT01FTSk7CisJCWlmIChJU19FUlIob2JqKSkKKwkJCXJldHVybiBvYmo7CiAKIAkJcmV0 ID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhvYmopOwogCQlpZiAocmV0KQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGU1YWNjMzkuLjM0ZjQ5MzAgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTE3OSw4ICsxNzksOCBAQCBp OTE1X2dlbV9hbGxvY19jb250ZXh0X29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzaXplX3Qg c2l6ZSkKIAlpbnQgcmV0OwogCiAJb2JqID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGRldiwgc2l6 ZSk7Ci0JaWYgKG9iaiA9PSBOVUxMKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKwlpZiAo SVNfRVJSKG9iaikpCisJCXJldHVybiBvYmo7CiAKIAkvKgogCSAqIFRyeSB0byBtYWtlIHRoZSBj b250ZXh0IHV0aWxpemUgTDMgYXMgd2VsbCBhcyBMTEMuCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4IDcxNjExYmYuLjA3MWMxMWUgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCkBAIC01OCw4ICs1OCwx MSBAQCBzdGF0aWMgaW50IHJlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCByZW5kZXJfc3RhdGUgKnNv LCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXR1cm4gLUVJTlZBTDsKIAogCXNvLT5vYmog PSBpOTE1X2dlbV9hbGxvY19vYmplY3QoZGV2LCA0MDk2KTsKLQlpZiAoc28tPm9iaiA9PSBOVUxM KQotCQlyZXR1cm4gLUVOT01FTTsKKwlpZiAoSVNfRVJSKHNvLT5vYmopKSB7CisJCXJldCA9IFBU Ul9FUlIoc28tPm9iaik7CisJCXNvLT5vYmogPSBOVUxMOworCQlyZXR1cm4gcmV0OworCX0KIAog CXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3Bpbihzby0+b2JqLCA0MDk2LCAwKTsKIAlpZiAocmV0 KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGQ0MGMx M2YuLjg1MTIyZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1 Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMKQEAgLTU4OCw3ICs1ODgsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg KmdlbV9hbGxvY2F0ZV9ndWNfb2JqKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAogCW9iaiA9IGk5MTVfZ2VtX2FsbG9jX29iamVjdChk ZXYsIHNpemUpOwotCWlmICghb2JqKQorCWlmIChJU19FUlIob2JqKSkKIAkJcmV0dXJuIE5VTEw7 CiAKIAlpZiAoaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhvYmopKSB7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZmY2MDI0MS4uNWFmZjRjYSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTAzMjAsOCArMTAzMjAsOCBAQCBpbnRlbF9mcmFtZWJ1 ZmZlcl9jcmVhdGVfZm9yX21vZGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCW9iaiA9IGk5 MTVfZ2VtX2FsbG9jX29iamVjdChkZXYsCiAJCQkJICAgIGludGVsX2ZyYW1lYnVmZmVyX3NpemVf Zm9yX21vZGUobW9kZSwgYnBwKSk7Ci0JaWYgKG9iaiA9PSBOVUxMKQotCQlyZXR1cm4gRVJSX1BU UigtRU5PTUVNKTsKKwlpZiAoSVNfRVJSKG9iaikpCisJCXJldHVybiBFUlJfQ0FTVChvYmopOwog CiAJbW9kZV9jbWQud2lkdGggPSBtb2RlLT5oZGlzcGxheTsKIAltb2RlX2NtZC5oZWlnaHQgPSBt b2RlLT52ZGlzcGxheTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Zi ZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCmluZGV4IDc5YWMyMDIu LjcwNDdiMzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwpAQCAtMTUxLDkgKzE1MSw5 IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVy LAogCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbihkZXYsIHNpemUpOwogCWlm IChvYmogPT0gTlVMTCkKIAkJb2JqID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGRldiwgc2l6ZSk7 Ci0JaWYgKCFvYmopIHsKKwlpZiAoSVNfRVJSKG9iaikpIHsKIAkJRFJNX0VSUk9SKCJmYWlsZWQg dG8gYWxsb2NhdGUgZnJhbWVidWZmZXJcbiIpOwotCQlyZXQgPSAtRU5PTUVNOworCQlyZXQgPSBQ VFJfRVJSKG9iaik7CiAJCWdvdG8gb3V0OwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpp bmRleCA2MTc5YjU5Li4xOTgzMTk4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTQ3 NCw5ICsxNDc0LDExIEBAIHN0YXRpYyBpbnQgbHJjX3NldHVwX3dhX2N0eF9vYmooc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1MzIgc2l6ZSkKIAogCWVuZ2luZS0+d2FfY3R4Lm9iaiA9 IGk5MTVfZ2VtX2FsbG9jX29iamVjdChlbmdpbmUtPmRldiwKIAkJCQkJCSAgIFBBR0VfQUxJR04o c2l6ZSkpOwotCWlmICghZW5naW5lLT53YV9jdHgub2JqKSB7CisJaWYgKElTX0VSUihlbmdpbmUt PndhX2N0eC5vYmopKSB7CiAJCURSTV9ERUJVR19EUklWRVIoImFsbG9jIExSQyBXQSBjdHggYmFj a2luZyBvYmogZmFpbGVkLlxuIik7Ci0JCXJldHVybiAtRU5PTUVNOworCQlyZXQgPSBQVFJfRVJS KGVuZ2luZS0+d2FfY3R4Lm9iaik7CisJCWVuZ2luZS0+d2FfY3R4Lm9iaiA9IE5VTEw7CisJCXJl dHVybiByZXQ7CiAJfQogCiAJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKGVuZ2luZS0+d2Ff Y3R4Lm9iaiwgUEFHRV9TSVpFLCAwKTsKQEAgLTI2NjYsOSArMjY2OCw5IEBAIGludCBpbnRlbF9s cl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJY29u dGV4dF9zaXplICs9IFBBR0VfU0laRSAqIExSQ19QUEhXU1BfUE47CiAKIAljdHhfb2JqID0gaTkx NV9nZW1fYWxsb2Nfb2JqZWN0KGRldiwgY29udGV4dF9zaXplKTsKLQlpZiAoIWN0eF9vYmopIHsK KwlpZiAoSVNfRVJSKGN0eF9vYmopKSB7CiAJCURSTV9ERUJVR19EUklWRVIoIkFsbG9jIExSQyBi YWNraW5nIG9iaiBmYWlsZWQuXG4iKTsKLQkJcmV0dXJuIC1FTk9NRU07CisJCXJldHVybiBQVFJf RVJSKGN0eF9vYmopOwogCX0KIAogCXJpbmdidWYgPSBpbnRlbF9lbmdpbmVfY3JlYXRlX3Jpbmdi dWZmZXIoZW5naW5lLCA0ICogUEFHRV9TSVpFKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX292ZXJsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJs YXkuYwppbmRleCBiY2MzYjZhLi4wZDRiY2JlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9vdmVybGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3Zl cmxheS5jCkBAIC0xMzk3LDcgKzEzOTcsNyBAQCB2b2lkIGludGVsX3NldHVwX292ZXJsYXkoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmVnX2JvID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9z dG9sZW4oZGV2LCBQQUdFX1NJWkUpOwogCWlmIChyZWdfYm8gPT0gTlVMTCkKIAkJcmVnX2JvID0g aTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGRldiwgUEFHRV9TSVpFKTsKLQlpZiAocmVnX2JvID09IE5V TEwpCisJaWYgKElTX0VSUihyZWdfYm8pKQogCQlnb3RvIG91dF9mcmVlOwogCW92ZXJsYXktPnJl Z19ibyA9IHJlZ19ibzsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmlu ZGV4IDI0NTM4NmUuLjI5MDk0ZWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMKQEAgLTY3Miw5ICs2NzIsMTAgQEAgaW50ZWxfaW5pdF9waXBlX2NvbnRyb2woc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCVdBUk5fT04oZW5naW5lLT5zY3JhdGNoLm9iaik7 CiAKIAllbmdpbmUtPnNjcmF0Y2gub2JqID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGVuZ2luZS0+ ZGV2LCA0MDk2KTsKLQlpZiAoZW5naW5lLT5zY3JhdGNoLm9iaiA9PSBOVUxMKSB7CisJaWYgKElT X0VSUihlbmdpbmUtPnNjcmF0Y2gub2JqKSkgewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBhbGxv Y2F0ZSBzZXFubyBwYWdlXG4iKTsKLQkJcmV0ID0gLUVOT01FTTsKKwkJcmV0ID0gUFRSX0VSUihl bmdpbmUtPnNjcmF0Y2gub2JqKTsKKwkJZW5naW5lLT5zY3JhdGNoLm9iaiA9IE5VTEw7CiAJCWdv dG8gZXJyOwogCX0KIApAQCAtMjAyMyw5ICsyMDI0LDkgQEAgc3RhdGljIGludCBpbml0X3N0YXR1 c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJaW50IHJldDsKIAogCQlv YmogPSBpOTE1X2dlbV9hbGxvY19vYmplY3QoZW5naW5lLT5kZXYsIDQwOTYpOwotCQlpZiAob2Jq ID09IE5VTEwpIHsKKwkJaWYgKElTX0VSUihvYmopKSB7CiAJCQlEUk1fRVJST1IoIkZhaWxlZCB0 byBhbGxvY2F0ZSBzdGF0dXMgcGFnZVxuIik7Ci0JCQlyZXR1cm4gLUVOT01FTTsKKwkJCXJldHVy biBQVFJfRVJSKG9iaik7CiAJCX0KIAogCQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc2V0X2NhY2hl X2xldmVsKG9iaiwgSTkxNV9DQUNIRV9MTEMpOwpAQCAtMjE2NCw4ICsyMTY1LDggQEAgc3RhdGlj IGludCBpbnRlbF9hbGxvY19yaW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbihkZXYsIHJpbmdidWYtPnNpemUp OwogCWlmIChvYmogPT0gTlVMTCkKIAkJb2JqID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGRldiwg cmluZ2J1Zi0+c2l6ZSk7Ci0JaWYgKG9iaiA9PSBOVUxMKQotCQlyZXR1cm4gLUVOT01FTTsKKwlp ZiAoSVNfRVJSKG9iaikpCisJCXJldHVybiBQVFJfRVJSKG9iaik7CiAKIAkvKiBtYXJrIHJpbmcg YnVmZmVycyBhcyByZWFkLW9ubHkgZnJvbSBHUFUgc2lkZSBieSBkZWZhdWx0ICovCiAJb2JqLT5n dF9ybyA9IDE7CkBAIC0yNzc3LDcgKzI3NzgsNyBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmlu Z19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gOCkgewogCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChkZXYpKSB7CiAJCQlv YmogPSBpOTE1X2dlbV9hbGxvY19vYmplY3QoZGV2LCA0MDk2KTsKLQkJCWlmIChvYmogPT0gTlVM TCkgeworCQkJaWYgKElTX0VSUihvYmopKSB7CiAJCQkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gYWxs b2NhdGUgc2VtYXBob3JlIGJvLiBEaXNhYmxpbmcgc2VtYXBob3Jlc1xuIik7CiAJCQkJaTkxNS5z ZW1hcGhvcmVzID0gMDsKIAkJCX0gZWxzZSB7CkBAIC0yODg2LDkgKzI4ODcsOSBAQCBpbnQgaW50 ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkvKiBX b3JrYXJvdW5kIGJhdGNoYnVmZmVyIHRvIGNvbWJhdCBDUyB0bGIgYnVnLiAqLwogCWlmIChIQVNf QlJPS0VOX0NTX1RMQihkZXYpKSB7CiAJCW9iaiA9IGk5MTVfZ2VtX2FsbG9jX29iamVjdChkZXYs IEk4MzBfV0FfU0laRSk7Ci0JCWlmIChvYmogPT0gTlVMTCkgeworCQlpZiAoSVNfRVJSKG9iaikp IHsKIAkJCURSTV9FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRlIGJhdGNoIGJvXG4iKTsKLQkJCXJl dHVybiAtRU5PTUVNOworCQkJcmV0dXJuIFBUUl9FUlIob2JqKTsKIAkJfQogCiAJCXJldCA9IGk5 MTVfZ2VtX29ial9nZ3R0X3BpbihvYmosIDAsIDApOwotLSAKMi41LjUKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=