From: Dave Gordon Subject: [PATCH] drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create() Date: Fri, 22 Apr 2016 19:14:32 +0100 Message-ID: <1461348872-4702-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 31B516EF60 for ; Fri, 22 Apr 2016 18:14:41 +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 QmVjYXVzZSBoYXZpbmcgYm90aCBpOTE1X2dlbV9vYmplY3RfYWxsb2MoKSBhbmQgaTkxNV9nZW1f YWxsb2Nfb2JqZWN0KCkKKHdpdGggZGlmZmVyZW50IHJldHVybiBjb252ZW50aW9ucykgaXMganVz dCB0b28gY29uZnVzaW5nIQoKKGk5MTVfZ2VtX29iamVjdF9hbGxvYygpIGlzIHRoZSBsb3ctbGV2 ZWwgbWVtb3J5IGFsbG9jYXRvciwgYW5kIHJlbWFpbnMKdW5jaGFuZ2VkLCB3aGVyZWFzIGk5MTVf Z2VtX2FsbG9jX29iamVjdCgpIGlzIGEgY29uc3RydWN0b3IgdGhhdCBBTFNPCmluaXRpYWxpc2Vz IHRoZSBuZXdseS1hbGxvY2F0ZWQgb2JqZWN0LikKClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9u IDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCAgICAgICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYyAgICAgICAgICAgICAgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2JhdGNoX3Bvb2wuYyAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYyAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Jl bmRlcl9zdGF0ZS5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYyAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAg ICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgICAgICAg ICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICAg IHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jICAgICAgICAg fCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jICAgICAgfCAx MCArKysrKy0tLS0tCiAxMSBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAxOCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA2ZjFlMGYxLi5kNjkxNzBiIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI5MjMsNyArMjkyMyw3IEBAIHZvaWQgKmk5MTVf Z2VtX29iamVjdF9hbGxvYyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaTkxNV9nZW1f b2JqZWN0X2ZyZWUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaik7CiB2b2lkIGk5MTVf Z2VtX29iamVjdF9pbml0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkgY29u c3Qgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Rfb3BzICpvcHMpOwotc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKmk5MTVfZ2VtX2FsbG9jX29iamVjdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAorc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmk5MTVfZ2VtX29iamVjdF9jcmVhdGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkJCSAgc2l6ZV90IHNpemUpOwogc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKmk5MTVfZ2VtX29iamVjdF9jcmVhdGVfZnJvbV9kYXRhKAogCQlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBjb25zdCB2b2lkICpkYXRhLCBzaXplX3Qgc2l6ZSk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYwppbmRleCAyNjFhM2VmLi4xZGQ1NTIzIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKQEAgLTM4MSw3ICszODEsNyBAQCB2b2lkIGk5MTVfZ2VtX29iamVjdF9mcmVlKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJCXJldHVybiAtRUlOVkFMOwogCiAJLyog QWxsb2NhdGUgdGhlIG5ldyBvYmplY3QgKi8KLQlvYmogPSBpOTE1X2dlbV9hbGxvY19vYmplY3Qo ZGV2LCBzaXplKTsKKwlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGRldiwgc2l6ZSk7CiAJ aWYgKG9iaiA9PSBOVUxMKQogCQlyZXR1cm4gLUVOT01FTTsKIApAQCAtNDQ5Miw3ICs0NDkyLDcg QEAgdm9pZCBpOTE1X2dlbV9vYmplY3RfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqLAogCS5wdXRfcGFnZXMgPSBpOTE1X2dlbV9vYmplY3RfcHV0X3BhZ2VzX2d0dCwKIH07CiAK LXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICppOTE1X2dlbV9hbGxvY19vYmplY3Qoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKK3N0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICppOTE1X2dlbV9v YmplY3RfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJCQkgIHNpemVfdCBzaXpl KQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CkBAIC01MzYxLDcgKzUzNjEs NyBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqCiAJc2l6ZV90IGJ5dGVzOwogCWludCBy ZXQ7CiAKLQlvYmogPSBpOTE1X2dlbV9hbGxvY19vYmplY3QoZGV2LCByb3VuZF91cChzaXplLCBQ QUdFX1NJWkUpKTsKKwlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGRldiwgcm91bmRfdXAo c2l6ZSwgUEFHRV9TSVpFKSk7CiAJaWYgKElTX0VSUl9PUl9OVUxMKG9iaikpCiAJCXJldHVybiBv Ymo7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2JhdGNoX3Bv b2wuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2JhdGNoX3Bvb2wuYwppbmRleCA3 YmYyZjNmLi4xYmM0NmJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9iYXRjaF9wb29sLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fYmF0Y2hf cG9vbC5jCkBAIC0xMzQsNyArMTM0LDcgQEAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKgog CWlmIChvYmogPT0gTlVMTCkgewogCQlpbnQgcmV0OwogCi0JCW9iaiA9IGk5MTVfZ2VtX2FsbG9j X29iamVjdChwb29sLT5kZXYsIHNpemUpOworCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRl KHBvb2wtPmRldiwgc2l6ZSk7CiAJCWlmIChvYmogPT0gTlVMTCkKIAkJCXJldHVybiBFUlJfUFRS KC1FTk9NRU0pOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j b250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXgg ZTVhY2MzOS4uNGUxMmJhZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQu YwpAQCAtMTc4LDcgKzE3OCw3IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICoKIAlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCWludCByZXQ7CiAKLQlvYmogPSBpOTE1X2dl bV9hbGxvY19vYmplY3QoZGV2LCBzaXplKTsKKwlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRl KGRldiwgc2l6ZSk7CiAJaWYgKG9iaiA9PSBOVUxMKQogCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVN KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0 YXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwppbmRl eCA3MTYxMWJmLi42NWM5ZGFkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9yZW5kZXJfc3RhdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9y ZW5kZXJfc3RhdGUuYwpAQCAtNTcsNyArNTcsNyBAQCBzdGF0aWMgaW50IHJlbmRlcl9zdGF0ZV9p bml0KHN0cnVjdCByZW5kZXJfc3RhdGUgKnNvLCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlm IChzby0+cm9kYXRhLT5iYXRjaF9pdGVtcyAqIDQgPiA0MDk2KQogCQlyZXR1cm4gLUVJTlZBTDsK IAotCXNvLT5vYmogPSBpOTE1X2dlbV9hbGxvY19vYmplY3QoZGV2LCA0MDk2KTsKKwlzby0+b2Jq ID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYsIDQwOTYpOwogCWlmIChzby0+b2JqID09IE5V TEwpCiAJCXJldHVybiAtRU5PTUVNOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19z dWJtaXNzaW9uLmMKaW5kZXggZDQwYzEzZi4uNzJkNjY2NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtNTg3LDcgKzU4Nyw3IEBAIHN0YXRpYyBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZ2VtX2FsbG9jYXRlX2d1Y19vYmooc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAKLQlvYmogPSBp OTE1X2dlbV9hbGxvY19vYmplY3QoZGV2LCBzaXplKTsKKwlvYmogPSBpOTE1X2dlbV9vYmplY3Rf Y3JlYXRlKGRldiwgc2l6ZSk7CiAJaWYgKCFvYmopCiAJCXJldHVybiBOVUxMOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZmY2MDI0MS4uYjdjYjYzMiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTAzMTgsNyArMTAzMTgsNyBAQCBzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyICoKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCXN0 cnVjdCBkcm1fbW9kZV9mYl9jbWQyIG1vZGVfY21kID0geyAwIH07CiAKLQlvYmogPSBpOTE1X2dl bV9hbGxvY19vYmplY3QoZGV2LAorCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZGV2LAog CQkJCSAgICBpbnRlbF9mcmFtZWJ1ZmZlcl9zaXplX2Zvcl9tb2RlKG1vZGUsIGJwcCkpOwogCWlm IChvYmogPT0gTlVMTCkKIAkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZmJkZXYuYwppbmRleCA3OWFjMjAyLi5hZjU2MTU0IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2ZiZGV2LmMKQEAgLTE1MCw3ICsxNTAsNyBAQCBzdGF0aWMgaW50IGludGVsZmJfYWxsb2Mo c3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAlpZiAoc2l6ZSAqIDIgPCBnZ3R0LT5zdG9s ZW5fdXNhYmxlX3NpemUpCiAJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGRl diwgc2l6ZSk7CiAJaWYgKG9iaiA9PSBOVUxMKQotCQlvYmogPSBpOTE1X2dlbV9hbGxvY19vYmpl Y3QoZGV2LCBzaXplKTsKKwkJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYsIHNpemUp OwogCWlmICghb2JqKSB7CiAJCURSTV9FUlJPUigiZmFpbGVkIHRvIGFsbG9jYXRlIGZyYW1lYnVm ZmVyXG4iKTsKIAkJcmV0ID0gLUVOT01FTTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXgg NjE3OWI1OS4uMmI3ZTZiYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTE0NzIsNyAr MTQ3Miw3IEBAIHN0YXRpYyBpbnQgbHJjX3NldHVwX3dhX2N0eF9vYmooc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lLCB1MzIgc2l6ZSkKIHsKIAlpbnQgcmV0OwogCi0JZW5naW5lLT53YV9j dHgub2JqID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGVuZ2luZS0+ZGV2LAorCWVuZ2luZS0+d2Ff Y3R4Lm9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZW5naW5lLT5kZXYsCiAJCQkJCQkgICBQ QUdFX0FMSUdOKHNpemUpKTsKIAlpZiAoIWVuZ2luZS0+d2FfY3R4Lm9iaikgewogCQlEUk1fREVC VUdfRFJJVkVSKCJhbGxvYyBMUkMgV0EgY3R4IGJhY2tpbmcgb2JqIGZhaWxlZC5cbiIpOwpAQCAt MjY2NSw3ICsyNjY1LDcgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfYWxsb2Moc3Ry dWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkvKiBPbmUgZXh0cmEgcGFnZSBhcyB0aGUgc2hhcmlu ZyBkYXRhIGJldHdlZW4gZHJpdmVyIGFuZCBHdUMgKi8KIAljb250ZXh0X3NpemUgKz0gUEFHRV9T SVpFICogTFJDX1BQSFdTUF9QTjsKIAotCWN0eF9vYmogPSBpOTE1X2dlbV9hbGxvY19vYmplY3Qo ZGV2LCBjb250ZXh0X3NpemUpOworCWN0eF9vYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGRl diwgY29udGV4dF9zaXplKTsKIAlpZiAoIWN0eF9vYmopIHsKIAkJRFJNX0RFQlVHX0RSSVZFUigi QWxsb2MgTFJDIGJhY2tpbmcgb2JqIGZhaWxlZC5cbiIpOwogCQlyZXR1cm4gLUVOT01FTTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYwppbmRleCBiY2MzYjZhLi41OTdmYmNkIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCkBAIC0xMzk2LDcgKzEzOTYsNyBAQCB2b2lk IGludGVsX3NldHVwX292ZXJsYXkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoIU9WRVJM QVlfTkVFRFNfUEhZU0lDQUwoZGV2KSkKIAkJcmVnX2JvID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0 ZV9zdG9sZW4oZGV2LCBQQUdFX1NJWkUpOwogCWlmIChyZWdfYm8gPT0gTlVMTCkKLQkJcmVnX2Jv ID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGRldiwgUEFHRV9TSVpFKTsKKwkJcmVnX2JvID0gaTkx NV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYsIFBBR0VfU0laRSk7CiAJaWYgKHJlZ19ibyA9PSBOVUxM KQogCQlnb3RvIG91dF9mcmVlOwogCW92ZXJsYXktPnJlZ19ibyA9IHJlZ19ibzsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCAyNDUzODZlLi44OTI3NTdlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC02NzEsNyArNjcxLDcgQEAg c3RhdGljIGludCBpbml0X3JpbmdfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKIAogCVdBUk5fT04oZW5naW5lLT5zY3JhdGNoLm9iaik7CiAKLQllbmdpbmUtPnNjcmF0Y2gu b2JqID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KGVuZ2luZS0+ZGV2LCA0MDk2KTsKKwllbmdpbmUt PnNjcmF0Y2gub2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShlbmdpbmUtPmRldiwgNDA5Nik7 CiAJaWYgKGVuZ2luZS0+c2NyYXRjaC5vYmogPT0gTlVMTCkgewogCQlEUk1fRVJST1IoIkZhaWxl ZCB0byBhbGxvY2F0ZSBzZXFubyBwYWdlXG4iKTsKIAkJcmV0ID0gLUVOT01FTTsKQEAgLTIwMjIs NyArMjAyMiw3IEBAIHN0YXRpYyBpbnQgaW5pdF9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpCiAJCXVuc2lnbmVkIGZsYWdzOwogCQlpbnQgcmV0OwogCi0JCW9iaiA9 IGk5MTVfZ2VtX2FsbG9jX29iamVjdChlbmdpbmUtPmRldiwgNDA5Nik7CisJCW9iaiA9IGk5MTVf Z2VtX29iamVjdF9jcmVhdGUoZW5naW5lLT5kZXYsIDQwOTYpOwogCQlpZiAob2JqID09IE5VTEwp IHsKIAkJCURSTV9FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRlIHN0YXR1cyBwYWdlXG4iKTsKIAkJ CXJldHVybiAtRU5PTUVNOwpAQCAtMjE2Myw3ICsyMTYzLDcgQEAgc3RhdGljIGludCBpbnRlbF9h bGxvY19yaW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmICghSEFTX0xM QyhkZXYpKQogCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbihkZXYsIHJpbmdi dWYtPnNpemUpOwogCWlmIChvYmogPT0gTlVMTCkKLQkJb2JqID0gaTkxNV9nZW1fYWxsb2Nfb2Jq ZWN0KGRldiwgcmluZ2J1Zi0+c2l6ZSk7CisJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUo ZGV2LCByaW5nYnVmLT5zaXplKTsKIAlpZiAob2JqID09IE5VTEwpCiAJCXJldHVybiAtRU5PTUVN OwogCkBAIC0yNzc2LDcgKzI3NzYsNyBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZm ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+ PSA4KSB7CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldikpIHsKLQkJCW9iaiA9 IGk5MTVfZ2VtX2FsbG9jX29iamVjdChkZXYsIDQwOTYpOworCQkJb2JqID0gaTkxNV9nZW1fb2Jq ZWN0X2NyZWF0ZShkZXYsIDQwOTYpOwogCQkJaWYgKG9iaiA9PSBOVUxMKSB7CiAJCQkJRFJNX0VS Uk9SKCJGYWlsZWQgdG8gYWxsb2NhdGUgc2VtYXBob3JlIGJvLiBEaXNhYmxpbmcgc2VtYXBob3Jl c1xuIik7CiAJCQkJaTkxNS5zZW1hcGhvcmVzID0gMDsKQEAgLTI4ODUsNyArMjg4NSw3IEBAIGlu dCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CiAJLyogV29ya2Fyb3VuZCBiYXRjaGJ1ZmZlciB0byBjb21iYXQgQ1MgdGxiIGJ1Zy4gKi8KIAlp ZiAoSEFTX0JST0tFTl9DU19UTEIoZGV2KSkgewotCQlvYmogPSBpOTE1X2dlbV9hbGxvY19vYmpl Y3QoZGV2LCBJODMwX1dBX1NJWkUpOworCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGRl diwgSTgzMF9XQV9TSVpFKTsKIAkJaWYgKG9iaiA9PSBOVUxMKSB7CiAJCQlEUk1fRVJST1IoIkZh aWxlZCB0byBhbGxvY2F0ZSBiYXRjaCBib1xuIik7CiAJCQlyZXR1cm4gLUVOT01FTTsKLS0gCjEu OS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK