From: Tvrtko Ursulin Subject: [PATCH v4] drm/i915: Small compaction of the engine init code Date: Thu, 23 Jun 2016 14:52:41 +0100 Message-ID: <1466689961-23232-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <20160623132505.GD28219@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id E832C6E945 for ; Thu, 23 Jun 2016 13:53:06 +0000 (UTC) In-Reply-To: <20160623132505.GD28219@nuc-i3427.alporthouse.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkVmZmVjdGl2 ZWx5IHJlbW92ZXMgb25lIGxheWVyIG9mIGluZGlyZWN0aW9uIGJldHdlZW4gdGhlIG1hc2sgb2YK cG9zc2libGUgZW5naW5lcyBhbmQgdGhlIGVuZ2luZSBjb25zdHJ1Y3RvcnMuIEluc3RlYWQgb2Yg c3BlbGxpbmcKb3V0IGluIGNvZGUgdGhlIG1hcHBpbmcgb2YgSEFTXzxlbmdpbmU+IHRvIGNvbnN0 cnVjdG9ycywgbWFrZXMKbW9yZSB1c2Ugb2YgdGhlIHJlY2VudGx5IGFkZGVkIGRhdGEgZHJpdmVu IGFwcHJvYWNoIGJ5IHB1dHRpbmcKZW5naW5lIGNvbnN0cnVjdG9yIHZmdW5jcyBpbnRvIHRoZSB0 YWJsZSBhcyB3ZWxsLgoKRWZmZWN0IGlzIGZld2VyIGxpbmVzIG9mIHNvdXJjZSBhbmQgc21hbGxl ciBiaW5hcnkuCgpBdCB0aGUgc2FtZSB0aW1lIHNpbXBsaWZ5IHRoZSBlcnJvciBoYW5kbGluZyBz aW5jZSBlbmdpbmUKZGVzdHJ1Y3RvcnMgY2FuIHJ1biBvbiB1bml0aWFsaXplZCBlbmdpbmVzIGFu eXdheS4KClNpbWlsYXIgYXBwcm9hY2ggY291bGQgYmUgZG9uZSBmb3IgbGVnYWN5IHN1Ym1pc3Np b24gaXMgd2FudGVkLgoKdjI6IFJlbW92ZWQgdWdseSBCVUlMRF9CVUdfT05zIGluIGZhdm91ciBv ZiBuZXdseSBpbnRyb2R1Y2VkCiAgICBFTkdJTkVfTUFTSyBhbmQgSEFTX0VOR0lORSBtYWNyb3Mu CiAgICBBbHNvIHJlbW92ZWQgdGhlIGZvcndhcmQgZGVjbGFyYXRpb25zIGJ5IHNodWZmbGluZyBm dW5jdGlvbnMKICAgIGFyb3VuZC4KCnYzOiBXYXJuIHdoZW4gbG9naWNhbF9yaW5ncyB0YWJsZSBk b2VzIG5vdCBjb250YWluIGVub3VnaCBkYXRhCiAgICBhbmQgZGlzYWJsZSB0aGUgZW5naW5lcyB3 aGljaCBjb3VsZCBub3QgYmUgaW5pdGlhbGl6ZWQuCiAgICAoQ2hyaXMgV2lsc29uKQoKdjQ6IENo cmlzIFdpbHNvbiBzdWdnZXN0ZWQgYSBuaWNlciBlbmdpbmUgaW5pdCBsb29wLgoKU2lnbmVkLW9m Zi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IENocmlz IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggIHwgIDI3ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYyB8IDI1MyArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmls ZXMgY2hhbmdlZCwgMTMwIGluc2VydGlvbnMoKyksIDE1MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaAppbmRleCA3NGQwYTYxZGU3NWEuLjZkOTZiMTRiNTNjOCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCkBAIC0yNzU5LDE3ICsyNzU5LDIyIEBAIHN0cnVjdCBkcm1faTkxNV9j bWRfdGFibGUgewogI2RlZmluZSBJU19HRU44KGRldikJKElOVEVMX0lORk8oZGV2KS0+Z2VuX21h c2sgJiBCSVQoNykpCiAjZGVmaW5lIElTX0dFTjkoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5nZW5f bWFzayAmIEJJVCg4KSkKIAotI2RlZmluZSBSRU5ERVJfUklORwkJKDE8PFJDUykKLSNkZWZpbmUg QlNEX1JJTkcJCSgxPDxWQ1MpCi0jZGVmaW5lIEJMVF9SSU5HCQkoMTw8QkNTKQotI2RlZmluZSBW RUJPWF9SSU5HCQkoMTw8VkVDUykKLSNkZWZpbmUgQlNEMl9SSU5HCQkoMTw8VkNTMikKLSNkZWZp bmUgQUxMX0VOR0lORVMJCSh+MCkKLQotI2RlZmluZSBIQVNfQlNEKGRldikJCShJTlRFTF9JTkZP KGRldiktPnJpbmdfbWFzayAmIEJTRF9SSU5HKQotI2RlZmluZSBIQVNfQlNEMihkZXYpCQkoSU5U RUxfSU5GTyhkZXYpLT5yaW5nX21hc2sgJiBCU0QyX1JJTkcpCi0jZGVmaW5lIEhBU19CTFQoZGV2 KQkJKElOVEVMX0lORk8oZGV2KS0+cmluZ19tYXNrICYgQkxUX1JJTkcpCi0jZGVmaW5lIEhBU19W RUJPWChkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5yaW5nX21hc2sgJiBWRUJPWF9SSU5HKQorI2Rl ZmluZSBFTkdJTkVfTUFTSyhpZCkJQklUKGlkKQorI2RlZmluZSBSRU5ERVJfUklORwlFTkdJTkVf TUFTSyhSQ1MpCisjZGVmaW5lIEJTRF9SSU5HCUVOR0lORV9NQVNLKFZDUykKKyNkZWZpbmUgQkxU X1JJTkcJRU5HSU5FX01BU0soQkNTKQorI2RlZmluZSBWRUJPWF9SSU5HCUVOR0lORV9NQVNLKFZF Q1MpCisjZGVmaW5lIEJTRDJfUklORwlFTkdJTkVfTUFTSyhWQ1MyKQorI2RlZmluZSBBTExfRU5H SU5FUwkofjApCisKKyNkZWZpbmUgSEFTX0VOR0lORShkZXZfcHJpdiwgaWQpIFwKKwkoSU5URUxf SU5GTyhkZXZfcHJpdiktPnJpbmdfbWFzayAmIEVOR0lORV9NQVNLKGlkKSkKKworI2RlZmluZSBI QVNfQlNEKGRldl9wcml2KQlIQVNfRU5HSU5FKGRldl9wcml2LCBWQ1MpCisjZGVmaW5lIEhBU19C U0QyKGRldl9wcml2KQlIQVNfRU5HSU5FKGRldl9wcml2LCBWQ1MyKQorI2RlZmluZSBIQVNfQkxU KGRldl9wcml2KQlIQVNfRU5HSU5FKGRldl9wcml2LCBCQ1MpCisjZGVmaW5lIEhBU19WRUJPWChk ZXZfcHJpdikJSEFTX0VOR0lORShkZXZfcHJpdiwgVkVDUykKKwogI2RlZmluZSBIQVNfTExDKGRl dikJCShJTlRFTF9JTkZPKGRldiktPmhhc19sbGMpCiAjZGVmaW5lIEhBU19TTk9PUChkZXYpCQko SU5URUxfSU5GTyhkZXYpLT5oYXNfc25vb3ApCiAjZGVmaW5lIEhBU19FRFJBTShkZXYpCQkoX19J OTE1X18oZGV2KS0+ZWRyYW1fY2FwICYgRURSQU1fRU5BQkxFRCkKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMKaW5kZXggZGViZWQwMTFhOTU4Li42MmIwZGM2YzI2NDIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCkBAIC0yMDE2LDEyICsyMDE2LDkwIEBAIGxyY19zZXR1cF9od3Moc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCXJldHVybiAwOwogfQogCitzdGF0aWMgaW50Citsb2dp Y2FsX3JpbmdfaW5pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJc3RydWN0 IGk5MTVfZ2VtX2NvbnRleHQgKmRjdHggPSBlbmdpbmUtPmk5MTUtPmtlcm5lbF9jb250ZXh0Owor CWludCByZXQ7CisKKwlyZXQgPSBpOTE1X2NtZF9wYXJzZXJfaW5pdF9yaW5nKGVuZ2luZSk7CisJ aWYgKHJldCkKKwkJZ290byBlcnJvcjsKKworCXJldCA9IGV4ZWNsaXN0c19jb250ZXh0X2RlZmVy cmVkX2FsbG9jKGRjdHgsIGVuZ2luZSk7CisJaWYgKHJldCkKKwkJZ290byBlcnJvcjsKKworCS8q IEFzIHRoaXMgaXMgdGhlIGRlZmF1bHQgY29udGV4dCwgYWx3YXlzIHBpbiBpdCAqLworCXJldCA9 IGludGVsX2xyX2NvbnRleHRfcGluKGRjdHgsIGVuZ2luZSk7CisJaWYgKHJldCkgeworCQlEUk1f RVJST1IoIkZhaWxlZCB0byBwaW4gY29udGV4dCBmb3IgJXM6ICVkXG4iLAorCQkJICBlbmdpbmUt Pm5hbWUsIHJldCk7CisJCWdvdG8gZXJyb3I7CisJfQorCisJLyogQW5kIHNldHVwIHRoZSBoYXJk d2FyZSBzdGF0dXMgcGFnZS4gKi8KKwlyZXQgPSBscmNfc2V0dXBfaHdzKGVuZ2luZSwgZGN0eC0+ ZW5naW5lW2VuZ2luZS0+aWRdLnN0YXRlKTsKKwlpZiAocmV0KSB7CisJCURSTV9FUlJPUigiRmFp bGVkIHRvIHNldCB1cCBod3MgJXM6ICVkXG4iLCBlbmdpbmUtPm5hbWUsIHJldCk7CisJCWdvdG8g ZXJyb3I7CisJfQorCisJcmV0dXJuIDA7CisKK2Vycm9yOgorCWludGVsX2xvZ2ljYWxfcmluZ19j bGVhbnVwKGVuZ2luZSk7CisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIGludCBsb2dpY2FsX3Jl bmRlcl9yaW5nX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQoreworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsKKwlpbnQgcmV0Owor CisJaWYgKEhBU19MM19EUEYoZGV2X3ByaXYpKQorCQllbmdpbmUtPmlycV9rZWVwX21hc2sgfD0g R1RfUkVOREVSX0wzX1BBUklUWV9FUlJPUl9JTlRFUlJVUFQ7CisKKwkvKiBPdmVycmlkZSBzb21l IGZvciByZW5kZXIgcmluZy4gKi8KKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQorCQll bmdpbmUtPmluaXRfaHcgPSBnZW45X2luaXRfcmVuZGVyX3Jpbmc7CisJZWxzZQorCQllbmdpbmUt PmluaXRfaHcgPSBnZW44X2luaXRfcmVuZGVyX3Jpbmc7CisJZW5naW5lLT5pbml0X2NvbnRleHQg PSBnZW44X2luaXRfcmNzX2NvbnRleHQ7CisJZW5naW5lLT5jbGVhbnVwID0gaW50ZWxfZmluaV9w aXBlX2NvbnRyb2w7CisJZW5naW5lLT5lbWl0X2ZsdXNoID0gZ2VuOF9lbWl0X2ZsdXNoX3JlbmRl cjsKKwllbmdpbmUtPmVtaXRfcmVxdWVzdCA9IGdlbjhfZW1pdF9yZXF1ZXN0X3JlbmRlcjsKKwor CXJldCA9IGludGVsX2luaXRfcGlwZV9jb250cm9sKGVuZ2luZSk7CisJaWYgKHJldCkKKwkJcmV0 dXJuIHJldDsKKworCXJldCA9IGludGVsX2luaXRfd29ya2Fyb3VuZF9iYihlbmdpbmUpOworCWlm IChyZXQpIHsKKwkJLyoKKwkJICogV2UgY29udGludWUgZXZlbiBpZiB3ZSBmYWlsIHRvIGluaXRp YWxpemUgV0EgYmF0Y2gKKwkJICogYmVjYXVzZSB3ZSBvbmx5IGV4cGVjdCByYXJlIGdsaXRjaGVz IGJ1dCBub3RoaW5nCisJCSAqIGNyaXRpY2FsIHRvIHByZXZlbnQgdXMgZnJvbSB1c2luZyBHUFUK KwkJICovCisJCURSTV9FUlJPUigiV0EgYmF0Y2ggYnVmZmVyIGluaXRpYWxpemF0aW9uIGZhaWxl ZDogJWRcbiIsCisJCQkgIHJldCk7CisJfQorCisJcmV0ID0gbG9naWNhbF9yaW5nX2luaXQoZW5n aW5lKTsKKwlpZiAocmV0KSB7CisJCWxyY19kZXN0cm95X3dhX2N0eF9vYmooZW5naW5lKTsKKwl9 CisKKwlyZXR1cm4gcmV0OworfQorCiBzdGF0aWMgY29uc3Qgc3RydWN0IGxvZ2ljYWxfcmluZ19p bmZvIHsKIAljb25zdCBjaGFyICpuYW1lOwogCXVuc2lnbmVkIGV4ZWNfaWQ7CiAJdW5zaWduZWQg Z3VjX2lkOwogCXUzMiBtbWlvX2Jhc2U7CiAJdW5zaWduZWQgaXJxX3NoaWZ0OworCWludCAoKmlu aXQpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiB9IGxvZ2ljYWxfcmluZ3NbXSA9 IHsKIAlbUkNTXSA9IHsKIAkJLm5hbWUgPSAicmVuZGVyIHJpbmciLApAQCAtMjAyOSw2ICsyMTA3 LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBsb2dpY2FsX3JpbmdfaW5mbyB7CiAJCS5ndWNfaWQg PSBHVUNfUkVOREVSX0VOR0lORSwKIAkJLm1taW9fYmFzZSA9IFJFTkRFUl9SSU5HX0JBU0UsCiAJ CS5pcnFfc2hpZnQgPSBHRU44X1JDU19JUlFfU0hJRlQsCisJCS5pbml0ID0gbG9naWNhbF9yZW5k ZXJfcmluZ19pbml0LAogCX0sCiAJW0JDU10gPSB7CiAJCS5uYW1lID0gImJsaXR0ZXIgcmluZyIs CkBAIC0yMDM2LDYgKzIxMTUsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGxvZ2ljYWxfcmluZ19p bmZvIHsKIAkJLmd1Y19pZCA9IEdVQ19CTElUVEVSX0VOR0lORSwKIAkJLm1taW9fYmFzZSA9IEJM VF9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X0JDU19JUlFfU0hJRlQsCisJCS5pbml0 ID0gbG9naWNhbF9yaW5nX2luaXQsCiAJfSwKIAlbVkNTXSA9IHsKIAkJLm5hbWUgPSAiYnNkIHJp bmciLApAQCAtMjA0Myw2ICsyMTIzLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBsb2dpY2FsX3Jp bmdfaW5mbyB7CiAJCS5ndWNfaWQgPSBHVUNfVklERU9fRU5HSU5FLAogCQkubW1pb19iYXNlID0g R0VONl9CU0RfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9WQ1MxX0lSUV9TSElGVCwK KwkJLmluaXQgPSBsb2dpY2FsX3JpbmdfaW5pdCwKIAl9LAogCVtWQ1MyXSA9IHsKIAkJLm5hbWUg PSAiYnNkMiByaW5nIiwKQEAgLTIwNTAsNiArMjEzMSw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg bG9naWNhbF9yaW5nX2luZm8gewogCQkuZ3VjX2lkID0gR1VDX1ZJREVPX0VOR0lORTIsCiAJCS5t bWlvX2Jhc2UgPSBHRU44X0JTRDJfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9WQ1My X0lSUV9TSElGVCwKKwkJLmluaXQgPSBsb2dpY2FsX3JpbmdfaW5pdCwKIAl9LAogCVtWRUNTXSA9 IHsKIAkJLm5hbWUgPSAidmlkZW8gZW5oYW5jZW1lbnQgcmluZyIsCkBAIC0yMDU3LDE0ICsyMTM5 LDE0IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgbG9naWNhbF9yaW5nX2luZm8gewogCQkuZ3VjX2lk ID0gR1VDX1ZJREVPRU5IQU5DRV9FTkdJTkUsCiAJCS5tbWlvX2Jhc2UgPSBWRUJPWF9SSU5HX0JB U0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X1ZFQ1NfSVJRX1NISUZULAorCQkuaW5pdCA9IGxvZ2lj YWxfcmluZ19pbml0LAogCX0sCiB9OwogCiBzdGF0aWMgc3RydWN0IGludGVsX2VuZ2luZV9jcyAq Ci1sb2dpY2FsX3Jpbmdfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBpbnRlbF9l bmdpbmVfaWQgaWQpCitsb2dpY2FsX3Jpbmdfc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LCBlbnVtIGludGVsX2VuZ2luZV9pZCBpZCkKIHsKIAljb25zdCBzdHJ1Y3QgbG9n aWNhbF9yaW5nX2luZm8gKmluZm8gPSAmbG9naWNhbF9yaW5nc1tpZF07Ci0Jc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSA9ICZkZXZfcHJpdi0+ZW5naW5lW2lkXTsKIAllbnVtIGZvcmNld2FrZV9k b21haW5zIGZ3X2RvbWFpbnM7CiAKQEAgLTIxMDcsMTY5ICsyMTg5LDYyIEBAIGxvZ2ljYWxfcmlu Z19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIGludGVsX2VuZ2luZV9pZCBpZCkK IAlsb2dpY2FsX3JpbmdfZGVmYXVsdF9pcnFzKGVuZ2luZSwgaW5mby0+aXJxX3NoaWZ0KTsKIAog CWludGVsX2VuZ2luZV9pbml0X2hhbmdjaGVjayhlbmdpbmUpOwotCWk5MTVfZ2VtX2JhdGNoX3Bv b2xfaW5pdChkZXYsICZlbmdpbmUtPmJhdGNoX3Bvb2wpOworCWk5MTVfZ2VtX2JhdGNoX3Bvb2xf aW5pdChkZXZfcHJpdi0+ZGV2LCAmZW5naW5lLT5iYXRjaF9wb29sKTsKIAogCXJldHVybiBlbmdp bmU7CiB9CiAKLXN0YXRpYyBpbnQKLWxvZ2ljYWxfcmluZ19pbml0KHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKLXsKLQlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqZGN0eCA9IGVuZ2lu ZS0+aTkxNS0+a2VybmVsX2NvbnRleHQ7Ci0JaW50IHJldDsKLQotCXJldCA9IGk5MTVfY21kX3Bh cnNlcl9pbml0X3JpbmcoZW5naW5lKTsKLQlpZiAocmV0KQotCQlnb3RvIGVycm9yOwotCi0JcmV0 ID0gZXhlY2xpc3RzX2NvbnRleHRfZGVmZXJyZWRfYWxsb2MoZGN0eCwgZW5naW5lKTsKLQlpZiAo cmV0KQotCQlnb3RvIGVycm9yOwotCi0JLyogQXMgdGhpcyBpcyB0aGUgZGVmYXVsdCBjb250ZXh0 LCBhbHdheXMgcGluIGl0ICovCi0JcmV0ID0gaW50ZWxfbHJfY29udGV4dF9waW4oZGN0eCwgZW5n aW5lKTsKLQlpZiAocmV0KSB7Ci0JCURSTV9FUlJPUigiRmFpbGVkIHRvIHBpbiBjb250ZXh0IGZv ciAlczogJWRcbiIsCi0JCQkgIGVuZ2luZS0+bmFtZSwgcmV0KTsKLQkJZ290byBlcnJvcjsKLQl9 Ci0KLQkvKiBBbmQgc2V0dXAgdGhlIGhhcmR3YXJlIHN0YXR1cyBwYWdlLiAqLwotCXJldCA9IGxy Y19zZXR1cF9od3MoZW5naW5lLCBkY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0uc3RhdGUpOwotCWlm IChyZXQpIHsKLQkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gc2V0IHVwIGh3cyAlczogJWRcbiIsIGVu Z2luZS0+bmFtZSwgcmV0KTsKLQkJZ290byBlcnJvcjsKLQl9Ci0KLQlyZXR1cm4gMDsKLQotZXJy b3I6Ci0JaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoZW5naW5lKTsKLQlyZXR1cm4gcmV0Owot fQotCi1zdGF0aWMgaW50IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQotewotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IGxvZ2ljYWxfcmlu Z19zZXR1cChkZXYsIFJDUyk7Ci0JaW50IHJldDsKLQotCWlmIChIQVNfTDNfRFBGKGRldikpCi0J CWVuZ2luZS0+aXJxX2tlZXBfbWFzayB8PSBHVF9SRU5ERVJfTDNfUEFSSVRZX0VSUk9SX0lOVEVS UlVQVDsKLQotCS8qIE92ZXJyaWRlIHNvbWUgZm9yIHJlbmRlciByaW5nLiAqLwotCWlmIChJTlRF TF9JTkZPKGRldiktPmdlbiA+PSA5KQotCQllbmdpbmUtPmluaXRfaHcgPSBnZW45X2luaXRfcmVu ZGVyX3Jpbmc7Ci0JZWxzZQotCQllbmdpbmUtPmluaXRfaHcgPSBnZW44X2luaXRfcmVuZGVyX3Jp bmc7Ci0JZW5naW5lLT5pbml0X2NvbnRleHQgPSBnZW44X2luaXRfcmNzX2NvbnRleHQ7Ci0JZW5n aW5lLT5jbGVhbnVwID0gaW50ZWxfZmluaV9waXBlX2NvbnRyb2w7Ci0JZW5naW5lLT5lbWl0X2Zs dXNoID0gZ2VuOF9lbWl0X2ZsdXNoX3JlbmRlcjsKLQllbmdpbmUtPmVtaXRfcmVxdWVzdCA9IGdl bjhfZW1pdF9yZXF1ZXN0X3JlbmRlcjsKLQotCXJldCA9IGludGVsX2luaXRfcGlwZV9jb250cm9s KGVuZ2luZSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQotCXJldCA9IGludGVsX2luaXRf d29ya2Fyb3VuZF9iYihlbmdpbmUpOwotCWlmIChyZXQpIHsKLQkJLyoKLQkJICogV2UgY29udGlu dWUgZXZlbiBpZiB3ZSBmYWlsIHRvIGluaXRpYWxpemUgV0EgYmF0Y2gKLQkJICogYmVjYXVzZSB3 ZSBvbmx5IGV4cGVjdCByYXJlIGdsaXRjaGVzIGJ1dCBub3RoaW5nCi0JCSAqIGNyaXRpY2FsIHRv IHByZXZlbnQgdXMgZnJvbSB1c2luZyBHUFUKLQkJICovCi0JCURSTV9FUlJPUigiV0EgYmF0Y2gg YnVmZmVyIGluaXRpYWxpemF0aW9uIGZhaWxlZDogJWRcbiIsCi0JCQkgIHJldCk7Ci0JfQotCi0J cmV0ID0gbG9naWNhbF9yaW5nX2luaXQoZW5naW5lKTsKLQlpZiAocmV0KSB7Ci0JCWxyY19kZXN0 cm95X3dhX2N0eF9vYmooZW5naW5lKTsKLQl9Ci0KLQlyZXR1cm4gcmV0OwotfQotCi1zdGF0aWMg aW50IGxvZ2ljYWxfYnNkX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQotewotCXN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IGxvZ2ljYWxfcmluZ19zZXR1cChkZXYsIFZD Uyk7Ci0KLQlyZXR1cm4gbG9naWNhbF9yaW5nX2luaXQoZW5naW5lKTsKLX0KLQotc3RhdGljIGlu dCBsb2dpY2FsX2JzZDJfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCi17Ci0Jc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gbG9naWNhbF9yaW5nX3NldHVwKGRldiwgVkNT Mik7Ci0KLQlyZXR1cm4gbG9naWNhbF9yaW5nX2luaXQoZW5naW5lKTsKLX0KLQotc3RhdGljIGlu dCBsb2dpY2FsX2JsdF9yaW5nX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKLXsKLQlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSBsb2dpY2FsX3Jpbmdfc2V0dXAoZGV2LCBCQ1Mp OwotCi0JcmV0dXJuIGxvZ2ljYWxfcmluZ19pbml0KGVuZ2luZSk7Ci19Ci0KLXN0YXRpYyBpbnQg bG9naWNhbF92ZWJveF9yaW5nX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKLXsKLQlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSBsb2dpY2FsX3Jpbmdfc2V0dXAoZGV2LCBWRUNT KTsKLQotCXJldHVybiBsb2dpY2FsX3JpbmdfaW5pdChlbmdpbmUpOwotfQotCiAvKioKICAqIGlu dGVsX2xvZ2ljYWxfcmluZ3NfaW5pdCgpIC0gYWxsb2NhdGUsIHBvcHVsYXRlIGFuZCBpbml0IHRo ZSBFbmdpbmUgQ29tbWFuZCBTdHJlYW1lcnMKICAqIEBkZXY6IERSTSBkZXZpY2UuCiAgKgotICog VGhpcyBmdW5jdGlvbiBpbml0cyB0aGUgZW5naW5lcyBmb3IgYW4gRXhlY2xpc3RzIHN1Ym1pc3Np b24gc3R5bGUgKHRoZSBlcXVpdmFsZW50IGluIHRoZQotICogbGVnYWN5IHJpbmdidWZmZXIgc3Vi bWlzc2lvbiB3b3JsZCB3b3VsZCBiZSBpOTE1X2dlbV9pbml0X2VuZ2luZXMpLiBJdCBkb2VzIGl0 IG9ubHkgZm9yCi0gKiB0aG9zZSBlbmdpbmVzIHRoYXQgYXJlIHByZXNlbnQgaW4gdGhlIGhhcmR3 YXJlLgorICogVGhpcyBmdW5jdGlvbiBpbml0cyB0aGUgZW5naW5lcyBmb3IgYW4gRXhlY2xpc3Rz IHN1Ym1pc3Npb24gc3R5bGUgKHRoZQorICogZXF1aXZhbGVudCBpbiB0aGUgbGVnYWN5IHJpbmdi dWZmZXIgc3VibWlzc2lvbiB3b3JsZCB3b3VsZCBiZQorICogaTkxNV9nZW1faW5pdF9lbmdpbmVz KS4gSXQgZG9lcyBpdCBvbmx5IGZvciB0aG9zZSBlbmdpbmVzIHRoYXQgYXJlIHByZXNlbnQgaW4K KyAqIHRoZSBoYXJkd2FyZS4KICAqCiAgKiBSZXR1cm46IG5vbi16ZXJvIGlmIHRoZSBpbml0aWFs aXphdGlvbiBmYWlsZWQuCiAgKi8KIGludCBpbnRlbF9sb2dpY2FsX3JpbmdzX2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOworCXVuc2lnbmVkIGludCBtYXNrID0gMDsKKwl1bnNpZ25lZCBp bnQgaTsKIAlpbnQgcmV0OwogCi0JcmV0ID0gbG9naWNhbF9yZW5kZXJfcmluZ19pbml0KGRldik7 Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKKwlXQVJOX09OKElOVEVMX0lORk8oZGV2X3ByaXYp LT5yaW5nX21hc2sgJgorCQlHRU5NQVNLKHNpemVvZihtYXNrKSAqIEJJVFNfUEVSX0JZVEUgLSAx LCBJOTE1X05VTV9FTkdJTkVTKSk7CiAKLQlpZiAoSEFTX0JTRChkZXYpKSB7Ci0JCXJldCA9IGxv Z2ljYWxfYnNkX3JpbmdfaW5pdChkZXYpOwotCQlpZiAocmV0KQotCQkJZ290byBjbGVhbnVwX3Jl bmRlcl9yaW5nOwotCX0KKwlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShsb2dpY2FsX3Jpbmdz KTsgaSsrKSB7CisJCWlmICghSEFTX0VOR0lORShkZXZfcHJpdiwgaSkpCisJCQljb250aW51ZTsK IAotCWlmIChIQVNfQkxUKGRldikpIHsKLQkJcmV0ID0gbG9naWNhbF9ibHRfcmluZ19pbml0KGRl dik7Ci0JCWlmIChyZXQpCi0JCQlnb3RvIGNsZWFudXBfYnNkX3Jpbmc7Ci0JfQorCQlpZiAoIWxv Z2ljYWxfcmluZ3NbaV0uaW5pdCkKKwkJCWNvbnRpbnVlOwogCi0JaWYgKEhBU19WRUJPWChkZXYp KSB7Ci0JCXJldCA9IGxvZ2ljYWxfdmVib3hfcmluZ19pbml0KGRldik7CisJCXJldCA9IGxvZ2lj YWxfcmluZ3NbaV0uaW5pdChsb2dpY2FsX3Jpbmdfc2V0dXAoZGV2X3ByaXYsIGkpKTsKIAkJaWYg KHJldCkKLQkJCWdvdG8gY2xlYW51cF9ibHRfcmluZzsKKwkJCWdvdG8gY2xlYW51cDsKKworCQlt YXNrIHw9IEVOR0lORV9NQVNLKGkpOwogCX0KIAotCWlmIChIQVNfQlNEMihkZXYpKSB7Ci0JCXJl dCA9IGxvZ2ljYWxfYnNkMl9yaW5nX2luaXQoZGV2KTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gY2xl YW51cF92ZWJveF9yaW5nOworCS8qCisJICogQ2F0Y2ggZmFpbHVyZXMgdG8gdXBkYXRlIGxvZ2lj YWxfcmluZ3MgdGFibGUgd2hlbiB0aGUgbmV3IGVuZ2luZXMKKwkgKiBhcmUgYWRkZWQgdG8gdGhl IGRyaXZlciBieSBhIHdhcm5pbmcgYW5kIGRpc2FibGluZyB0aGUgZm9yZ290dGVuCisJICogZW5n aW5lcy4KKwkgKi8KKwlpZiAoV0FSTl9PTihtYXNrICE9IElOVEVMX0lORk8oZGV2X3ByaXYpLT5y aW5nX21hc2spKSB7CisJCXN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyAqaW5mbyA9CisJCQkoc3Ry dWN0IGludGVsX2RldmljZV9pbmZvICopJmRldl9wcml2LT5pbmZvOworCQlpbmZvLT5yaW5nX21h c2sgPSBtYXNrOwogCX0KIAogCXJldHVybiAwOwogCi1jbGVhbnVwX3ZlYm94X3Jpbmc6Ci0JaW50 ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoJmRldl9wcml2LT5lbmdpbmVbVkVDU10pOwotY2xlYW51 cF9ibHRfcmluZzoKLQlpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cCgmZGV2X3ByaXYtPmVuZ2lu ZVtCQ1NdKTsKLWNsZWFudXBfYnNkX3Jpbmc6Ci0JaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAo JmRldl9wcml2LT5lbmdpbmVbVkNTXSk7Ci1jbGVhbnVwX3JlbmRlcl9yaW5nOgotCWludGVsX2xv Z2ljYWxfcmluZ19jbGVhbnVwKCZkZXZfcHJpdi0+ZW5naW5lW1JDU10pOworY2xlYW51cDoKKwlm b3IgKGkgPSAwOyBpIDwgSTkxNV9OVU1fRU5HSU5FUzsgaSsrKQorCQlpbnRlbF9sb2dpY2FsX3Jp bmdfY2xlYW51cCgmZGV2X3ByaXYtPmVuZ2luZVtpXSk7CiAKIAlyZXR1cm4gcmV0OwogfQotLSAK MS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=