From: Tvrtko Ursulin Subject: [PATCH 5/5] drm/i915: More renaming of rings to engines Date: Thu, 10 Mar 2016 14:21:08 +0000 Message-ID: <1457619668-4685-6-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1457619668-4685-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 497736E97E for ; Thu, 10 Mar 2016 14:21:56 +0000 (UTC) In-Reply-To: <1457619668-4685-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaXMgdGlt ZSB1c2luZyBvbmx5IHNlZCBhbmQgYSBmZXcgYnkgaGFuZC4KClNpZ25lZC1vZmYtYnk6IFR2cnRr byBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kbWEuYyAgICAgICAgIHwgIDQgKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oICAgICAgICAgfCAxMiArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYyAgICAgICAgIHwgNTAgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9kZWJ1Zy5jICAgfCAgMiArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgIDQgKy0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAxMiArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDYgKystLQogNyBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNl cnRpb25zKCspLCA0NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwppbmRleCAx OWY2MDViMGNkNmQuLmI4ZDBlNmU2NTUyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCkBAIC00 NDQsNyArNDQ0LDcgQEAgc3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAKIGNsZWFudXBfZ2VtOgogCW11dGV4X2xvY2soJmRldi0+c3RydWN0 X211dGV4KTsKLQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwlpOTE1X2dlbV9j bGVhbnVwX2VuZ2luZXMoZGV2KTsKIAlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoZGV2KTsKIAltdXRl eF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIGNsZWFudXBfaXJxOgpAQCAtMTI2MSw3ICsx MjYxLDcgQEAgaW50IGk5MTVfZHJpdmVyX3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CiAJaW50ZWxfZ3VjX3Vjb2RlX2ZpbmkoZGV2KTsKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9t dXRleCk7Ci0JaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJaTkxNV9nZW1fY2xl YW51cF9lbmdpbmVzKGRldik7CiAJaTkxNV9nZW1fY29udGV4dF9maW5pKGRldik7CiAJbXV0ZXhf dW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJaW50ZWxfZmJjX2NsZWFudXBfY2ZiKGRldl9w cml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGU4NDI3YjQwZTg0Ny4uZGUzNTg0ZTdm NGMyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIwMDQsOSArMjAwNCw5IEBAIHN0cnVj dCBkcm1faTkxNV9wcml2YXRlIHsKIAkJaW50ICgqZXhlY2J1Zl9zdWJtaXQpKHN0cnVjdCBpOTE1 X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMsCiAJCQkJICAgICAgc3RydWN0IGRybV9pOTE1X2dl bV9leGVjYnVmZmVyMiAqYXJncywKIAkJCQkgICAgICBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzKTsK LQkJaW50ICgqaW5pdF9yaW5ncykoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci0JCXZvaWQgKCpj bGVhbnVwX3JpbmcpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwotCQl2b2lkICgqc3Rv cF9yaW5nKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKKwkJaW50ICgqaW5pdF9lbmdp bmVzKShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKKwkJdm9pZCAoKmNsZWFudXBfZW5naW5lKShz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworCQl2b2lkICgqc3RvcF9lbmdpbmUpKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAJfSBndDsKIAogCXN0cnVjdCBpbnRlbF9j b250ZXh0ICprZXJuZWxfY29udGV4dDsKQEAgLTIxMTIsNyArMjExMiw3IEBAIHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0IHsKIAlzdHJ1Y3QgZHJtX21tX25vZGUgKnN0b2xlbjsKIAlzdHJ1Y3Qg bGlzdF9oZWFkIGdsb2JhbF9saXN0OwogCi0Jc3RydWN0IGxpc3RfaGVhZCByaW5nX2xpc3RbSTkx NV9OVU1fRU5HSU5FU107CisJc3RydWN0IGxpc3RfaGVhZCBlbmdpbmVfbGlzdFtJOTE1X05VTV9F TkdJTkVTXTsKIAkvKiogVXNlZCBpbiBleGVjYnVmIHRvIHRlbXBvcmFyaWx5IGhvbGQgYSByZWYg Ki8KIAlzdHJ1Y3QgbGlzdF9oZWFkIG9ial9leGVjX2xpbms7CiAKQEAgLTMwNzUsMTEgKzMwNzUs MTEgQEAgc3RhdGljIGlubGluZSBib29sIGk5MTVfc3RvcF9yaW5nX2FsbG93X3dhcm4oc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogdm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKIGJvb2wgaTkxNV9nZW1fY2xmbHVzaF9vYmplY3Qoc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiwgYm9vbCBmb3JjZSk7CiBpbnQgX19tdXN0X2NoZWNrIGk5 MTVfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci1pbnQgaTkxNV9nZW1faW5pdF9y aW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK2ludCBpOTE1X2dlbV9pbml0X2VuZ2luZXMo c3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2luaXRf aHcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1fbDNfcmVtYXAoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIGludCBzbGljZSk7CiB2b2lkIGk5MTVfZ2VtX2lu aXRfc3dpenpsaW5nKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotdm9pZCBpOTE1X2dlbV9jbGVh bnVwX3JpbmdidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lkIGk5MTVfZ2VtX2Ns ZWFudXBfZW5naW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hlY2sg aTkxNV9ncHVfaWRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hlY2sg aTkxNV9nZW1fc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgX19pOTE1X2Fk ZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKaW5kZXggMGFlMTkzZjliY2JlLi4zMTY1MmMxZGE3NjEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYwpAQCAtMjQxMyw3ICsyNDEzLDcgQEAgdm9pZCBpOTE1X3ZtYV9tb3ZlX3RvX2Fj dGl2ZShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKIAkJZHJtX2dlbV9vYmplY3RfcmVmZXJlbmNlKCZv YmotPmJhc2UpOwogCW9iai0+YWN0aXZlIHw9IGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSk7CiAK LQlsaXN0X21vdmVfdGFpbCgmb2JqLT5yaW5nX2xpc3RbZW5naW5lLT5pZF0sICZlbmdpbmUtPmFj dGl2ZV9saXN0KTsKKwlsaXN0X21vdmVfdGFpbCgmb2JqLT5lbmdpbmVfbGlzdFtlbmdpbmUtPmlk XSwgJmVuZ2luZS0+YWN0aXZlX2xpc3QpOwogCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZvYmot Pmxhc3RfcmVhZF9yZXFbZW5naW5lLT5pZF0sIHJlcSk7CiAKIAlsaXN0X21vdmVfdGFpbCgmdm1h LT52bV9saW5rLCAmdm1hLT52bS0+YWN0aXZlX2xpc3QpOwpAQCAtMjQzNyw3ICsyNDM3LDcgQEAg aTkxNV9nZW1fb2JqZWN0X3JldGlyZV9fcmVhZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqLCBpbnQgcmluZykKIAlSUV9CVUdfT04ob2JqLT5sYXN0X3JlYWRfcmVxW3JpbmddID09IE5V TEwpOwogCVJRX0JVR19PTighKG9iai0+YWN0aXZlICYgKDEgPDwgcmluZykpKTsKIAotCWxpc3Rf ZGVsX2luaXQoJm9iai0+cmluZ19saXN0W3JpbmddKTsKKwlsaXN0X2RlbF9pbml0KCZvYmotPmVu Z2luZV9saXN0W3JpbmddKTsKIAlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmb2JqLT5sYXN0X3Jl YWRfcmVxW3JpbmddLCBOVUxMKTsKIAogCWlmIChvYmotPmxhc3Rfd3JpdGVfcmVxICYmIG9iai0+ bGFzdF93cml0ZV9yZXEtPmVuZ2luZS0+aWQgPT0gcmluZykKQEAgLTI4MzAsNyArMjgzMCw3IEBA IHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3Jlc2V0X2VuZ2luZV9jbGVhbnVwKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAogCQlvYmogPSBsaXN0X2ZpcnN0X2VudHJ5KCZlbmdpbmUt PmFjdGl2ZV9saXN0LAogCQkJCSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCwKLQkJ CQkgICAgICAgcmluZ19saXN0W2VuZ2luZS0+aWRdKTsKKwkJCQkgICAgICAgZW5naW5lX2xpc3Rb ZW5naW5lLT5pZF0pOwogCiAJCWk5MTVfZ2VtX29iamVjdF9yZXRpcmVfX3JlYWQob2JqLCBlbmdp bmUtPmlkKTsKIAl9CkBAIC0yOTQxLDcgKzI5NDEsNyBAQCBpOTE1X2dlbV9yZXRpcmVfcmVxdWVz dHNfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAKIAkJb2JqID0gbGlzdF9m aXJzdF9lbnRyeSgmZW5naW5lLT5hY3RpdmVfbGlzdCwKIAkJCQkgICAgICAgc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QsCi0JCQkJICAgICAgIHJpbmdfbGlzdFtlbmdpbmUtPmlkXSk7CisJCQkJ ICAgICAgIGVuZ2luZV9saXN0W2VuZ2luZS0+aWRdKTsKIAogCQlpZiAoIWxpc3RfZW1wdHkoJm9i ai0+bGFzdF9yZWFkX3JlcVtlbmdpbmUtPmlkXS0+bGlzdCkpCiAJCQlicmVhazsKQEAgLTQ0NDgs NyArNDQ0OCw3IEBAIHZvaWQgaTkxNV9nZW1fb2JqZWN0X2luaXQoc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaiwKIAogCUlOSVRfTElTVF9IRUFEKCZvYmotPmdsb2JhbF9saXN0KTsKIAlm b3IgKGkgPSAwOyBpIDwgSTkxNV9OVU1fRU5HSU5FUzsgaSsrKQotCQlJTklUX0xJU1RfSEVBRCgm b2JqLT5yaW5nX2xpc3RbaV0pOworCQlJTklUX0xJU1RfSEVBRCgmb2JqLT5lbmdpbmVfbGlzdFtp XSk7CiAJSU5JVF9MSVNUX0hFQUQoJm9iai0+b2JqX2V4ZWNfbGluayk7CiAJSU5JVF9MSVNUX0hF QUQoJm9iai0+dm1hX2xpc3QpOwogCUlOSVRfTElTVF9IRUFEKCZvYmotPmJhdGNoX3Bvb2xfbGlu ayk7CkBAIC00NjUzLDE0ICs0NjUzLDE0IEBAIHZvaWQgaTkxNV9nZW1fdm1hX2Rlc3Ryb3koc3Ry dWN0IGk5MTVfdm1hICp2bWEpCiB9CiAKIHN0YXRpYyB2b2lkCi1pOTE1X2dlbV9zdG9wX3Jpbmdi dWZmZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpOTE1X2dlbV9zdG9wX2VuZ2luZXMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsK IAlpbnQgaTsKIAogCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpKQotCQlkZXZf cHJpdi0+Z3Quc3RvcF9yaW5nKGVuZ2luZSk7CisJCWRldl9wcml2LT5ndC5zdG9wX2VuZ2luZShl bmdpbmUpOwogfQogCiBpbnQKQEAgLTQ2NzYsNyArNDY3Niw3IEBAIGk5MTVfZ2VtX3N1c3BlbmQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhkZXYp OwogCi0JaTkxNV9nZW1fc3RvcF9yaW5nYnVmZmVycyhkZXYpOworCWk5MTVfZ2VtX3N0b3BfZW5n aW5lcyhkZXYpOwogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCiAJY2FuY2Vs X2RlbGF5ZWRfd29ya19zeW5jKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLmhhbmdjaGVja193b3JrKTsK QEAgLTQ3NzgsNyArNDc3OCw3IEBAIHN0YXRpYyB2b2lkIGluaXRfdW51c2VkX3JpbmdzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJfQogfQogCi1pbnQgaTkxNV9nZW1faW5pdF9yaW5ncyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQoraW50IGk5MTVfZ2VtX2luaXRfZW5naW5lcyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CiAJaW50IHJldDsKQEAgLTQ4MTQsMTMgKzQ4MTQsMTMgQEAgaW50IGk5 MTVfZ2VtX2luaXRfcmluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gMDsKIAog Y2xlYW51cF92ZWJveF9yaW5nOgotCWludGVsX2NsZWFudXBfcmluZ19idWZmZXIoJmRldl9wcml2 LT5lbmdpbmVbVkVDU10pOworCWludGVsX2NsZWFudXBfZW5naW5lKCZkZXZfcHJpdi0+ZW5naW5l W1ZFQ1NdKTsKIGNsZWFudXBfYmx0X3Jpbmc6Ci0JaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZlcigm ZGV2X3ByaXYtPmVuZ2luZVtCQ1NdKTsKKwlpbnRlbF9jbGVhbnVwX2VuZ2luZSgmZGV2X3ByaXYt PmVuZ2luZVtCQ1NdKTsKIGNsZWFudXBfYnNkX3Jpbmc6Ci0JaW50ZWxfY2xlYW51cF9yaW5nX2J1 ZmZlcigmZGV2X3ByaXYtPmVuZ2luZVtWQ1NdKTsKKwlpbnRlbF9jbGVhbnVwX2VuZ2luZSgmZGV2 X3ByaXYtPmVuZ2luZVtWQ1NdKTsKIGNsZWFudXBfcmVuZGVyX3Jpbmc6Ci0JaW50ZWxfY2xlYW51 cF9yaW5nX2J1ZmZlcigmZGV2X3ByaXYtPmVuZ2luZVtSQ1NdKTsKKwlpbnRlbF9jbGVhbnVwX2Vu Z2luZSgmZGV2X3ByaXYtPmVuZ2luZVtSQ1NdKTsKIAogCXJldHVybiByZXQ7CiB9CkBAIC00OTA3 LDcgKzQ5MDcsNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ CXJlcSA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MoZW5naW5lLCBOVUxMKTsKIAkJaWYgKElTX0VS UihyZXEpKSB7CiAJCQlyZXQgPSBQVFJfRVJSKHJlcSk7Ci0JCQlpOTE1X2dlbV9jbGVhbnVwX3Jp bmdidWZmZXIoZGV2KTsKKwkJCWk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhkZXYpOwogCQkJZ290 byBvdXQ7CiAJCX0KIApAQCAtNDkyMCw3ICs0OTIwLDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAocmV0ICYmIHJldCAhPSAtRUlPKSB7CiAJCQlEUk1f RVJST1IoIlBQR1RUIGVuYWJsZSByaW5nICMlZCBmYWlsZWQgJWRcbiIsIGksIHJldCk7CiAJCQlp OTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEpOwotCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVm ZmVyKGRldik7CisJCQlpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoZGV2KTsKIAkJCWdvdG8gb3V0 OwogCQl9CiAKQEAgLTQ5MjgsNyArNDkyOCw3IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkJaWYgKHJldCAmJiByZXQgIT0gLUVJTykgewogCQkJRFJNX0VSUk9S KCJDb250ZXh0IGVuYWJsZSByaW5nICMlZCBmYWlsZWQgJWRcbiIsIGksIHJldCk7CiAJCQlpOTE1 X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEpOwotCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVy KGRldik7CisJCQlpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoZGV2KTsKIAkJCWdvdG8gb3V0Owog CQl9CiAKQEAgLTQ5NTIsMTQgKzQ5NTIsMTQgQEAgaW50IGk5MTVfZ2VtX2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAogCWlmICghaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CiAJCWRldl9w cml2LT5ndC5leGVjYnVmX3N1Ym1pdCA9IGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbjsK LQkJZGV2X3ByaXYtPmd0LmluaXRfcmluZ3MgPSBpOTE1X2dlbV9pbml0X3JpbmdzOwotCQlkZXZf cHJpdi0+Z3QuY2xlYW51cF9yaW5nID0gaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZlcjsKLQkJZGV2 X3ByaXYtPmd0LnN0b3BfcmluZyA9IGludGVsX3N0b3BfcmluZ19idWZmZXI7CisJCWRldl9wcml2 LT5ndC5pbml0X2VuZ2luZXMgPSBpOTE1X2dlbV9pbml0X2VuZ2luZXM7CisJCWRldl9wcml2LT5n dC5jbGVhbnVwX2VuZ2luZSA9IGludGVsX2NsZWFudXBfZW5naW5lOworCQlkZXZfcHJpdi0+Z3Qu c3RvcF9lbmdpbmUgPSBpbnRlbF9zdG9wX2VuZ2luZTsKIAl9IGVsc2UgewogCQlkZXZfcHJpdi0+ Z3QuZXhlY2J1Zl9zdWJtaXQgPSBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbjsKLQkJZGV2X3By aXYtPmd0LmluaXRfcmluZ3MgPSBpbnRlbF9sb2dpY2FsX3JpbmdzX2luaXQ7Ci0JCWRldl9wcml2 LT5ndC5jbGVhbnVwX3JpbmcgPSBpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cDsKLQkJZGV2X3By aXYtPmd0LnN0b3BfcmluZyA9IGludGVsX2xvZ2ljYWxfcmluZ19zdG9wOworCQlkZXZfcHJpdi0+ Z3QuaW5pdF9lbmdpbmVzID0gaW50ZWxfbG9naWNhbF9yaW5nc19pbml0OworCQlkZXZfcHJpdi0+ Z3QuY2xlYW51cF9lbmdpbmUgPSBpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cDsKKwkJZGV2X3By aXYtPmd0LnN0b3BfZW5naW5lID0gaW50ZWxfbG9naWNhbF9yaW5nX3N0b3A7CiAJfQogCiAJLyog VGhpcyBpcyBqdXN0IGEgc2VjdXJpdHkgYmxhbmtldCB0byBwbGFjYXRlIGRyYWdvbnMuCkBAIC00 OTgwLDcgKzQ5ODAsNyBAQCBpbnQgaTkxNV9nZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCWlmIChyZXQpCiAJCWdvdG8gb3V0X3VubG9jazsKIAotCXJldCA9IGRldl9wcml2LT5ndC5p bml0X3JpbmdzKGRldik7CisJcmV0ID0gZGV2X3ByaXYtPmd0LmluaXRfZW5naW5lcyhkZXYpOwog CWlmIChyZXQpCiAJCWdvdG8gb3V0X3VubG9jazsKIApAQCAtNTAwMywxNCArNTAwMywxNCBAQCBv dXRfdW5sb2NrOgogfQogCiB2b2lkCi1pOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKK2k5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWludCBpOwog CiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGkpCi0JCWRldl9wcml2LT5ndC5j bGVhbnVwX3JpbmcoZW5naW5lKTsKKwkJZGV2X3ByaXYtPmd0LmNsZWFudXBfZW5naW5lKGVuZ2lu ZSk7CiAKICAgICBpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQogICAgICAgICAgICAgLyoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RlYnVnLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9kZWJ1Zy5jCmluZGV4IGUwYmNhN2Q1YjBkNi4uZWY5Y2Q3 MDBmMDJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9kZWJ1Zy5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RlYnVnLmMKQEAgLTQ1LDcgKzQ1 LDcgQEAgaTkxNV92ZXJpZnlfbGlzdHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWZvcl9l YWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpKSB7CiAJCWxpc3RfZm9yX2VhY2hfZW50cnko b2JqLCAmZW5naW5lLT5hY3RpdmVfbGlzdCwKLQkJCQkgICAgcmluZ19saXN0W2VuZ2luZS0+aWRd KSB7CisJCQkJICAgIGVuZ2luZV9saXN0W2VuZ2luZS0+aWRdKSB7CiAJCQlpZiAob2JqLT5iYXNl LmRldiAhPSBkZXYgfHwKIAkJCSAgICAhYXRvbWljX3JlYWQoJm9iai0+YmFzZS5yZWZjb3VudC5y ZWZjb3VudCkpIHsKIAkJCQlEUk1fRVJST1IoIiVzOiBmcmVlZCBhY3RpdmUgb2JqICVwXG4iLApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBmMmNmMGUxNjgxNDEuLjgwZTIwNDM2MjQyOSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTc5NSw3ICs3OTUsNyBAQCBpbnRlbF9sb2dp Y2FsX3JpbmdfYWR2YW5jZV9hbmRfc3VibWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxdWVzdCkKIAlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9OT09QKTsKIAlp bnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZShyaW5nYnVmKTsKIAotCWlmIChpbnRlbF9yaW5nX3N0 b3BwZWQoZW5naW5lKSkKKwlpZiAoaW50ZWxfZW5naW5lX3N0b3BwZWQoZW5naW5lKSkKIAkJcmV0 dXJuIDA7CiAKIAlpZiAoZW5naW5lLT5sYXN0X2NvbnRleHQgIT0gcmVxdWVzdC0+Y3R4KSB7CkBA IC0yMjQwLDcgKzIyNDAsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfdmVib3hfcmluZ19pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAgKiBAZGV2OiBEUk0gZGV2aWNlLgogICoKICAqIFRoaXMg ZnVuY3Rpb24gaW5pdHMgdGhlIGVuZ2luZXMgZm9yIGFuIEV4ZWNsaXN0cyBzdWJtaXNzaW9uIHN0 eWxlICh0aGUgZXF1aXZhbGVudCBpbiB0aGUKLSAqIGxlZ2FjeSByaW5nYnVmZmVyIHN1Ym1pc3Np b24gd29ybGQgd291bGQgYmUgaTkxNV9nZW1faW5pdF9yaW5ncykuIEl0IGRvZXMgaXQgb25seSBm b3IKKyAqIGxlZ2FjeSByaW5nYnVmZmVyIHN1Ym1pc3Npb24gd29ybGQgd291bGQgYmUgaTkxNV9n ZW1faW5pdF9lbmdpbmVzKS4gSXQgZG9lcyBpdCBvbmx5IGZvcgogICogdGhvc2UgZW5naW5lcyB0 aGF0IGFyZSBwcmVzZW50IGluIHRoZSBoYXJkd2FyZS4KICAqCiAgKiBSZXR1cm46IG5vbi16ZXJv IGlmIHRoZSBpbml0aWFsaXphdGlvbiBmYWlsZWQuCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMKaW5kZXggZjc0OTNjNWJmZjA3Li5hODU1ODdhNmYwNDIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTU5LDcgKzU5LDcgQEAgaW50IGludGVs X3Jpbmdfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCiAJcmV0dXJuIHJp bmdidWYtPnNwYWNlOwogfQogCi1ib29sIGludGVsX3Jpbmdfc3RvcHBlZChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCitib29sIGludGVsX2VuZ2luZV9zdG9wcGVkKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBlbmdpbmUtPmRldi0+ZGV2X3ByaXZhdGU7CiAJcmV0dXJuIGRldl9wcml2LT5ncHVfZXJy b3Iuc3RvcF9yaW5ncyAmIGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSk7CkBAIC02OSw3ICs2OSw3 IEBAIHN0YXRpYyB2b2lkIF9faW50ZWxfcmluZ19hZHZhbmNlKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGVuZ2lu ZS0+YnVmZmVyOwogCXJpbmdidWYtPnRhaWwgJj0gcmluZ2J1Zi0+c2l6ZSAtIDE7Ci0JaWYgKGlu dGVsX3Jpbmdfc3RvcHBlZChlbmdpbmUpKQorCWlmIChpbnRlbF9lbmdpbmVfc3RvcHBlZChlbmdp bmUpKQogCQlyZXR1cm47CiAJZW5naW5lLT53cml0ZV90YWlsKGVuZ2luZSwgcmluZ2J1Zi0+dGFp bCk7CiB9CkBAIC0yMjc0LDExICsyMjc0LDExIEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5pdF9yaW5n X2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiAwOwogCiBlcnJvcjoKLQlp bnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKGVuZ2luZSk7CisJaW50ZWxfY2xlYW51cF9lbmdpbmUo ZW5naW5lKTsKIAlyZXR1cm4gcmV0OwogfQogCi12b2lkIGludGVsX2NsZWFudXBfcmluZ19idWZm ZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQordm9pZCBpbnRlbF9jbGVhbnVwX2Vu Z2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2OwogCkBAIC0yMjg4LDcgKzIyODgsNyBAQCB2b2lkIGludGVsX2Ns ZWFudXBfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCWRldl9w cml2ID0gdG9faTkxNShlbmdpbmUtPmRldik7CiAKIAlpZiAoZW5naW5lLT5idWZmZXIpIHsKLQkJ aW50ZWxfc3RvcF9yaW5nX2J1ZmZlcihlbmdpbmUpOworCQlpbnRlbF9zdG9wX2VuZ2luZShlbmdp bmUpOwogCQlXQVJOX09OKCFJU19HRU4yKGVuZ2luZS0+ZGV2KSAmJiAoSTkxNV9SRUFEX01PREUo ZW5naW5lKSAmIE1PREVfSURMRSkgPT0gMCk7CiAKIAkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9v YmooZW5naW5lLT5idWZmZXIpOwpAQCAtMzE2Myw3ICszMTYzLDcgQEAgaW50ZWxfcmluZ19pbnZh bGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB9CiAK IHZvaWQKLWludGVsX3N0b3BfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQoraW50ZWxfc3RvcF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQog ewogCWludCByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRl eCBlZTRkOWE4ZGRjMDQuLjg1MGU5ZThkZDNlYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaApAQCAtNDM4LDggKzQzOCw4IEBAIGludCBpbnRlbF9waW5fYW5kX21hcF9y aW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogdm9pZCBpbnRlbF91bnBpbl9y aW5nYnVmZmVyX29iaihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1Zik7CiB2b2lkIGlu dGVsX3JpbmdidWZmZXJfZnJlZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZyk7CiAKLXZv aWQgaW50ZWxfc3RvcF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp Owotdm9pZCBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSk7Cit2b2lkIGludGVsX3N0b3BfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSk7Cit2b2lkIGludGVsX2NsZWFudXBfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSk7CiAKIGludCBpbnRlbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCk7CiAKQEAgLTQ2NSw3ICs0NjUsNyBAQCBz dGF0aWMgaW5saW5lIHZvaWQgaW50ZWxfcmluZ19hZHZhbmNlKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKIGludCBfX2ludGVsX3Jpbmdfc3BhY2UoaW50IGhlYWQsIGludCB0YWlsLCBp bnQgc2l6ZSk7CiB2b2lkIGludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmKTsKIGludCBpbnRlbF9yaW5nX3NwYWNlKHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmKTsKLWJvb2wgaW50ZWxfcmluZ19zdG9wcGVkKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSk7Citib29sIGludGVsX2VuZ2luZV9zdG9wcGVkKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKIGludCBfX211c3RfY2hlY2sgaW50ZWxfZW5naW5lX2lk bGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIHZvaWQgaW50ZWxfcmluZ19pbml0 X3NlcW5vKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgdTMyIHNlcW5vKTsKLS0gCjEu OS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK