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: Mon, 25 Apr 2016 13:32:13 +0100 Message-ID: <1461587533-8841-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 90B2B89AC9 for ; Mon, 25 Apr 2016 12:32:42 +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 ZGQgZ290byB0ZWFyZG93biBwYXRoCnY0OgooTWF0dGhldyBBdWxkKQogIC0gcmViYXNlIHdpdGgg aTkxNV9nZW1fYWxsb2Nfb2JqZWN0IG5hbWUgY2hhbmdlCgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3 IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRpbmVu IDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICAgIHwgMjEgKysrKysrKysrKysrKy0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9iYXRjaF9wb29sLmMgICB8ICA0ICsrLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyAgICAgIHwgIDQgKystLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgfCAgNyArKysrKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgICB8ICAyICstCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgICAgICB8ICA0ICsrLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgICAgICAgICAgIHwgIDQgKystLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgICAgfCAxMCArKysrKystLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMgICAgICAgICB8ICAyICstCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgICB8IDE5ICsrKysrKysrKyst LS0tLS0tLS0KIDEwIGZpbGVzIGNoYW5nZWQsIDQ0IGluc2VydGlvbnMoKyksIDMzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGQ0OTNlNzkuLmY3NDkwNjUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMzgyLDggKzM4Miw4IEBAIGk5MTVfZ2VtX2NyZWF0ZShz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAKIAkvKiBBbGxvY2F0ZSB0aGUgbmV3IG9iamVjdCAqLwog CW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZGV2LCBzaXplKTsKLQlpZiAob2JqID09IE5V TEwpCi0JCXJldHVybiAtRU5PTUVNOworCWlmIChJU19FUlIob2JqKSkKKwkJcmV0dXJuIFBUUl9F UlIob2JqKTsKIAogCXJldCA9IGRybV9nZW1faGFuZGxlX2NyZWF0ZShmaWxlLCAmb2JqLT5iYXNl LCAmaGFuZGxlKTsKIAkvKiBkcm9wIHJlZmVyZW5jZSBmcm9tIGFsbG9jYXRlIC0gaGFuZGxlIGhv bGRzIGl0IG5vdyAqLwpAQCAtNDQ5OCwxNSArNDQ5OCwxNSBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJc3RydWN0IGFkZHJlc3Nfc3BhY2Ug Km1hcHBpbmc7CiAJZ2ZwX3QgbWFzazsKKwlpbnQgcmV0OwogCiAJb2JqID0gaTkxNV9nZW1fb2Jq ZWN0X2FsbG9jKGRldik7CiAJaWYgKG9iaiA9PSBOVUxMKQotCQlyZXR1cm4gTlVMTDsKKwkJcmV0 dXJuIEVSUl9QVFIoLUVOT01FTSk7CiAKLQlpZiAoZHJtX2dlbV9vYmplY3RfaW5pdChkZXYsICZv YmotPmJhc2UsIHNpemUpICE9IDApIHsKLQkJaTkxNV9nZW1fb2JqZWN0X2ZyZWUob2JqKTsKLQkJ cmV0dXJuIE5VTEw7Ci0JfQorCXJldCA9IGRybV9nZW1fb2JqZWN0X2luaXQoZGV2LCAmb2JqLT5i YXNlLCBzaXplKTsKKwlpZiAocmV0KQorCQlnb3RvIGZhaWw7CiAKIAltYXNrID0gR0ZQX0hJR0hV U0VSIHwgX19HRlBfUkVDTEFJTUFCTEU7CiAJaWYgKElTX0NSRVNUTElORShkZXYpIHx8IElTX0JS T0FEV0FURVIoZGV2KSkgewpAQCAtNDU0Myw2ICs0NTQzLDExIEBAIHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICppOTE1X2dlbV9vYmplY3RfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CiAJdHJhY2VfaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShvYmopOwogCiAJcmV0dXJuIG9iajsKKwor ZmFpbDoKKwlpOTE1X2dlbV9vYmplY3RfZnJlZShvYmopOworCisJcmV0dXJuIEVSUl9QVFIocmV0 KTsKIH0KIAogc3RhdGljIGJvb2wgZGlzY2FyZF9iYWNraW5nX3N0b3JhZ2Uoc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaikKQEAgLTUzNDgsNyArNTM1Myw3IEBAIGk5MTVfZ2VtX29iamVj dF9jcmVhdGVfZnJvbV9kYXRhKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50IHJldDsKIAog CW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZGV2LCByb3VuZF91cChzaXplLCBQQUdFX1NJ WkUpKTsKLQlpZiAoSVNfRVJSX09SX05VTEwob2JqKSkKKwlpZiAoSVNfRVJSKG9iaikpCiAJCXJl dHVybiBvYmo7CiAKIAlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc2V0X3RvX2NwdV9kb21haW4ob2Jq LCB0cnVlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2JhdGNo X3Bvb2wuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2JhdGNoX3Bvb2wuYwppbmRl eCAxYmM0NmJhLi4zNzUyZDVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9iYXRjaF9wb29sLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fYmF0 Y2hfcG9vbC5jCkBAIC0xMzUsOCArMTM1LDggQEAgaTkxNV9nZW1fYmF0Y2hfcG9vbF9nZXQoc3Ry dWN0IGk5MTVfZ2VtX2JhdGNoX3Bvb2wgKnBvb2wsCiAJCWludCByZXQ7CiAKIAkJb2JqID0gaTkx NV9nZW1fb2JqZWN0X2NyZWF0ZShwb29sLT5kZXYsIHNpemUpOwotCQlpZiAob2JqID09IE5VTEwp Ci0JCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKwkJaWYgKElTX0VSUihvYmopKQorCQkJcmV0 dXJuIG9iajsKIAogCQlyZXQgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzKG9iaik7CiAJCWlm IChyZXQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggNGUxMmJh ZS4uZTc4ZTJmNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29u dGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpAQCAt MTc5LDggKzE3OSw4IEBAIGk5MTVfZ2VtX2FsbG9jX2NvbnRleHRfb2JqKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHNpemVfdCBzaXplKQogCWludCByZXQ7CiAKIAlvYmogPSBpOTE1X2dlbV9vYmpl Y3RfY3JlYXRlKGRldiwgc2l6ZSk7Ci0JaWYgKG9iaiA9PSBOVUxMKQotCQlyZXR1cm4gRVJSX1BU UigtRU5PTUVNKTsKKwlpZiAoSVNfRVJSKG9iaikpCisJCXJldHVybiBvYmo7CiAKIAkvKgogCSAq IFRyeSB0byBtYWtlIHRoZSBjb250ZXh0IHV0aWxpemUgTDMgYXMgd2VsbCBhcyBMTEMuCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4IDY1YzlkYWQu Ljg0MTA4MWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRl cl9zdGF0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0 ZS5jCkBAIC01OCw4ICs1OCwxMSBAQCBzdGF0aWMgaW50IHJlbmRlcl9zdGF0ZV9pbml0KHN0cnVj dCByZW5kZXJfc3RhdGUgKnNvLCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXR1cm4gLUVJ TlZBTDsKIAogCXNvLT5vYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGRldiwgNDA5Nik7Ci0J aWYgKHNvLT5vYmogPT0gTlVMTCkKLQkJcmV0dXJuIC1FTk9NRU07CisJaWYgKElTX0VSUihzby0+ b2JqKSkgeworCQlyZXQgPSBQVFJfRVJSKHNvLT5vYmopOworCQlzby0+b2JqID0gTlVMTDsKKwkJ cmV0dXJuIHJldDsKKwl9CiAKIAlyZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4oc28tPm9iaiwg NDA5NiwgMCk7CiAJaWYgKHJldCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYwppbmRleCA3MmQ2NjY1Li5hMzA0YjBlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC01ODgsNyArNTg4LDcgQEAgc3RhdGljIHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpnZW1fYWxsb2NhdGVfZ3VjX29iaihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAKIAlvYmogPSBpOTE1 X2dlbV9vYmplY3RfY3JlYXRlKGRldiwgc2l6ZSk7Ci0JaWYgKCFvYmopCisJaWYgKElTX0VSUihv YmopKQogCQlyZXR1cm4gTlVMTDsKIAogCWlmIChpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzKG9i aikpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBiN2NiNjMyLi43Mzlj MTJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMDMyMCw4ICsxMDMy MCw4IEBAIGludGVsX2ZyYW1lYnVmZmVyX2NyZWF0ZV9mb3JfbW9kZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCiAJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYsCiAJCQkJICAgIGlu dGVsX2ZyYW1lYnVmZmVyX3NpemVfZm9yX21vZGUobW9kZSwgYnBwKSk7Ci0JaWYgKG9iaiA9PSBO VUxMKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKwlpZiAoSVNfRVJSKG9iaikpCisJCXJl dHVybiBFUlJfQ0FTVChvYmopOwogCiAJbW9kZV9jbWQud2lkdGggPSBtb2RlLT5oZGlzcGxheTsK IAltb2RlX2NtZC5oZWlnaHQgPSBtb2RlLT52ZGlzcGxheTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9m YmRldi5jCmluZGV4IGFmNTYxNTQuLjM3ZmM2OGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJk ZXYuYwpAQCAtMTUxLDkgKzE1MSw5IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3Qg ZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0 b2xlbihkZXYsIHNpemUpOwogCWlmIChvYmogPT0gTlVMTCkKIAkJb2JqID0gaTkxNV9nZW1fb2Jq ZWN0X2NyZWF0ZShkZXYsIHNpemUpOwotCWlmICghb2JqKSB7CisJaWYgKElTX0VSUihvYmopKSB7 CiAJCURSTV9FUlJPUigiZmFpbGVkIHRvIGFsbG9jYXRlIGZyYW1lYnVmZmVyXG4iKTsKLQkJcmV0 ID0gLUVOT01FTTsKKwkJcmV0ID0gUFRSX0VSUihvYmopOwogCQlnb3RvIG91dDsKIAl9CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggMmI3ZTZiYi4uMWIwNjVlNyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKQEAgLTE0NzQsOSArMTQ3NCwxMSBAQCBzdGF0aWMgaW50IGxyY19zZXR1 cF93YV9jdHhfb2JqKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgdTMyIHNpemUpCiAK IAllbmdpbmUtPndhX2N0eC5vYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGVuZ2luZS0+ZGV2 LAogCQkJCQkJICAgUEFHRV9BTElHTihzaXplKSk7Ci0JaWYgKCFlbmdpbmUtPndhX2N0eC5vYmop IHsKKwlpZiAoSVNfRVJSKGVuZ2luZS0+d2FfY3R4Lm9iaikpIHsKIAkJRFJNX0RFQlVHX0RSSVZF UigiYWxsb2MgTFJDIFdBIGN0eCBiYWNraW5nIG9iaiBmYWlsZWQuXG4iKTsKLQkJcmV0dXJuIC1F Tk9NRU07CisJCXJldCA9IFBUUl9FUlIoZW5naW5lLT53YV9jdHgub2JqKTsKKwkJZW5naW5lLT53 YV9jdHgub2JqID0gTlVMTDsKKwkJcmV0dXJuIHJldDsKIAl9CiAKIAlyZXQgPSBpOTE1X2dlbV9v YmpfZ2d0dF9waW4oZW5naW5lLT53YV9jdHgub2JqLCBQQUdFX1NJWkUsIDApOwpAQCAtMjY2Niw5 ICsyNjY4LDkgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfYWxsb2Moc3RydWN0IGlu dGVsX2NvbnRleHQgKmN0eCwKIAljb250ZXh0X3NpemUgKz0gUEFHRV9TSVpFICogTFJDX1BQSFdT UF9QTjsKIAogCWN0eF9vYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGRldiwgY29udGV4dF9z aXplKTsKLQlpZiAoIWN0eF9vYmopIHsKKwlpZiAoSVNfRVJSKGN0eF9vYmopKSB7CiAJCURSTV9E RUJVR19EUklWRVIoIkFsbG9jIExSQyBiYWNraW5nIG9iaiBmYWlsZWQuXG4iKTsKLQkJcmV0dXJu IC1FTk9NRU07CisJCXJldHVybiBQVFJfRVJSKGN0eF9vYmopOwogCX0KIAogCXJpbmdidWYgPSBp bnRlbF9lbmdpbmVfY3JlYXRlX3JpbmdidWZmZXIoZW5naW5lLCA0ICogUEFHRV9TSVpFKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYwppbmRleCA1OTdmYmNkLi42YjAxNmM5IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCkBAIC0xMzk3LDcgKzEzOTcsNyBAQCB2b2lk IGludGVsX3NldHVwX292ZXJsYXkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmVnX2JvID0g aTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oZGV2LCBQQUdFX1NJWkUpOwogCWlmIChyZWdf Ym8gPT0gTlVMTCkKIAkJcmVnX2JvID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYsIFBBR0Vf U0laRSk7Ci0JaWYgKHJlZ19ibyA9PSBOVUxMKQorCWlmIChJU19FUlIocmVnX2JvKSkKIAkJZ290 byBvdXRfZnJlZTsKIAlvdmVybGF5LT5yZWdfYm8gPSByZWdfYm87CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA2NmY2OWNkLi5hZmYyNmJlIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC02NzIsOSArNjcyLDEwIEBAIGludGVs X2luaXRfcGlwZV9jb250cm9sKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlXQVJO X09OKGVuZ2luZS0+c2NyYXRjaC5vYmopOwogCiAJZW5naW5lLT5zY3JhdGNoLm9iaiA9IGk5MTVf Z2VtX29iamVjdF9jcmVhdGUoZW5naW5lLT5kZXYsIDQwOTYpOwotCWlmIChlbmdpbmUtPnNjcmF0 Y2gub2JqID09IE5VTEwpIHsKKwlpZiAoSVNfRVJSKGVuZ2luZS0+c2NyYXRjaC5vYmopKSB7CiAJ CURSTV9FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRlIHNlcW5vIHBhZ2VcbiIpOwotCQlyZXQgPSAt RU5PTUVNOworCQlyZXQgPSBQVFJfRVJSKGVuZ2luZS0+c2NyYXRjaC5vYmopOworCQllbmdpbmUt PnNjcmF0Y2gub2JqID0gTlVMTDsKIAkJZ290byBlcnI7CiAJfQogCkBAIC0yMDI3LDkgKzIwMjgs OSBAQCBzdGF0aWMgaW50IGluaXRfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQogCQlpbnQgcmV0OwogCiAJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZW5n aW5lLT5kZXYsIDQwOTYpOwotCQlpZiAob2JqID09IE5VTEwpIHsKKwkJaWYgKElTX0VSUihvYmop KSB7CiAJCQlEUk1fRVJST1IoIkZhaWxlZCB0byBhbGxvY2F0ZSBzdGF0dXMgcGFnZVxuIik7Ci0J CQlyZXR1cm4gLUVOT01FTTsKKwkJCXJldHVybiBQVFJfRVJSKG9iaik7CiAJCX0KIAogCQlyZXQg PSBpOTE1X2dlbV9vYmplY3Rfc2V0X2NhY2hlX2xldmVsKG9iaiwgSTkxNV9DQUNIRV9MTEMpOwpA QCAtMjE2OCw4ICsyMTY5LDggQEAgc3RhdGljIGludCBpbnRlbF9hbGxvY19yaW5nYnVmZmVyX29i aihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRl X3N0b2xlbihkZXYsIHJpbmdidWYtPnNpemUpOwogCWlmIChvYmogPT0gTlVMTCkKIAkJb2JqID0g aTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYsIHJpbmdidWYtPnNpemUpOwotCWlmIChvYmogPT0g TlVMTCkKLQkJcmV0dXJuIC1FTk9NRU07CisJaWYgKElTX0VSUihvYmopKQorCQlyZXR1cm4gUFRS X0VSUihvYmopOwogCiAJLyogbWFyayByaW5nIGJ1ZmZlcnMgYXMgcmVhZC1vbmx5IGZyb20gR1BV IHNpZGUgYnkgZGVmYXVsdCAqLwogCW9iai0+Z3Rfcm8gPSAxOwpAQCAtMjc4MSw3ICsyNzgyLDcg QEAgaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgpIHsKIAkJaWYgKGk5MTVfc2VtYXBo b3JlX2lzX2VuYWJsZWQoZGV2KSkgewogCQkJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShk ZXYsIDQwOTYpOwotCQkJaWYgKG9iaiA9PSBOVUxMKSB7CisJCQlpZiAoSVNfRVJSKG9iaikpIHsK IAkJCQlEUk1fRVJST1IoIkZhaWxlZCB0byBhbGxvY2F0ZSBzZW1hcGhvcmUgYm8uIERpc2FibGlu ZyBzZW1hcGhvcmVzXG4iKTsKIAkJCQlpOTE1LnNlbWFwaG9yZXMgPSAwOwogCQkJfSBlbHNlIHsK QEAgLTI4OTAsOSArMjg5MSw5IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCS8qIFdvcmthcm91bmQgYmF0Y2hidWZmZXIgdG8gY29t YmF0IENTIHRsYiBidWcuICovCiAJaWYgKEhBU19CUk9LRU5fQ1NfVExCKGRldikpIHsKIAkJb2Jq ID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYsIEk4MzBfV0FfU0laRSk7Ci0JCWlmIChvYmog PT0gTlVMTCkgeworCQlpZiAoSVNfRVJSKG9iaikpIHsKIAkJCURSTV9FUlJPUigiRmFpbGVkIHRv IGFsbG9jYXRlIGJhdGNoIGJvXG4iKTsKLQkJCXJldHVybiAtRU5PTUVNOworCQkJcmV0dXJuIFBU Ul9FUlIob2JqKTsKIAkJfQogCiAJCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihvYmosIDAs IDApOwotLSAKMi40LjExCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK