From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Wajdeczko Subject: [CI v4 7/8] drm/i915/huc: Load HuC only if requested Date: Wed, 6 Dec 2017 14:51:34 +0000 Message-ID: <20171206145135.52016-7-michal.wajdeczko@intel.com> References: <20171206145135.52016-1-michal.wajdeczko@intel.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 ESMTPS id 5D06E6E459 for ; Wed, 6 Dec 2017 14:51:48 +0000 (UTC) In-Reply-To: <20171206145135.52016-1-michal.wajdeczko@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 T3VyIG5ldyAiZW5hYmxlX2d1YyIgbW9kcGFyYW0gYWxsb3dzIHRvIGNvbnRyb2wgd2hlbmV2ZXIg SHVDCnNob3VsZCBiZSBsb2FkZWQuIEhvd2V2ZXIgZXhpc3RpbmcgY29kZSB3aWxsIHRyeSBsb2Fk IGFuZAphdXRoZW50aWNhdGUgSHVDIGFsd2F5cyB3aGVuIHdlIHVzZSB0aGUgR3VDLiBUaGlzIHBh dGNoIGlzCnRyeWluZyB0byBlbmZvcmNlIG1vZHBhcmFtIHNlbGVjdGlvbi4KCnYyOiBubyBuZWVk IHRvIGNhc3QgUFRSX0VSUiAoQ2hyaXMpCiAgICBmZXRjaC9maW5pIG9ubHkgaWYgcmVxdWlyZWQg KE1pY2hhbCkKICAgIGZpeCB3cm9uZyBicmVhayAoU2FnYXIpCnYzOiBhZGQgbmV3IGdvdG8gbGFi ZWwgKFNhZ2FyKQoKU2lnbmVkLW9mZi1ieTogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRl Y3prb0BpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51 az4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4K Q2M6IFNhZ2FyIEFydW4gS2FtYmxlIDxzYWdhci5hLmthbWJsZUBpbnRlbC5jb20+ClJldmlld2Vk LWJ5OiBTYWdhciBBcnVuIEthbWJsZSA8c2FnYXIuYS5rYW1ibGVAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jIHwgMjEgKysrKysrKysrKystLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuaCB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VjLmMgIHwgMjggKysrKysrKysrKysrKysrKysrKysrKystLS0tLQog MyBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2h1Yy5jCmluZGV4IDZkMGUwNTAuLjk3NGJlM2QgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2h1Yy5jCkBAIC0xODEsMTcgKzE4MSwxNyBAQCBzdGF0aWMgaW50IGh1Y191Y29kZV94 ZmVyKHN0cnVjdCBpbnRlbF91Y19mdyAqaHVjX2Z3LCBzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKICAq IGludGVsX2h1Y19pbml0X2h3KCkgLSBsb2FkIEh1QyB1Q29kZSB0byBkZXZpY2UKICAqIEBodWM6 IGludGVsX2h1YyBzdHJ1Y3R1cmUKICAqCi0gKiBDYWxsZWQgZnJvbSBndWNfc2V0dXAoKSBkdXJp bmcgZHJpdmVyIGxvYWRpbmcgYW5kIGFsc28gYWZ0ZXIgYSBHUFUgcmVzZXQuCi0gKiBCZSBub3Rl IHRoYXQgSHVDIGxvYWRpbmcgbXVzdCBiZSBkb25lIGJlZm9yZSBHdUMgbG9hZGluZy4KKyAqIENh bGxlZCBmcm9tIGludGVsX3VjX2luaXRfaHcoKSBkdXJpbmcgZHJpdmVyIGxvYWRpbmcgYW5kIGFs c28gYWZ0ZXIgYSBHUFUKKyAqIHJlc2V0LiBCZSBub3RlIHRoYXQgSHVDIGxvYWRpbmcgbXVzdCBi ZSBkb25lIGJlZm9yZSBHdUMgbG9hZGluZy4KICAqCiAgKiBUaGUgZmlybXdhcmUgaW1hZ2Ugc2hv dWxkIGhhdmUgYWxyZWFkeSBiZWVuIGZldGNoZWQgaW50byBtZW1vcnkgYnkgdGhlCi0gKiBlYXJs aWVyIGNhbGwgdG8gaW50ZWxfaHVjX2luaXQoKSwgc28gaGVyZSB3ZSBuZWVkIG9ubHkgY2hlY2sg dGhhdAorICogZWFybGllciBjYWxsIHRvIGludGVsX3VjX2luaXRfZncoKSwgc28gaGVyZSB3ZSBu ZWVkIG9ubHkgY2hlY2sgdGhhdAogICogaXMgc3VjY2VlZGVkLCBhbmQgdGhlbiB0cmFuc2ZlciB0 aGUgaW1hZ2UgdG8gdGhlIGgvdy4KICAqCiAgKi8KLXZvaWQgaW50ZWxfaHVjX2luaXRfaHcoc3Ry dWN0IGludGVsX2h1YyAqaHVjKQoraW50IGludGVsX2h1Y19pbml0X2h3KHN0cnVjdCBpbnRlbF9o dWMgKmh1YykKIHsKLQlpbnRlbF91Y19md191cGxvYWQoJmh1Yy0+ZncsIGh1Y191Y29kZV94ZmVy KTsKKwlyZXR1cm4gaW50ZWxfdWNfZndfdXBsb2FkKCZodWMtPmZ3LCBodWNfdWNvZGVfeGZlcik7 CiB9CiAKIC8qKgpAQCAtMjA1LDcgKzIwNSw3IEBAIHZvaWQgaW50ZWxfaHVjX2luaXRfaHcoc3Ry dWN0IGludGVsX2h1YyAqaHVjKQogICogc2lnbmF0dXJlIHRocm91Z2ggaW50ZWxfZ3VjX2F1dGhf aHVjKCkuIEl0IHRoZW4gd2FpdHMgZm9yIDUwbXMgZm9yCiAgKiBmaXJtd2FyZSB2ZXJpZmljYXRp b24gQUNLIGFuZCB1bnBpbnMgdGhlIG9iamVjdC4KICAqLwotdm9pZCBpbnRlbF9odWNfYXV0aChz dHJ1Y3QgaW50ZWxfaHVjICpodWMpCitpbnQgaW50ZWxfaHVjX2F1dGgoc3RydWN0IGludGVsX2h1 YyAqaHVjKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gaHVjX3RvX2k5MTUo aHVjKTsKIAlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmaTkxNS0+Z3VjOwpAQCAtMjEzLDE0ICsy MTMsMTQgQEAgdm9pZCBpbnRlbF9odWNfYXV0aChzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiAJaW50 IHJldDsKIAogCWlmIChodWMtPmZ3LmxvYWRfc3RhdHVzICE9IElOVEVMX1VDX0ZJUk1XQVJFX1NV Q0NFU1MpCi0JCXJldHVybjsKKwkJcmV0dXJuIC1FTk9FWEVDOwogCiAJdm1hID0gaTkxNV9nZW1f b2JqZWN0X2dndHRfcGluKGh1Yy0+Zncub2JqLCBOVUxMLCAwLCAwLAogCQkJCVBJTl9PRkZTRVRf QklBUyB8IEdVQ19XT1BDTV9UT1ApOwogCWlmIChJU19FUlIodm1hKSkgewotCQlEUk1fRVJST1Io ImZhaWxlZCB0byBwaW4gaHVjIGZ3IG9iamVjdCAlZFxuIiwKLQkJCQkoaW50KVBUUl9FUlIodm1h KSk7Ci0JCXJldHVybjsKKwkJcmV0ID0gUFRSX0VSUih2bWEpOworCQlEUk1fRVJST1IoIkh1Qzog RmFpbGVkIHRvIHBpbiBodWMgZncgb2JqZWN0ICVkXG4iLCByZXQpOworCQlyZXR1cm4gcmV0Owog CX0KIAogCXJldCA9IGludGVsX2d1Y19hdXRoX2h1YyhndWMsCkBAIC0yNDMsNCArMjQzLDUgQEAg dm9pZCBpbnRlbF9odWNfYXV0aChzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiAKIG91dDoKIAlpOTE1 X3ZtYV91bnBpbih2bWEpOworCXJldHVybiByZXQ7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9odWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5o CmluZGV4IDNkNzU3YmMuLjQwMDM5ZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2h1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5oCkBAIC0z NSw3ICszNSw3IEBAIHN0cnVjdCBpbnRlbF9odWMgewogfTsKIAogdm9pZCBpbnRlbF9odWNfaW5p dF9lYXJseShzdHJ1Y3QgaW50ZWxfaHVjICpodWMpOwotdm9pZCBpbnRlbF9odWNfaW5pdF9odyhz dHJ1Y3QgaW50ZWxfaHVjICpodWMpOwotdm9pZCBpbnRlbF9odWNfYXV0aChzdHJ1Y3QgaW50ZWxf aHVjICpodWMpOworaW50IGludGVsX2h1Y19pbml0X2h3KHN0cnVjdCBpbnRlbF9odWMgKmh1Yyk7 CitpbnQgaW50ZWxfaHVjX2F1dGgoc3RydWN0IGludGVsX2h1YyAqaHVjKTsKIAogI2VuZGlmCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdWMuYwppbmRleCA3ZGZjN2UwLi40NjEwNDdjIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VjLmMKQEAgLTExOSw3ICsxMTksOSBAQCB2b2lkIGludGVsX3VjX2luaXRfZncoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmICghVVNFU19HVUMoZGV2X3ByaXYp KQogCQlyZXR1cm47CiAKLQlpbnRlbF91Y19md19mZXRjaChkZXZfcHJpdiwgJmRldl9wcml2LT5o dWMuZncpOworCWlmIChVU0VTX0hVQyhkZXZfcHJpdikpCisJCWludGVsX3VjX2Z3X2ZldGNoKGRl dl9wcml2LCAmZGV2X3ByaXYtPmh1Yy5mdyk7CisKIAlpbnRlbF91Y19md19mZXRjaChkZXZfcHJp diwgJmRldl9wcml2LT5ndWMuZncpOwogfQogCkBAIC0xMjksNyArMTMxLDkgQEAgdm9pZCBpbnRl bF91Y19maW5pX2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJu OwogCiAJaW50ZWxfdWNfZndfZmluaSgmZGV2X3ByaXYtPmd1Yy5mdyk7Ci0JaW50ZWxfdWNfZndf ZmluaSgmZGV2X3ByaXYtPmh1Yy5mdyk7CisKKwlpZiAoVVNFU19IVUMoZGV2X3ByaXYpKQorCQlp bnRlbF91Y19md19maW5pKCZkZXZfcHJpdi0+aHVjLmZ3KTsKIH0KIAogLyoqCkBAIC0xODYsNiAr MTkwLDcgQEAgc3RhdGljIHZvaWQgZ3VjX2Rpc2FibGVfY29tbXVuaWNhdGlvbihzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMpCiBpbnQgaW50ZWxfdWNfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9wcml2LT5ndWM7 CisJc3RydWN0IGludGVsX2h1YyAqaHVjID0gJmRldl9wcml2LT5odWM7CiAJaW50IHJldCwgYXR0 ZW1wdHM7CiAKIAlpZiAoIVVTRVNfR1VDKGRldl9wcml2KSkKQEAgLTIzMyw3ICsyMzgsMTIgQEAg aW50IGludGVsX3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CQlpZiAocmV0KQogCQkJZ290byBlcnJfc3VibWlzc2lvbjsKIAotCQlpbnRlbF9odWNfaW5pdF9o dygmZGV2X3ByaXYtPmh1Yyk7CisJCWlmIChVU0VTX0hVQyhkZXZfcHJpdikpIHsKKwkJCXJldCA9 IGludGVsX2h1Y19pbml0X2h3KGh1Yyk7CisJCQlpZiAocmV0KQorCQkJCWdvdG8gZXJyX3N1Ym1p c3Npb247CisJCX0KKwogCQlpbnRlbF9ndWNfaW5pdF9wYXJhbXMoZ3VjKTsKIAkJcmV0ID0gaW50 ZWxfZ3VjX2Z3X3VwbG9hZChndWMpOwogCQlpZiAocmV0ID09IDAgfHwgcmV0ICE9IC1FQUdBSU4p CkBAIC0yNTEsNyArMjYxLDEyIEBAIGludCBpbnRlbF91Y19pbml0X2h3KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAocmV0KQogCQlnb3RvIGVycl9sb2dfY2FwdHVyZTsK IAotCWludGVsX2h1Y19hdXRoKCZkZXZfcHJpdi0+aHVjKTsKKwlpZiAoVVNFU19IVUMoZGV2X3By aXYpKSB7CisJCXJldCA9IGludGVsX2h1Y19hdXRoKGh1Yyk7CisJCWlmIChyZXQpCisJCQlnb3Rv IGVycl9jb21tdW5pY2F0aW9uOworCX0KKwogCWlmIChVU0VTX0dVQ19TVUJNSVNTSU9OKGRldl9w cml2KSkgewogCQlpZiAoaTkxNV9tb2RwYXJhbXMuZ3VjX2xvZ19sZXZlbCA+PSAwKQogCQkJZ2Vu OV9lbmFibGVfZ3VjX2ludGVycnVwdHMoZGV2X3ByaXYpOwpAQCAtMjY1LDYgKzI4MCw4IEBAIGlu dCBpbnRlbF91Y19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJ IGd1Yy0+ZncubWFqb3JfdmVyX2ZvdW5kLCBndWMtPmZ3Lm1pbm9yX3Zlcl9mb3VuZCk7CiAJZGV2 X2luZm8oZGV2X3ByaXYtPmRybS5kZXYsICJHdUMgc3VibWlzc2lvbiAlc1xuIiwKIAkJIGVuYWJs ZWRkaXNhYmxlZChVU0VTX0dVQ19TVUJNSVNTSU9OKGRldl9wcml2KSkpOworCWRldl9pbmZvKGRl dl9wcml2LT5kcm0uZGV2LCAiSHVDICVzXG4iLAorCQkgZW5hYmxlZGRpc2FibGVkKFVTRVNfSFVD KGRldl9wcml2KSkpOwogCiAJcmV0dXJuIDA7CiAKQEAgLTI3Miw4ICsyODksOSBAQCBpbnQgaW50 ZWxfdWNfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICogV2Un dmUgZmFpbGVkIHRvIGxvYWQgdGhlIGZpcm13YXJlIDooCiAJICovCiBlcnJfaW50ZXJydXB0czoK LQlndWNfZGlzYWJsZV9jb21tdW5pY2F0aW9uKGd1Yyk7CiAJZ2VuOV9kaXNhYmxlX2d1Y19pbnRl cnJ1cHRzKGRldl9wcml2KTsKK2Vycl9jb21tdW5pY2F0aW9uOgorCWd1Y19kaXNhYmxlX2NvbW11 bmljYXRpb24oZ3VjKTsKIGVycl9sb2dfY2FwdHVyZToKIAlndWNfY2FwdHVyZV9sb2FkX2Vycl9s b2coZ3VjKTsKIGVycl9zdWJtaXNzaW9uOgotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=