From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 16/62] drm/i915: Wrap drm_gem_object_lookup in i915_gem_object_lookup Date: Fri, 3 Jun 2016 17:36:41 +0100 Message-ID: <1464971847-15809-17-git-send-email-chris@chris-wilson.co.uk> References: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA99C6E17A for ; Fri, 3 Jun 2016 16:37:51 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id n184so618558wmn.1 for ; Fri, 03 Jun 2016 09:37:51 -0700 (PDT) In-Reply-To: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk> 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 Rm9yIHN5bW1ldHJ5IHdpdGggYSBmb3J0aGNvbWluZyBpOTE1X2dlbV9vYmplY3RfZ2V0KCkgYW5k Cmk5MTVfZ2VtX29iamVjdF9wdSgpLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCAgICAgICAgfCAxOCArKysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyAgICAgICAgfCA1NiArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcuYyB8ICA4ICsrLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICB8ICA0ICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfb3ZlcmxheS5jICAgfCAgNSArKy0KIDUgZmlsZXMgY2hhbmdlZCwgNTMgaW5zZXJ0aW9u cygrKSwgMzggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNDhkODli MTgxMjQ2Li4yNzA5NjAwNGRiN2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjI2OCw3 ICsyMjY4LDIzIEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0IHsKIAkJfSB1c2VycHRyOwog CX07CiB9OwotI2RlZmluZSB0b19pbnRlbF9ibyh4KSBjb250YWluZXJfb2YoeCwgc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QsIGJhc2UpCisKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKgordG9faW50ZWxfYm8oc3RydWN0IGRybV9nZW1fb2JqZWN0ICpnZW0pCit7 CisJLyogQXNzZXJ0IHRoYXQgdG9faW50ZWxfYm8oTlVMTCkgPT0gTlVMTCAqLworCUJVSUxEX0JV R19PTihvZmZzZXRvZihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCwgYmFzZSkpOworCisJcmV0 dXJuIGNvbnRhaW5lcl9vZihnZW0sIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0LCBiYXNlKTsK K30KKworc3RhdGljIGlubGluZSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqCitpOTE1X2dl bV9vYmplY3RfbG9va3VwKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwgdTMyIGhhbmRsZSkKK3sKKwly ZXR1cm4gdG9faW50ZWxfYm8oZHJtX2dlbV9vYmplY3RfbG9va3VwKGZpbGUsIGhhbmRsZSkpOwor fQorX19kZXByZWNhdGVkIGV4dGVybiBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKgorZHJtX2dlbV9v YmplY3RfbG9va3VwKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwgdTMyIGhhbmRsZSk7CiAKIC8qCiAg KiBPcHRpbWlzZWQgU0dMIGl0ZXJhdG9yIGZvciBHRU0gb2JqZWN0cwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMKaW5kZXggNWYyMzJmYjFhMmE0Li44MzdiMTQwMmM3OTggMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYwpAQCAtNjk1LDggKzY5NSw4IEBAIGk5MTVfZ2VtX3ByZWFkX2lvY3RsKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAot CW9iaiA9IHRvX2ludGVsX2JvKGRybV9nZW1fb2JqZWN0X2xvb2t1cChmaWxlLCBhcmdzLT5oYW5k bGUpKTsKLQlpZiAoJm9iai0+YmFzZSA9PSBOVUxMKSB7CisJb2JqID0gaTkxNV9nZW1fb2JqZWN0 X2xvb2t1cChmaWxlLCBhcmdzLT5oYW5kbGUpOworCWlmICghb2JqKSB7CiAJCXJldCA9IC1FTk9F TlQ7CiAJCWdvdG8gdW5sb2NrOwogCX0KQEAgLTEwNDksOCArMTA0OSw4IEBAIGk5MTVfZ2VtX3B3 cml0ZV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCWlmIChyZXQp CiAJCWdvdG8gcHV0X3JwbTsKIAotCW9iaiA9IHRvX2ludGVsX2JvKGRybV9nZW1fb2JqZWN0X2xv b2t1cChmaWxlLCBhcmdzLT5oYW5kbGUpKTsKLQlpZiAoJm9iai0+YmFzZSA9PSBOVUxMKSB7CisJ b2JqID0gaTkxNV9nZW1fb2JqZWN0X2xvb2t1cChmaWxlLCBhcmdzLT5oYW5kbGUpOworCWlmICgh b2JqKSB7CiAJCXJldCA9IC1FTk9FTlQ7CiAJCWdvdG8gdW5sb2NrOwogCX0KQEAgLTEyNTMsOCAr MTI1Myw4IEBAIGk5MTVfZ2VtX3NldF9kb21haW5faW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0Jb2JqID0gdG9faW50 ZWxfYm8oZHJtX2dlbV9vYmplY3RfbG9va3VwKGZpbGUsIGFyZ3MtPmhhbmRsZSkpOwotCWlmICgm b2JqLT5iYXNlID09IE5VTEwpIHsKKwlvYmogPSBpOTE1X2dlbV9vYmplY3RfbG9va3VwKGZpbGUs IGFyZ3MtPmhhbmRsZSk7CisJaWYgKCFvYmopIHsKIAkJcmV0ID0gLUVOT0VOVDsKIAkJZ290byB1 bmxvY2s7CiAJfQpAQCAtMTMwMSw4ICsxMzAxLDggQEAgaTkxNV9nZW1fc3dfZmluaXNoX2lvY3Rs KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJaWYgKHJldCkKIAkJcmV0dXJu IHJldDsKIAotCW9iaiA9IHRvX2ludGVsX2JvKGRybV9nZW1fb2JqZWN0X2xvb2t1cChmaWxlLCBh cmdzLT5oYW5kbGUpKTsKLQlpZiAoJm9iai0+YmFzZSA9PSBOVUxMKSB7CisJb2JqID0gaTkxNV9n ZW1fb2JqZWN0X2xvb2t1cChmaWxlLCBhcmdzLT5oYW5kbGUpOworCWlmICghb2JqKSB7CiAJCXJl dCA9IC1FTk9FTlQ7CiAJCWdvdG8gdW5sb2NrOwogCX0KQEAgLTEzMzksNyArMTMzOSw3IEBAIGk5 MTVfZ2VtX21tYXBfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJ ICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX21tYXAg KmFyZ3MgPSBkYXRhOwotCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqOworCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJdW5zaWduZWQgbG9uZyBhZGRyOwogCiAJaWYgKGFyZ3Mt PmZsYWdzICYgfihJOTE1X01NQVBfV0MpKQpAQCAtMTM0OCwxOSArMTM0OCwxOSBAQCBpOTE1X2dl bV9tbWFwX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJaWYgKGFy Z3MtPmZsYWdzICYgSTkxNV9NTUFQX1dDICYmICFib290X2NwdV9oYXMoWDg2X0ZFQVRVUkVfUEFU KSkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKLQlvYmogPSBkcm1fZ2VtX29iamVjdF9sb29rdXAoZmls ZSwgYXJncy0+aGFuZGxlKTsKLQlpZiAob2JqID09IE5VTEwpCisJb2JqID0gaTkxNV9nZW1fb2Jq ZWN0X2xvb2t1cChmaWxlLCBhcmdzLT5oYW5kbGUpOworCWlmICghb2JqKQogCQlyZXR1cm4gLUVO T0VOVDsKIAogCS8qIHByaW1lIG9iamVjdHMgaGF2ZSBubyBiYWNraW5nIGZpbHAgdG8gR0VNIG1t YXAKIAkgKiBwYWdlcyBmcm9tLgogCSAqLwotCWlmICghb2JqLT5maWxwKSB7Ci0JCWRybV9nZW1f b2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKG9iaik7CisJaWYgKCFvYmotPmJhc2UuZmlscCkg eworCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91bmxvY2tlZCgmb2JqLT5iYXNlKTsKIAkJ cmV0dXJuIC1FSU5WQUw7CiAJfQogCi0JYWRkciA9IHZtX21tYXAob2JqLT5maWxwLCAwLCBhcmdz LT5zaXplLAorCWFkZHIgPSB2bV9tbWFwKG9iai0+YmFzZS5maWxwLCAwLCBhcmdzLT5zaXplLAog CQkgICAgICAgUFJPVF9SRUFEIHwgUFJPVF9XUklURSwgTUFQX1NIQVJFRCwKIAkJICAgICAgIGFy Z3MtPm9mZnNldCk7CiAJaWYgKGFyZ3MtPmZsYWdzICYgSTkxNV9NTUFQX1dDKSB7CkBAIC0xMzY4 LDcgKzEzNjgsNyBAQCBpOTE1X2dlbV9tbWFwX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHZvaWQgKmRhdGEsCiAJCXN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hOwogCiAJCWlmIChkb3du X3dyaXRlX2tpbGxhYmxlKCZtbS0+bW1hcF9zZW0pKSB7Ci0JCQlkcm1fZ2VtX29iamVjdF91bnJl ZmVyZW5jZV91bmxvY2tlZChvYmopOworCQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5s b2NrZWQoJm9iai0+YmFzZSk7CiAJCQlyZXR1cm4gLUVJTlRSOwogCQl9CiAJCXZtYSA9IGZpbmRf dm1hKG1tLCBhZGRyKTsKQEAgLTEzNzksNyArMTM3OSw3IEBAIGk5MTVfZ2VtX21tYXBfaW9jdGwo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCWFkZHIgPSAtRU5PTUVNOwog CQl1cF93cml0ZSgmbW0tPm1tYXBfc2VtKTsKIAl9Ci0JZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVu Y2VfdW5sb2NrZWQob2JqKTsKKwlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91bmxvY2tlZCgm b2JqLT5iYXNlKTsKIAlpZiAoSVNfRVJSKCh2b2lkICopYWRkcikpCiAJCXJldHVybiBhZGRyOwog CkBAIC0xNzE0LDggKzE3MTQsOCBAQCBpOTE1X2dlbV9tbWFwX2d0dChzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGUsCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCW9iaiA9IHRvX2ludGVsX2JvKGRy bV9nZW1fb2JqZWN0X2xvb2t1cChmaWxlLCBoYW5kbGUpKTsKLQlpZiAoJm9iai0+YmFzZSA9PSBO VUxMKSB7CisJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2xvb2t1cChmaWxlLCBoYW5kbGUpOworCWlm ICghb2JqKSB7CiAJCXJldCA9IC1FTk9FTlQ7CiAJCWdvdG8gdW5sb2NrOwogCX0KQEAgLTI1MDQs OCArMjUwNCw4IEBAIGk5MTVfZ2VtX3dhaXRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg dm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCWlmIChyZXQpCiAJCXJldHVybiBy ZXQ7CiAKLQlvYmogPSB0b19pbnRlbF9ibyhkcm1fZ2VtX29iamVjdF9sb29rdXAoZmlsZSwgYXJn cy0+Ym9faGFuZGxlKSk7Ci0JaWYgKCZvYmotPmJhc2UgPT0gTlVMTCkgeworCW9iaiA9IGk5MTVf Z2VtX29iamVjdF9sb29rdXAoZmlsZSwgYXJncy0+Ym9faGFuZGxlKTsKKwlpZiAoIW9iaikgewog CQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAkJcmV0dXJuIC1FTk9FTlQ7CiAJ fQpAQCAtMzMwMSw4ICszMzAxLDggQEAgaW50IGk5MTVfZ2VtX2dldF9jYWNoaW5nX2lvY3RsKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJc3RydWN0IGRybV9pOTE1X2dlbV9j YWNoaW5nICphcmdzID0gZGF0YTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwog Ci0Jb2JqID0gdG9faW50ZWxfYm8oZHJtX2dlbV9vYmplY3RfbG9va3VwKGZpbGUsIGFyZ3MtPmhh bmRsZSkpOwotCWlmICgmb2JqLT5iYXNlID09IE5VTEwpCisJb2JqID0gaTkxNV9nZW1fb2JqZWN0 X2xvb2t1cChmaWxlLCBhcmdzLT5oYW5kbGUpOworCWlmICghb2JqKQogCQlyZXR1cm4gLUVOT0VO VDsKIAogCXN3aXRjaCAob2JqLT5jYWNoZV9sZXZlbCkgewpAQCAtMzM2Miw4ICszMzYyLDggQEAg aW50IGk5MTVfZ2VtX3NldF9jYWNoaW5nX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZv aWQgKmRhdGEsCiAJaWYgKHJldCkKIAkJZ290byBycG1fcHV0OwogCi0Jb2JqID0gdG9faW50ZWxf Ym8oZHJtX2dlbV9vYmplY3RfbG9va3VwKGZpbGUsIGFyZ3MtPmhhbmRsZSkpOwotCWlmICgmb2Jq LT5iYXNlID09IE5VTEwpIHsKKwlvYmogPSBpOTE1X2dlbV9vYmplY3RfbG9va3VwKGZpbGUsIGFy Z3MtPmhhbmRsZSk7CisJaWYgKCFvYmopIHsKIAkJcmV0ID0gLUVOT0VOVDsKIAkJZ290byB1bmxv Y2s7CiAJfQpAQCAtMzcyOSw4ICszNzI5LDggQEAgaTkxNV9nZW1fYnVzeV9pb2N0bChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAK LQlvYmogPSB0b19pbnRlbF9ibyhkcm1fZ2VtX29iamVjdF9sb29rdXAoZmlsZSwgYXJncy0+aGFu ZGxlKSk7Ci0JaWYgKCZvYmotPmJhc2UgPT0gTlVMTCkgeworCW9iaiA9IGk5MTVfZ2VtX29iamVj dF9sb29rdXAoZmlsZSwgYXJncy0+aGFuZGxlKTsKKwlpZiAoIW9iaikgewogCQlyZXQgPSAtRU5P RU5UOwogCQlnb3RvIHVubG9jazsKIAl9CkBAIC0zNzk0LDggKzM3OTQsOCBAQCBpOTE1X2dlbV9t YWR2aXNlX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJaWYgKHJl dCkKIAkJcmV0dXJuIHJldDsKIAotCW9iaiA9IHRvX2ludGVsX2JvKGRybV9nZW1fb2JqZWN0X2xv b2t1cChmaWxlX3ByaXYsIGFyZ3MtPmhhbmRsZSkpOwotCWlmICgmb2JqLT5iYXNlID09IE5VTEwp IHsKKwlvYmogPSBpOTE1X2dlbV9vYmplY3RfbG9va3VwKGZpbGVfcHJpdiwgYXJncy0+aGFuZGxl KTsKKwlpZiAoIW9iaikgewogCQlyZXQgPSAtRU5PRU5UOwogCQlnb3RvIHVubG9jazsKIAl9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3RpbGluZy5jCmluZGV4IGE2ZWI1YzQ3YTQ5Yy4uZGUy YmE2YmY5NWYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxp bmcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcuYwpAQCAtMTY2 LDggKzE2Niw4IEBAIGk5MTVfZ2VtX3NldF90aWxpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg dm9pZCAqZGF0YSwKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCWludCByZXQg PSAwOwogCi0Jb2JqID0gdG9faW50ZWxfYm8oZHJtX2dlbV9vYmplY3RfbG9va3VwKGZpbGUsIGFy Z3MtPmhhbmRsZSkpOwotCWlmICgmb2JqLT5iYXNlID09IE5VTEwpCisJb2JqID0gaTkxNV9nZW1f b2JqZWN0X2xvb2t1cChmaWxlLCBhcmdzLT5oYW5kbGUpOworCWlmICghb2JqKQogCQlyZXR1cm4g LUVOT0VOVDsKIAogCWlmICghaTkxNV90aWxpbmdfb2soZGV2LApAQCAtMjk3LDggKzI5Nyw4IEBA IGk5MTVfZ2VtX2dldF90aWxpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAKLQlvYmogPSB0b19pbnRlbF9ibyhk cm1fZ2VtX29iamVjdF9sb29rdXAoZmlsZSwgYXJncy0+aGFuZGxlKSk7Ci0JaWYgKCZvYmotPmJh c2UgPT0gTlVMTCkKKwlvYmogPSBpOTE1X2dlbV9vYmplY3RfbG9va3VwKGZpbGUsIGFyZ3MtPmhh bmRsZSk7CisJaWYgKCFvYmopCiAJCXJldHVybiAtRU5PRU5UOwogCiAJbXV0ZXhfbG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDli MjU3MTI2ZmEyMi4uYWUzNWQ1YmZlMWE5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCkBAIC0xNTAwNyw4ICsxNTAwNyw4IEBAIGludGVsX3VzZXJfZnJhbWVidWZmZXJfY3JlYXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i ajsKIAlzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiBtb2RlX2NtZCA9ICp1c2VyX21vZGVfY21kOwog Ci0Jb2JqID0gdG9faW50ZWxfYm8oZHJtX2dlbV9vYmplY3RfbG9va3VwKGZpbHAsIG1vZGVfY21k LmhhbmRsZXNbMF0pKTsKLQlpZiAoJm9iai0+YmFzZSA9PSBOVUxMKQorCW9iaiA9IGk5MTVfZ2Vt X29iamVjdF9sb29rdXAoZmlscCwgbW9kZV9jbWQuaGFuZGxlc1swXSk7CisJaWYgKCFvYmopCiAJ CXJldHVybiBFUlJfUFRSKC1FTk9FTlQpOwogCiAJZmIgPSBpbnRlbF9mcmFtZWJ1ZmZlcl9jcmVh dGUoZGV2LCAmbW9kZV9jbWQsIG9iaik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9vdmVybGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMK aW5kZXggZWI5M2Y5MGJiNzRkLi4yZGM5YmRlNzE0ZjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9vdmVybGF5LmMKQEAgLTExMjEsOSArMTEyMSw4IEBAIGludCBpbnRlbF9vdmVybGF5X3B1dF9p bWFnZV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCX0KIAljcnRj ID0gdG9faW50ZWxfY3J0Yyhkcm1tb2RlX2NydGMpOwogCi0JbmV3X2JvID0gdG9faW50ZWxfYm8o ZHJtX2dlbV9vYmplY3RfbG9va3VwKGZpbGVfcHJpdiwKLQkJCQkJCSAgIHB1dF9pbWFnZV9yZWMt PmJvX2hhbmRsZSkpOwotCWlmICgmbmV3X2JvLT5iYXNlID09IE5VTEwpIHsKKwluZXdfYm8gPSBp OTE1X2dlbV9vYmplY3RfbG9va3VwKGZpbGVfcHJpdiwgcHV0X2ltYWdlX3JlYy0+Ym9faGFuZGxl KTsKKwlpZiAoIW5ld19ibykgewogCQlyZXQgPSAtRU5PRU5UOwogCQlnb3RvIG91dF9mcmVlOwog CX0KLS0gCjIuOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK