From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arkadiusz Hiler Subject: [PATCH 06/11] drm/i915/guc: Extract param logic form guc_init_fw() Date: Mon, 13 Mar 2017 14:15:03 +0100 Message-ID: <20170313131508.24439-7-arkadiusz.hiler@intel.com> References: <20170313131508.24439-1-arkadiusz.hiler@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 8FDDE6E4F1 for ; Mon, 13 Mar 2017 13:15:29 +0000 (UTC) In-Reply-To: <20170313131508.24439-1-arkadiusz.hiler@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 TGV0IGludGVsX2d1Y19pbml0X2Z3KCkgZm9jdXMgb24gZGV0ZXJtaW5pbmcgYW5kIGZldGNoaW5n IHRoZSBjb3JyZWN0CmZpcm13YXJlLgoKVGhpcyBwYXRjaCBpbnRyb2R1Y2VzIGludGVsX3VjX3Nh bml0aXplX29wdGlvbnMoKSB0aGF0IGlzIGNhbGxlZCBmcm9tCmludGVsX3Nhbml0aXplX29wdGlv bnMoKS4KClRoZW4sIGlmIHdlIGhhdmUgR3VDLCB3ZSBjYW4gY2FsbCBpbnRlbF9ndWNfaW5pdF9m dygpIGNvbmRpdGlvbmFsbHkKYW5kIHdlIGRvIG5vdCBoYXZlIHRvIGRvIHRoZSBpbnRlcm5hbCBj aGVja3MuCgp2MjogZml4IGNvbW1lbnQsIG5vdGlmeSB3aGVuIG51a2luZyBHdUMgZXhwbGljaXRs eSBlbmFibGVkIChNLiBXYWpkZWN6a28pCnYzOiBmaXggY29tbWVudCBhZ2FpbiwgY2hhbmdlIHRo ZSBudWtlIG1lc3NhZ2UgKE0uIFdhamRlY3prbykKdjQ6IHVwZGF0ZSB0aXRsZSB0byByZWZsZWN0 IG5ldyBmdW5jdGlvbiBuYW1lICsgcmViYXNlCnY1OiB0ZXh0ICYmIHJlbW92ZSAyIHVuZWNjZXNz YXJ5IGNoZWNrcyAoTS4gV2FqZGVjemtvKQoKQ2M6IE1pY2hhbCBXaW5pYXJza2kgPG1pY2hhbC53 aW5pYXJza2lAaW50ZWwuY29tPgpDYzogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3pr b0BpbnRlbC5jb20+CkNjOiBEYW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9z cHVyaW9AaW50ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGlu dXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcmthZGl1c3ogSGlsZXIgPGFya2FkaXVzei5o aWxlckBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0 aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YyAgICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIu YyB8IDE4ICstLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVj LmMgICAgICAgIHwgIDMgLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jICAgICAg ICAgfCAyOCArKysrKysrKysrKysrKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Yy5oICAgICAgICAgfCAgMSArCiA1IGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlv bnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDE1NGVh MmYuLmQ1NDZjNjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtOTkxLDYgKzk5MSw4IEBA IHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX29wdGlvbnMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCiAJaTkxNS5zZW1hcGhvcmVzID0gaW50ZWxfc2FuaXRpemVfc2VtYXBo b3JlcyhkZXZfcHJpdiwgaTkxNS5zZW1hcGhvcmVzKTsKIAlEUk1fREVCVUdfRFJJVkVSKCJ1c2Ug R1BVIHNlbWFwaG9yZXM/ICVzXG4iLCB5ZXNubyhpOTE1LnNlbWFwaG9yZXMpKTsKKworCWludGVs X3VjX3Nhbml0aXplX29wdGlvbnMoZGV2X3ByaXYpOwogfQogCiAvKioKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCAzYTM3ZDE0Li5lNzMyMjY2IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC01MzQsMjAgKzUzNCw3IEBAIHZvaWQg aW50ZWxfZ3VjX2luaXRfZncoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7CiAJY29uc3QgY2hhciAqZndf cGF0aDsKIAotCWlmICghSEFTX0dVQyhkZXZfcHJpdikpIHsKLQkJaTkxNS5lbmFibGVfZ3VjX2xv YWRpbmcgPSAwOwotCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IDA7Ci0JfSBlbHNlIHsK LQkJLyogQSBuZWdhdGl2ZSB2YWx1ZSBtZWFucyAidXNlIHBsYXRmb3JtIGRlZmF1bHQiICovCi0J CWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA8IDApCi0JCQlpOTE1LmVuYWJsZV9ndWNfbG9h ZGluZyA9IEhBU19HVUNfVUNPREUoZGV2X3ByaXYpOwotCQlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1 Ym1pc3Npb24gPCAwKQotCQkJaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24gPSBIQVNfR1VDX1ND SEVEKGRldl9wcml2KTsKLQl9Ci0KLQlpZiAoIUhBU19HVUNfVUNPREUoZGV2X3ByaXYpKSB7Ci0J CWZ3X3BhdGggPSBOVUxMOwotCX0gZWxzZSBpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpIHsKKwlp ZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpIHsKIAkJZndfcGF0aCA9IEk5MTVfU0tMX0dVQ19VQ09E RTsKIAkJZ3VjLT5mdy5tYWpvcl92ZXJfd2FudGVkID0gU0tMX0ZXX01BSk9SOwogCQlndWMtPmZ3 Lm1pbm9yX3Zlcl93YW50ZWQgPSBTS0xfRldfTUlOT1I7CkBAIC01NjcsOSArNTU0LDYgQEAgdm9p ZCBpbnRlbF9ndWNfaW5pdF9mdyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJZ3VjLT5mdy5mZXRj aF9zdGF0dXMgPSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOwogCWd1Yy0+ZncubG9hZF9zdGF0dXMg PSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOwogCi0JLyogRWFybHkgKGFuZCBzaWxlbnQpIHJldHVy biBpZiBHdUMgbG9hZGluZyBpcyBkaXNhYmxlZCAqLwotCWlmICghaTkxNS5lbmFibGVfZ3VjX2xv YWRpbmcpCi0JCXJldHVybjsKIAlpZiAoZndfcGF0aCA9PSBOVUxMKQogCQlyZXR1cm47CiAJaWYg KCpmd19wYXRoID09ICdcMCcpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9odWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCmluZGV4IGZkYTQ3M2Qu LjE2OGFhYjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCkBAIC0xNjIsOSArMTYyLDYgQEAg dm9pZCBpbnRlbF9odWNfaW5pdF9mdyhzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiAJaHVjLT5mdy5s b2FkX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1XQVJFX05PTkU7CiAJaHVjLT5mdy5mdyA9IElOVEVM X1VDX0ZXX1RZUEVfSFVDOwogCi0JaWYgKCFIQVNfSFVDX1VDT0RFKGRldl9wcml2KSkKLQkJcmV0 dXJuOwotCiAJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKSB7CiAJCWZ3X3BhdGggPSBJOTE1X1NL TF9IVUNfVUNPREU7CiAJCWh1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IFNLTF9IVUNfRldfTUFK T1I7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwppbmRleCBlNTE1NWRlLi5mMGE2OWQ0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VjLmMKQEAgLTI2LDYgKzI2LDI3IEBACiAjaW5jbHVkZSAiaW50ZWxfdWMu aCIKICNpbmNsdWRlIDxsaW51eC9maXJtd2FyZS5oPgogCit2b2lkIGludGVsX3VjX3Nhbml0aXpl X29wdGlvbnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCWlmICghSEFT X0dVQyhkZXZfcHJpdikpIHsKKwkJaWYgKGk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nID4gMCkKKwkJ CURSTV9JTkZPKCJJZ25vcmluZyBHdUMgb3B0aW9ucywgbm8gaGFyZHdhcmUiKTsKKworCQlpOTE1 LmVuYWJsZV9ndWNfbG9hZGluZyA9IDA7CisJCWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uID0g MDsKKwl9IGVsc2UgeworCQkvKiBBIG5lZ2F0aXZlIHZhbHVlIG1lYW5zICJ1c2UgcGxhdGZvcm0g ZGVmYXVsdCIgKi8KKwkJaWYgKGk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nIDwgMCkKKwkJCWk5MTUu ZW5hYmxlX2d1Y19sb2FkaW5nID0gSEFTX0dVQ19VQ09ERShkZXZfcHJpdik7CisJCWlmIChpOTE1 LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA8IDApCisJCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lv biA9IEhBU19HVUNfU0NIRUQoZGV2X3ByaXYpOworCisJCS8qIENhbid0IGVuYWJsZSBndWMgc3Vi bWlzc2lvbiB3aXRob3V0IGd1YyBsb2FkZWQgKi8KKwkJaWYgKCFpOTE1LmVuYWJsZV9ndWNfbG9h ZGluZykKKwkJCWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uID0gMDsKKwl9Cit9CisKIHZvaWQg aW50ZWxfdWNfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7 CiAJbXV0ZXhfaW5pdCgmZGV2X3ByaXYtPmd1Yy5zZW5kX211dGV4KTsKQEAgLTMzLDcgKzU0LDEy IEBAIHZvaWQgaW50ZWxfdWNfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAKIHZvaWQgaW50ZWxfdWNfaW5pdF9mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiB7Ci0JaW50ZWxfaHVjX2luaXRfZncoJmRldl9wcml2LT5odWMpOworCWlmICgh aTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpCisJCXJldHVybjsKKworCWlmIChIQVNfSFVDX1VDT0RF KGRldl9wcml2KSkKKwkJaW50ZWxfaHVjX2luaXRfZncoJmRldl9wcml2LT5odWMpOworCiAJaW50 ZWxfZ3VjX2luaXRfZncoJmRldl9wcml2LT5ndWMpOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMu aAppbmRleCAyNmQ1YzZhLi5jNTE3OWVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKQEAgLTE4 NCw2ICsxODQsNyBAQCBzdHJ1Y3QgaW50ZWxfaHVjIHsKIH07CiAKIC8qIGludGVsX3VjLmMgKi8K K3ZvaWQgaW50ZWxfdWNfc2FuaXRpemVfb3B0aW9ucyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpOwogdm9pZCBpbnRlbF91Y19pbml0X2Vhcmx5KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX3VjX2luaXRfZncoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfdWNfcHJlcGFyZV9mdyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==