From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arkadiusz Hiler Subject: [PATCH 6/8] drm/i915/guc: Extract param logic form guc_init Date: Wed, 22 Feb 2017 13:41:23 +0100 Message-ID: <20170222124125.4437-7-arkadiusz.hiler@intel.com> References: <20170222124125.4437-1-arkadiusz.hiler@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id D4BB86E7FA for ; Wed, 22 Feb 2017 12:41:42 +0000 (UTC) In-Reply-To: <20170222124125.4437-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 TGV0IGludGVsX2d1Y19mZXRjaF9mdygpIGZvY3VzIG9uIGRldGVybWluaW5nIGFuZCBmZXRjaGlu ZyB0aGUgY29ycmVjdApmaXJtd2FyZS4KClRoaXMgcGF0Y2ggaW50cm9kdWNlcyBpbnRlbF91Y19z YW5pdGl6ZV9vcHRpb25zKCkgdGhhdCBpcyBjYWxsZWQgZnJvbQppbnRlbF9zYW5pdGl6ZV9vcHRp b25zKCkuCgpUaGVuLCBpZiB3ZSBoYXZlIEd1Qywgd2UgY2FuIGNhbGwgaW50ZWxfZ3VjX2ZldGNo X2Z3KCkgY29uZGl0aW9uYWxseSBhbmQKd2UgZG8gbm90IGhhdmUgdG8gZG8gdGhlIGludGVybmFs IGNoZWNrcy4KCnYyOiBmaXggY29tbWVudCwgbm90aWZ5IHdoZW4gbnVraW5nIEd1QyBleHBsaWNp dGx5IGVuYWJsZWQgKE0uIFdhamRlY3prbykKdjM6IGZpeCBjb21tZW50IGFnYWluLCBjaGFuZ2Ug dGhlIG51a2UgbWVzc2FnZSAoTS4gV2FqZGVjemtvKQoKQ2M6IE1pY2hhbCBXaW5pYXJza2kgPG1p Y2hhbC53aW5pYXJza2lAaW50ZWwuY29tPgpDYzogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndh amRlY3prb0BpbnRlbC5jb20+CkNjOiBEYW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNl cmFvbG9zcHVyaW9AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcmthZGl1c3ogSGlsZXIgPGFy a2FkaXVzei5oaWxlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYyAgICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2Fk ZXIuYyB8IDE2ICstLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Vj LmMgICAgICAgICB8IDI3ICsrKysrKysrKysrKysrKysrKysrKysrKysrLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdWMuaCAgICAgICAgIHwgIDEgKwogNCBmaWxlcyBjaGFuZ2VkLCAzMCBp bnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRl eCAwNzhhYzNlLi4yNTU5YWRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTk5Myw2ICs5 OTMsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9vcHRpb25zKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAogCWk5MTUuc2VtYXBob3JlcyA9IGludGVsX3Nhbml0aXpl X3NlbWFwaG9yZXMoZGV2X3ByaXYsIGk5MTUuc2VtYXBob3Jlcyk7CiAJRFJNX0RFQlVHX0RSSVZF UigidXNlIEdQVSBzZW1hcGhvcmVzPyAlc1xuIiwgeWVzbm8oaTkxNS5zZW1hcGhvcmVzKSk7CisK KwlpbnRlbF91Y19zYW5pdGl6ZV9vcHRpb25zKGRldl9wcml2KTsKIH0KIAogLyoqCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggMTEwZGZkMS4uZTc0YzEyNyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAtNTg4LDcgKzU4OCw3IEBA IGludCBpbnRlbF9ndWNfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAKIAogLyoqCi0gKiBpbnRlbF9ndWNfZmV0Y2hfZncoKSAtIGRlZmluZSBwYXJhbWV0ZXJzIGFu ZCBmZXRjaCBmaXJtd2FyZQorICogaW50ZWxfZ3VjX2ZldGNoX2Z3KCkgLSBkZXRlcm1pbmUgYW5k IGZldGNoIGZpcm13YXJlCiAgKiBAZ3VjOglpbnRlbF9ndWMgc3RydWN0CiAgKgogICogQ2FsbGVk IGVhcmx5IGR1cmluZyBkcml2ZXIgbG9hZCwgYnV0IGFmdGVyIEdFTSBpcyBpbml0aWFsaXNlZC4K QEAgLTYwMSwxNyArNjAxLDYgQEAgdm9pZCBpbnRlbF9ndWNfZmV0Y2hfZncoc3RydWN0IGludGVs X2d1YyAqZ3VjKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19p OTE1KGd1Yyk7CiAJY29uc3QgY2hhciAqZndfcGF0aDsKIAotCWlmICghSEFTX0dVQyhkZXZfcHJp dikpIHsKLQkJaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPSAwOwotCQlpOTE1LmVuYWJsZV9ndWNf c3VibWlzc2lvbiA9IDA7Ci0JfSBlbHNlIHsKLQkJLyogQSBuZWdhdGl2ZSB2YWx1ZSBtZWFucyAi dXNlIHBsYXRmb3JtIGRlZmF1bHQiICovCi0JCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA8 IDApCi0JCQlpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA9IEhBU19HVUNfVUNPREUoZGV2X3ByaXYp OwotCQlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24gPCAwKQotCQkJaTkxNS5lbmFibGVf Z3VjX3N1Ym1pc3Npb24gPSBIQVNfR1VDX1NDSEVEKGRldl9wcml2KTsKLQl9Ci0KIAlpZiAoIUhB U19HVUNfVUNPREUoZGV2X3ByaXYpKSB7CiAJCWZ3X3BhdGggPSBOVUxMOwogCX0gZWxzZSBpZiAo SVNfU0tZTEFLRShkZXZfcHJpdikpIHsKQEAgLTYzNCw5ICs2MjMsNiBAQCB2b2lkIGludGVsX2d1 Y19mZXRjaF9mdyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJZ3VjLT5mdy5mZXRjaF9zdGF0dXMg PSBJTlRFTF9VQ19GSVJNV0FSRV9OT05FOwogCWd1Yy0+ZncubG9hZF9zdGF0dXMgPSBJTlRFTF9V Q19GSVJNV0FSRV9OT05FOwogCi0JLyogRWFybHkgKGFuZCBzaWxlbnQpIHJldHVybiBpZiBHdUMg bG9hZGluZyBpcyBkaXNhYmxlZCAqLwotCWlmICghaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpCi0J CXJldHVybjsKIAlpZiAoZndfcGF0aCA9PSBOVUxMKQogCQlyZXR1cm47CiAJaWYgKCpmd19wYXRo ID09ICdcMCcpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwppbmRleCAyMjJhOTI4Li45MzU1OTA3IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VjLmMKQEAgLTI5LDYgKzI5LDI3IEBACiBzdGF0aWMgdm9pZCB1 Y19mZXRjaF9mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgIHN0cnVj dCBpbnRlbF91Y19mdyAqdWNfZncpOwogCit2b2lkIGludGVsX3VjX3Nhbml0aXplX29wdGlvbnMo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCWlmICghSEFTX0dVQyhkZXZf cHJpdikpIHsKKwkJaWYgKGk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nID4gMCkKKwkJCURSTV9JTkZP KCJJZ25vcmluZyBHdUMgb3B0aW9ucywgbm8gaGFyZHdhcmUiKTsKKworCQlpOTE1LmVuYWJsZV9n dWNfbG9hZGluZyA9IDA7CisJCWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uID0gMDsKKwl9IGVs c2UgeworCQkvKiBBIG5lZ2F0aXZlIHZhbHVlIG1lYW5zICJ1c2UgcGxhdGZvcm0gZGVmYXVsdCIg Ki8KKwkJaWYgKGk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nIDwgMCkKKwkJCWk5MTUuZW5hYmxlX2d1 Y19sb2FkaW5nID0gSEFTX0dVQ19VQ09ERShkZXZfcHJpdik7CisJCWlmIChpOTE1LmVuYWJsZV9n dWNfc3VibWlzc2lvbiA8IDApCisJCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IEhBU19H VUNfU0NIRUQoZGV2X3ByaXYpOworCisJCS8qIGNhbid0IGVuYWJsZSBndWMgc3VibWlzc2lvbiB3 aXRob3V0IGd1YyBsb2FkZWQgKi8KKwkJaWYgKCFpOTE1LmVuYWJsZV9ndWNfbG9hZGluZykKKwkJ CWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uID0gMDsKKwl9Cit9CisKIHZvaWQgaW50ZWxfdWNf aW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJbXV0ZXhf aW5pdCgmZGV2X3ByaXYtPmd1Yy5zZW5kX211dGV4KTsKQEAgLTM2LDggKzU3LDEyIEBAIHZvaWQg aW50ZWxfdWNfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAK IHZvaWQgaW50ZWxfdWNfZmV0Y2hfZncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogeworCWlmICghaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpCisJCXJldHVybjsKKwogCWRldl9w cml2LT5odWMuZncuZmV0Y2ggPSB1Y19mZXRjaF9mdzsKLQlpbnRlbF9odWNfZmV0Y2hfZncoJmRl dl9wcml2LT5odWMpOworCWlmIChIQVNfSFVDX1VDT0RFKGRldl9wcml2KSkKKwkJaW50ZWxfaHVj X2ZldGNoX2Z3KCZkZXZfcHJpdi0+aHVjKTsKIAogCWRldl9wcml2LT5ndWMuZncuZmV0Y2ggPSB1 Y19mZXRjaF9mdzsKIAlpbnRlbF9ndWNfZmV0Y2hfZncoJmRldl9wcml2LT5ndWMpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VjLmgKaW5kZXggYjlkMjIzMC4uY2Y1ZDBmNCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91Yy5oCkBAIC0xODYsNiArMTg2LDcgQEAgc3RydWN0IGludGVsX2h1YyB7CiB9OwogCiAvKiBp bnRlbF91Yy5jICovCit2b2lkIGludGVsX3VjX3Nhbml0aXplX29wdGlvbnMoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfdWNfaW5pdF9lYXJseShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF91Y19mZXRjaF9mdyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogaW50IGludGVsX2d1Y19zZW5kKHN0cnVj dCBpbnRlbF9ndWMgKmd1YywgY29uc3QgdTMyICphY3Rpb24sIHUzMiBsZW4pOwotLSAKMi45LjMK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=