From: Tvrtko Ursulin Subject: [PATCH 6/7] drm/i915: Move common engine setup into intel_engine_cs.c Date: Wed, 13 Jul 2016 16:03:40 +0100 Message-ID: <1468422221-12132-6-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1468422221-12132-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E13C6E76F for ; Wed, 13 Jul 2016 15:08:20 +0000 (UTC) In-Reply-To: <1468422221-12132-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkNvbW1vbiBj b2RlIGRlc2VydmVzIHRvIGJlIHB1dCBpbiBhIHNlcGFyYXRlIGZpbGUgZnJvbSBsZWdhY3kgYW5k CmV4ZWNsaXN0cyBpbXBsZW1lbnRhdGlvbiBmb3IgY2xhcml0eSBhbmQgZWFzZSBvZiBtYWludGVu YW5jZS4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvTWFrZWZpbGUgICAgICAgICAgIHwgICAx ICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jICB8IDE2MiArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMgICAgICAgIHwgMTM4ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmggICAgICAgIHwgICAzICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaCB8ICAgNCAtCiA1IGZpbGVzIGNoYW5nZWQsIDE2OCBpbnNlcnRp b25zKCspLCAxNDAgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9NYWtlZmlsZSBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L01ha2VmaWxlCmluZGV4IDY4NGZj MWNkMDhmYS4uNzUzMThlYmI4ZDI1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9N YWtlZmlsZQorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9NYWtlZmlsZQpAQCAtNDAsNiArNDAs NyBAQCBpOTE1LXkgKz0gaTkxNV9jbWRfcGFyc2VyLm8gXAogCSAgaTkxNV9ncHVfZXJyb3IubyBc CiAJICBpOTE1X3RyYWNlX3BvaW50cy5vIFwKIAkgIGludGVsX2JyZWFkY3J1bWJzLm8gXAorCSAg aW50ZWxfZW5naW5lX2NzLm8gXAogCSAgaW50ZWxfbHJjLm8gXAogCSAgaW50ZWxfbW9jcy5vIFwK IAkgIGludGVsX3JpbmdidWZmZXIubyBcCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9lbmdpbmVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9j cy5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uODAxMTdiNDk5MDI0 Ci0tLSAvZGV2L251bGwKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2Nz LmMKQEAgLTAsMCArMSwxNjIgQEAKKy8qCisgKiBDb3B5cmlnaHQgwqkgMjAxNiBJbnRlbCBDb3Jw b3JhdGlvbgorICoKKyAqIFBlcm1pc3Npb24gaXMgaGVyZWJ5IGdyYW50ZWQsIGZyZWUgb2YgY2hh cmdlLCB0byBhbnkgcGVyc29uIG9idGFpbmluZyBhCisgKiBjb3B5IG9mIHRoaXMgc29mdHdhcmUg YW5kIGFzc29jaWF0ZWQgZG9jdW1lbnRhdGlvbiBmaWxlcyAodGhlICJTb2Z0d2FyZSIpLAorICog dG8gZGVhbCBpbiB0aGUgU29mdHdhcmUgd2l0aG91dCByZXN0cmljdGlvbiwgaW5jbHVkaW5nIHdp dGhvdXQgbGltaXRhdGlvbgorICogdGhlIHJpZ2h0cyB0byB1c2UsIGNvcHksIG1vZGlmeSwgbWVy Z2UsIHB1Ymxpc2gsIGRpc3RyaWJ1dGUsIHN1YmxpY2Vuc2UsCisgKiBhbmQvb3Igc2VsbCBjb3Bp ZXMgb2YgdGhlIFNvZnR3YXJlLCBhbmQgdG8gcGVybWl0IHBlcnNvbnMgdG8gd2hvbSB0aGUKKyAq IFNvZnR3YXJlIGlzIGZ1cm5pc2hlZCB0byBkbyBzbywgc3ViamVjdCB0byB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnM6CisgKgorICogVGhlIGFib3ZlIGNvcHlyaWdodCBub3RpY2UgYW5kIHRoaXMg cGVybWlzc2lvbiBub3RpY2UgKGluY2x1ZGluZyB0aGUgbmV4dAorICogcGFyYWdyYXBoKSBzaGFs bCBiZSBpbmNsdWRlZCBpbiBhbGwgY29waWVzIG9yIHN1YnN0YW50aWFsIHBvcnRpb25zIG9mIHRo ZQorICogU29mdHdhcmUuCisgKgorICogVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIs IFdJVEhPVVQgV0FSUkFOVFkgT0YgQU5ZIEtJTkQsIEVYUFJFU1MgT1IKKyAqIElNUExJRUQsIElO Q0xVRElORyBCVVQgTk9UIExJTUlURUQgVE8gVEhFIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklM SVRZLAorICogRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQU5EIE5PTklORlJJTkdF TUVOVC4gIElOIE5PIEVWRU5UIFNIQUxMCisgKiBUSEUgQVVUSE9SUyBPUiBDT1BZUklHSFQgSE9M REVSUyBCRSBMSUFCTEUgRk9SIEFOWSBDTEFJTSwgREFNQUdFUyBPUiBPVEhFUgorICogTElBQklM SVRZLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgVE9SVCBPUiBPVEhFUldJU0Us IEFSSVNJTkcKKyAqIEZST00sIE9VVCBPRiBPUiBJTiBDT05ORUNUSU9OIFdJVEggVEhFIFNPRlRX QVJFIE9SIFRIRSBVU0UgT1IgT1RIRVIgREVBTElOR1MKKyAqIElOIFRIRSBTT0ZUV0FSRS4KKyAq CisgKi8KKworI2luY2x1ZGUgImk5MTVfZHJ2LmgiCisjaW5jbHVkZSAiaW50ZWxfcmluZ2J1ZmZl ci5oIgorI2luY2x1ZGUgImludGVsX2xyYy5oIgorCitzdGF0aWMgY29uc3Qgc3RydWN0IGVuZ2lu ZV9pbmZvIHsKKwljb25zdCBjaGFyICpuYW1lOworCXVuc2lnbmVkIGV4ZWNfaWQ7CisJdW5zaWdu ZWQgZ3VjX2lkOworCXUzMiBtbWlvX2Jhc2U7CisJdW5zaWduZWQgaXJxX3NoaWZ0OworCWludCAo KmluaXRfbGVnYWN5KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworCWludCAoKmlu aXRfZXhlY2xpc3RzKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworfSBpbnRlbF9l bmdpbmVzW10gPSB7CisJW1JDU10gPSB7CisJCS5uYW1lID0gInJlbmRlciByaW5nIiwKKwkJLmV4 ZWNfaWQgPSBJOTE1X0VYRUNfUkVOREVSLAorCQkuZ3VjX2lkID0gR1VDX1JFTkRFUl9FTkdJTkUs CisJCS5tbWlvX2Jhc2UgPSBSRU5ERVJfUklOR19CQVNFLAorCQkuaXJxX3NoaWZ0ID0gR0VOOF9S Q1NfSVJRX1NISUZULAorCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3JlbmRlcl9yaW5nX2lu aXQsCisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyLAorCX0s CisJW0JDU10gPSB7CisJCS5uYW1lID0gImJsaXR0ZXIgcmluZyIsCisJCS5leGVjX2lkID0gSTkx NV9FWEVDX0JMVCwKKwkJLmd1Y19pZCA9IEdVQ19CTElUVEVSX0VOR0lORSwKKwkJLm1taW9fYmFz ZSA9IEJMVF9SSU5HX0JBU0UsCisJCS5pcnFfc2hpZnQgPSBHRU44X0JDU19JUlFfU0hJRlQsCisJ CS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKKwkJLmluaXRfbGVnYWN5 ID0gaW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIsCisJfSwKKwlbVkNTXSA9IHsKKwkJLm5hbWUg PSAiYnNkIHJpbmciLAorCQkuZXhlY19pZCA9IEk5MTVfRVhFQ19CU0QsCisJCS5ndWNfaWQgPSBH VUNfVklERU9fRU5HSU5FLAorCQkubW1pb19iYXNlID0gR0VONl9CU0RfUklOR19CQVNFLAorCQku aXJxX3NoaWZ0ID0gR0VOOF9WQ1MxX0lSUV9TSElGVCwKKwkJLmluaXRfZXhlY2xpc3RzID0gbG9n aWNhbF94Y3NfcmluZ19pbml0LAorCQkuaW5pdF9sZWdhY3kgPSBpbnRlbF9pbml0X2JzZF9yaW5n X2J1ZmZlciwKKwl9LAorCVtWQ1MyXSA9IHsKKwkJLm5hbWUgPSAiYnNkMiByaW5nIiwKKwkJLmV4 ZWNfaWQgPSBJOTE1X0VYRUNfQlNELAorCQkuZ3VjX2lkID0gR1VDX1ZJREVPX0VOR0lORTIsCisJ CS5tbWlvX2Jhc2UgPSBHRU44X0JTRDJfUklOR19CQVNFLAorCQkuaXJxX3NoaWZ0ID0gR0VOOF9W Q1MyX0lSUV9TSElGVCwKKwkJLmluaXRfZXhlY2xpc3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0 LAorCQkuaW5pdF9sZWdhY3kgPSBpbnRlbF9pbml0X2JzZDJfcmluZ19idWZmZXIsCisJfSwKKwlb VkVDU10gPSB7CisJCS5uYW1lID0gInZpZGVvIGVuaGFuY2VtZW50IHJpbmciLAorCQkuZXhlY19p ZCA9IEk5MTVfRVhFQ19WRUJPWCwKKwkJLmd1Y19pZCA9IEdVQ19WSURFT0VOSEFOQ0VfRU5HSU5F LAorCQkubW1pb19iYXNlID0gVkVCT1hfUklOR19CQVNFLAorCQkuaXJxX3NoaWZ0ID0gR0VOOF9W RUNTX0lSUV9TSElGVCwKKwkJLmluaXRfZXhlY2xpc3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0 LAorCQkuaW5pdF9sZWdhY3kgPSBpbnRlbF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyLAorCX0sCit9 OworCitzdGF0aWMgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqCitpbnRlbF9lbmdpbmVfc2V0dXAo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkgICBlbnVtIGludGVsX2VuZ2lu ZV9pZCBpZCkKK3sKKwljb25zdCBzdHJ1Y3QgZW5naW5lX2luZm8gKmluZm8gPSAmaW50ZWxfZW5n aW5lc1tpZF07CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gJmRldl9wcml2LT5l bmdpbmVbaWRdOworCisJZW5naW5lLT5pZCA9IGlkOworCWVuZ2luZS0+aTkxNSA9IGRldl9wcml2 OworCWVuZ2luZS0+bmFtZSA9IGluZm8tPm5hbWU7CisJZW5naW5lLT5leGVjX2lkID0gaW5mby0+ ZXhlY19pZDsKKwllbmdpbmUtPmh3X2lkID0gZW5naW5lLT5ndWNfaWQgPSBpbmZvLT5ndWNfaWQ7 CisJZW5naW5lLT5tbWlvX2Jhc2UgPSBpbmZvLT5tbWlvX2Jhc2U7CisJZW5naW5lLT5pcnFfc2hp ZnQgPSBpbmZvLT5pcnFfc2hpZnQ7CisKKwlyZXR1cm4gZW5naW5lOworfQorCisvKioKKyAqIGlu dGVsX2VuZ2luZXNfaW5pdCgpIC0gYWxsb2NhdGUsIHBvcHVsYXRlIGFuZCBpbml0IHRoZSBFbmdp bmUgQ29tbWFuZCBTdHJlYW1lcnMKKyAqIEBkZXY6IERSTSBkZXZpY2UuCisgKgorICogUmV0dXJu OiBub24temVybyBpZiB0aGUgaW5pdGlhbGl6YXRpb24gZmFpbGVkLgorICovCitpbnQgaW50ZWxf ZW5naW5lc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXVuc2lnbmVkIGludCBtYXNrID0g MDsKKwlpbnQgKCppbml0KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworCXVuc2ln bmVkIGludCBpOworCWludCByZXQ7CisKKwlXQVJOX09OKElOVEVMX0lORk8oZGV2X3ByaXYpLT5y aW5nX21hc2sgJgorCQlHRU5NQVNLKHNpemVvZihtYXNrKSAqIEJJVFNfUEVSX0JZVEUgLSAxLCBJ OTE1X05VTV9FTkdJTkVTKSk7CisKKwlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShpbnRlbF9l bmdpbmVzKTsgaSsrKSB7CisJCWlmICghSEFTX0VOR0lORShkZXZfcHJpdiwgaSkpCisJCQljb250 aW51ZTsKKworCQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQorCQkJaW5pdCA9IGludGVsX2Vu Z2luZXNbaV0uaW5pdF9leGVjbGlzdHM7CisJCWVsc2UKKwkJCWluaXQgPSBpbnRlbF9lbmdpbmVz W2ldLmluaXRfbGVnYWN5OworCisJCWlmICghaW5pdCkKKwkJCWNvbnRpbnVlOworCisJCXJldCA9 IGluaXQoaW50ZWxfZW5naW5lX3NldHVwKGRldl9wcml2LCBpKSk7CisJCWlmIChyZXQpCisJCQln b3RvIGNsZWFudXA7CisKKwkJbWFzayB8PSBFTkdJTkVfTUFTSyhpKTsKKwl9CisKKwkvKgorCSAq IENhdGNoIGZhaWx1cmVzIHRvIHVwZGF0ZSBpbnRlbF9lbmdpbmVzIHRhYmxlIHdoZW4gdGhlIG5l dyBlbmdpbmVzCisJICogYXJlIGFkZGVkIHRvIHRoZSBkcml2ZXIgYnkgYSB3YXJuaW5nIGFuZCBk aXNhYmxpbmcgdGhlIGZvcmdvdHRlbgorCSAqIGVuZ2luZXMuCisJICovCisJaWYgKFdBUk5fT04o bWFzayAhPSBJTlRFTF9JTkZPKGRldl9wcml2KS0+cmluZ19tYXNrKSkgeworCQlzdHJ1Y3QgaW50 ZWxfZGV2aWNlX2luZm8gKmluZm8gPQorCQkJKHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyAqKSZk ZXZfcHJpdi0+aW5mbzsKKwkJaW5mby0+cmluZ19tYXNrID0gbWFzazsKKwl9CisKKwlyZXR1cm4g MDsKKworY2xlYW51cDoKKwlmb3IgKGkgPSAwOyBpIDwgSTkxNV9OVU1fRU5HSU5FUzsgaSsrKSB7 CisJCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpCisJCQlpbnRlbF9sb2dpY2FsX3JpbmdfY2xl YW51cCgmZGV2X3ByaXYtPmVuZ2luZVtpXSk7CisJCWVsc2UKKwkJCWludGVsX2NsZWFudXBfZW5n aW5lKCZkZXZfcHJpdi0+ZW5naW5lW2ldKTsKKwl9CisKKwlyZXR1cm4gcmV0OworfQorCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDJlMTNhM2EyNjI0NS4uNmU4OGQ5YWY5MzI4IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMjA4Myw3ICsyMDgzLDcgQEAgZXJyb3I6CiAJcmV0 dXJuIHJldDsKIH0KIAotc3RhdGljIGludCBsb2dpY2FsX3JlbmRlcl9yaW5nX2luaXQoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQoraW50IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCWludCByZXQ7CkBAIC0yMTI2LDE0NyArMjEy NiwxMyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIGludCBsb2dpY2Fs X3hjc19yaW5nX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQoraW50IGxvZ2lj YWxfeGNzX3JpbmdfaW5pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJbG9n aWNhbF9yaW5nX3NldHVwKGVuZ2luZSk7CiAKIAlyZXR1cm4gbG9naWNhbF9yaW5nX2luaXQoZW5n aW5lKTsKIH0KIAotc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyB7Ci0JY29uc3QgY2hh ciAqbmFtZTsKLQl1bnNpZ25lZCBleGVjX2lkOwotCXVuc2lnbmVkIGd1Y19pZDsKLQl1MzIgbW1p b19iYXNlOwotCXVuc2lnbmVkIGlycV9zaGlmdDsKLQlpbnQgKCppbml0X2xlZ2FjeSkoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKLQlpbnQgKCppbml0X2V4ZWNsaXN0cykoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKLX0gaW50ZWxfZW5naW5lc1tdID0gewotCVtSQ1Nd ID0gewotCQkubmFtZSA9ICJyZW5kZXIgcmluZyIsCi0JCS5leGVjX2lkID0gSTkxNV9FWEVDX1JF TkRFUiwKLQkJLmd1Y19pZCA9IEdVQ19SRU5ERVJfRU5HSU5FLAotCQkubW1pb19iYXNlID0gUkVO REVSX1JJTkdfQkFTRSwKLQkJLmlycV9zaGlmdCA9IEdFTjhfUkNTX0lSUV9TSElGVCwKLQkJLmlu aXRfZXhlY2xpc3RzID0gbG9naWNhbF9yZW5kZXJfcmluZ19pbml0LAotCQkuaW5pdF9sZWdhY3kg PSBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlciwKLQl9LAotCVtCQ1NdID0gewotCQkubmFt ZSA9ICJibGl0dGVyIHJpbmciLAotCQkuZXhlY19pZCA9IEk5MTVfRVhFQ19CTFQsCi0JCS5ndWNf aWQgPSBHVUNfQkxJVFRFUl9FTkdJTkUsCi0JCS5tbWlvX2Jhc2UgPSBCTFRfUklOR19CQVNFLAot CQkuaXJxX3NoaWZ0ID0gR0VOOF9CQ1NfSVJRX1NISUZULAotCQkuaW5pdF9leGVjbGlzdHMgPSBs b2dpY2FsX3hjc19yaW5nX2luaXQsCi0JCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfYmx0X3Jp bmdfYnVmZmVyLAotCX0sCi0JW1ZDU10gPSB7Ci0JCS5uYW1lID0gImJzZCByaW5nIiwKLQkJLmV4 ZWNfaWQgPSBJOTE1X0VYRUNfQlNELAotCQkuZ3VjX2lkID0gR1VDX1ZJREVPX0VOR0lORSwKLQkJ Lm1taW9fYmFzZSA9IEdFTjZfQlNEX1JJTkdfQkFTRSwKLQkJLmlycV9zaGlmdCA9IEdFTjhfVkNT MV9JUlFfU0hJRlQsCi0JCS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwK LQkJLmluaXRfbGVnYWN5ID0gaW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIsCi0JfSwKLQlbVkNT Ml0gPSB7Ci0JCS5uYW1lID0gImJzZDIgcmluZyIsCi0JCS5leGVjX2lkID0gSTkxNV9FWEVDX0JT RCwKLQkJLmd1Y19pZCA9IEdVQ19WSURFT19FTkdJTkUyLAotCQkubW1pb19iYXNlID0gR0VOOF9C U0QyX1JJTkdfQkFTRSwKLQkJLmlycV9zaGlmdCA9IEdFTjhfVkNTMl9JUlFfU0hJRlQsCi0JCS5p bml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKLQkJLmluaXRfbGVnYWN5ID0g aW50ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVyLAotCX0sCi0JW1ZFQ1NdID0gewotCQkubmFtZSA9 ICJ2aWRlbyBlbmhhbmNlbWVudCByaW5nIiwKLQkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfVkVCT1gs Ci0JCS5ndWNfaWQgPSBHVUNfVklERU9FTkhBTkNFX0VOR0lORSwKLQkJLm1taW9fYmFzZSA9IFZF Qk9YX1JJTkdfQkFTRSwKLQkJLmlycV9zaGlmdCA9IEdFTjhfVkVDU19JUlFfU0hJRlQsCi0JCS5p bml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKLQkJLmluaXRfbGVnYWN5ID0g aW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlciwKLQl9LAotfTsKLQotc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqCi1pbnRlbF9lbmdpbmVfc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAotCQkgICBlbnVtIGludGVsX2VuZ2luZV9pZCBpZCkKLXsKLQljb25zdCBzdHJ1Y3Qg ZW5naW5lX2luZm8gKmluZm8gPSAmaW50ZWxfZW5naW5lc1tpZF07Ci0Jc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lID0gJmRldl9wcml2LT5lbmdpbmVbaWRdOwotCi0JZW5naW5lLT5pZCA9 IGlkOwotCWVuZ2luZS0+aTkxNSA9IGRldl9wcml2OwotCWVuZ2luZS0+bmFtZSA9IGluZm8tPm5h bWU7Ci0JZW5naW5lLT5leGVjX2lkID0gaW5mby0+ZXhlY19pZDsKLQllbmdpbmUtPmh3X2lkID0g ZW5naW5lLT5ndWNfaWQgPSBpbmZvLT5ndWNfaWQ7Ci0JZW5naW5lLT5tbWlvX2Jhc2UgPSBpbmZv LT5tbWlvX2Jhc2U7Ci0JZW5naW5lLT5pcnFfc2hpZnQgPSBpbmZvLT5pcnFfc2hpZnQ7Ci0KLQly ZXR1cm4gZW5naW5lOwotfQotCi0vKioKLSAqIGludGVsX2VuZ2luZXNfaW5pdCgpIC0gYWxsb2Nh dGUsIHBvcHVsYXRlIGFuZCBpbml0IHRoZSBFbmdpbmUgQ29tbWFuZCBTdHJlYW1lcnMKLSAqIEBk ZXY6IERSTSBkZXZpY2UuCi0gKgotICogUmV0dXJuOiBub24temVybyBpZiB0aGUgaW5pdGlhbGl6 YXRpb24gZmFpbGVkLgotICovCi1pbnQgaW50ZWxfZW5naW5lc19pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwotCXVuc2lnbmVkIGludCBtYXNrID0gMDsKLQlpbnQgKCppbml0KShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpOwotCXVuc2lnbmVkIGludCBpOwotCWludCByZXQ7Ci0KLQlX QVJOX09OKElOVEVMX0lORk8oZGV2X3ByaXYpLT5yaW5nX21hc2sgJgotCQlHRU5NQVNLKHNpemVv ZihtYXNrKSAqIEJJVFNfUEVSX0JZVEUgLSAxLCBJOTE1X05VTV9FTkdJTkVTKSk7Ci0KLQlmb3Ig KGkgPSAwOyBpIDwgQVJSQVlfU0laRShpbnRlbF9lbmdpbmVzKTsgaSsrKSB7Ci0JCWlmICghSEFT X0VOR0lORShkZXZfcHJpdiwgaSkpCi0JCQljb250aW51ZTsKLQotCQlpZiAoaTkxNS5lbmFibGVf ZXhlY2xpc3RzKQotCQkJaW5pdCA9IGludGVsX2VuZ2luZXNbaV0uaW5pdF9leGVjbGlzdHM7Ci0J CWVsc2UKLQkJCWluaXQgPSBpbnRlbF9lbmdpbmVzW2ldLmluaXRfbGVnYWN5OwotCi0JCWlmICgh aW5pdCkKLQkJCWNvbnRpbnVlOwotCi0JCXJldCA9IGluaXQoaW50ZWxfZW5naW5lX3NldHVwKGRl dl9wcml2LCBpKSk7Ci0JCWlmIChyZXQpCi0JCQlnb3RvIGNsZWFudXA7Ci0KLQkJbWFzayB8PSBF TkdJTkVfTUFTSyhpKTsKLQl9Ci0KLQkvKgotCSAqIENhdGNoIGZhaWx1cmVzIHRvIHVwZGF0ZSBp bnRlbF9lbmdpbmVzIHRhYmxlIHdoZW4gdGhlIG5ldyBlbmdpbmVzCi0JICogYXJlIGFkZGVkIHRv IHRoZSBkcml2ZXIgYnkgYSB3YXJuaW5nIGFuZCBkaXNhYmxpbmcgdGhlIGZvcmdvdHRlbgotCSAq IGVuZ2luZXMuCi0JICovCi0JaWYgKFdBUk5fT04obWFzayAhPSBJTlRFTF9JTkZPKGRldl9wcml2 KS0+cmluZ19tYXNrKSkgewotCQlzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gKmluZm8gPQotCQkJ KHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyAqKSZkZXZfcHJpdi0+aW5mbzsKLQkJaW5mby0+cmlu Z19tYXNrID0gbWFzazsKLQl9Ci0KLQlyZXR1cm4gMDsKLQotY2xlYW51cDoKLQlmb3IgKGkgPSAw OyBpIDwgSTkxNV9OVU1fRU5HSU5FUzsgaSsrKSB7Ci0JCWlmIChpOTE1LmVuYWJsZV9leGVjbGlz dHMpCi0JCQlpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cCgmZGV2X3ByaXYtPmVuZ2luZVtpXSk7 Ci0JCWVsc2UKLQkJCWludGVsX2NsZWFudXBfZW5naW5lKCZkZXZfcHJpdi0+ZW5naW5lW2ldKTsK LQl9Ci0KLQlyZXR1cm4gcmV0OwotfQotCiBzdGF0aWMgdTMyCiBtYWtlX3JwY3Moc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAppbmRl eCBhYTg5MDVjNDJkZTcuLjkzOGUzZWVjMDZjZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgK QEAgLTY3LDYgKzY3LDkgQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4 dHJhcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QKIGludCBpbnRlbF9sb2dp Y2FsX3JpbmdfcmVzZXJ2ZV9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVl c3QpOwogdm9pZCBpbnRlbF9sb2dpY2FsX3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpOwogdm9pZCBpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpOworaW50IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworaW50IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworCiBpbnQgaW50ZWxfZW5naW5lc19pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCiBpbnQgbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNo ZXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGEyNWVhYzE3ZWZjZC4uZGI3NjEzZThkNTg1IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0zNjIsMTAgKzM2Miw2IEBA IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgewogCXUzMiAoKmdldF9jbWRfbGVuZ3RoX21hc2spKHUz MiBjbWRfaGVhZGVyKTsKIH07CiAKLXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKgotaW50ZWxfZW5n aW5lX3NldHVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJICAgZW51bSBp bnRlbF9lbmdpbmVfaWQgaWQpOwotCiBzdGF0aWMgaW5saW5lIGJvb2wKIGludGVsX2VuZ2luZV9p bml0aWFsaXplZChjb25zdCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==