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: Fri, 17 Feb 2017 14:05:55 +0100 Message-ID: <20170217130557.6710-7-arkadiusz.hiler@intel.com> References: <20170217130557.6710-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 7B9ED6ECF6 for ; Fri, 17 Feb 2017 13:06:16 +0000 (UTC) In-Reply-To: <20170217130557.6710-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 ZyB0aGUgY29ycmVjdApmaXJtd2FyZS4KClRoaXMgcGF0Y2ggaW50cm9kdWNlcyBpbnRlbF9zYW5p dGl6ZV91Y19wYXJhbXMoKSB0aGF0IGlzIGNhbGxlZCBmcm9tCmludGVsX3Nhbml0aXplX29wdGlv bnMoKS4KClRoZW4sIGlmIHdlIGhhdmUgR3VDLCB3ZSBjYW4gY2FsbCBpbnRlbF9ndWNfZmV0Y2hf ZncoKSBjb25kaXRpb25hbGx5IGFuZAp3ZSBkbyBub3QgaGF2ZSB0byBkbyB0aGUgaW50ZXJuYWwg Y2hlY2tzLgoKdjI6IGZpeCBjb21tZW50LCBub3RpZnkgd2hlbiBudWtpbmcgR3VDIGV4cGxpY2l0 bHkgZW5hYmxlZCAoTS4gV2FqZGVjemtvKQoKQ2M6IE1pY2hhbCBXaW5pYXJza2kgPG1pY2hhbC53 aW5pYXJza2lAaW50ZWwuY29tPgpDYzogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3pr b0BpbnRlbC5jb20+CkNjOiBEYW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9z cHVyaW9AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcmthZGl1c3ogSGlsZXIgPGFya2FkaXVz ei5oaWxlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAg ICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8 IDE2ICstLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgICAg ICAgICB8IDI3ICsrKysrKysrKysrKysrKysrKysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdWMuaCAgICAgICAgIHwgIDEgKwogNCBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRp b25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA0NWZh ZTk3Li42ODdmN2MwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTk5Myw2ICs5OTMsOCBA QCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9vcHRpb25zKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAogCWk5MTUuc2VtYXBob3JlcyA9IGludGVsX3Nhbml0aXplX3NlbWFw aG9yZXMoZGV2X3ByaXYsIGk5MTUuc2VtYXBob3Jlcyk7CiAJRFJNX0RFQlVHX0RSSVZFUigidXNl IEdQVSBzZW1wYWhvcmVzPyAlc1xuIiwgeWVzbm8oaTkxNS5zZW1hcGhvcmVzKSk7CisKKwlpbnRl bF91Y19zYW5pdGl6ZV9wYXJhbXMoZGV2X3ByaXYpOwogfQogCiAvKioKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCAxMTBkZmQxLi5lNzRjMTI3IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC01ODgsNyArNTg4LDcgQEAgaW50IGlu dGVsX2d1Y19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCiAv KioKLSAqIGludGVsX2d1Y19mZXRjaF9mdygpIC0gZGVmaW5lIHBhcmFtZXRlcnMgYW5kIGZldGNo IGZpcm13YXJlCisgKiBpbnRlbF9ndWNfZmV0Y2hfZncoKSAtIGRldGVybWluZSBhbmQgZmV0Y2gg ZmlybXdhcmUKICAqIEBndWM6CWludGVsX2d1YyBzdHJ1Y3QKICAqCiAgKiBDYWxsZWQgZWFybHkg ZHVyaW5nIGRyaXZlciBsb2FkLCBidXQgYWZ0ZXIgR0VNIGlzIGluaXRpYWxpc2VkLgpAQCAtNjAx LDE3ICs2MDEsNiBAQCB2b2lkIGludGVsX2d1Y19mZXRjaF9mdyhzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3Vj KTsKIAljb25zdCBjaGFyICpmd19wYXRoOwogCi0JaWYgKCFIQVNfR1VDKGRldl9wcml2KSkgewot CQlpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA9IDA7Ci0JCWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNz aW9uID0gMDsKLQl9IGVsc2UgewotCQkvKiBBIG5lZ2F0aXZlIHZhbHVlIG1lYW5zICJ1c2UgcGxh dGZvcm0gZGVmYXVsdCIgKi8KLQkJaWYgKGk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nIDwgMCkKLQkJ CWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nID0gSEFTX0dVQ19VQ09ERShkZXZfcHJpdik7Ci0JCWlm IChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA8IDApCi0JCQlpOTE1LmVuYWJsZV9ndWNfc3Vi bWlzc2lvbiA9IEhBU19HVUNfU0NIRUQoZGV2X3ByaXYpOwotCX0KLQogCWlmICghSEFTX0dVQ19V Q09ERShkZXZfcHJpdikpIHsKIAkJZndfcGF0aCA9IE5VTEw7CiAJfSBlbHNlIGlmIChJU19TS1lM QUtFKGRldl9wcml2KSkgewpAQCAtNjM0LDkgKzYyMyw2IEBAIHZvaWQgaW50ZWxfZ3VjX2ZldGNo X2Z3KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAlndWMtPmZ3LmZldGNoX3N0YXR1cyA9IElOVEVM X1VDX0ZJUk1XQVJFX05PTkU7CiAJZ3VjLT5mdy5sb2FkX3N0YXR1cyA9IElOVEVMX1VDX0ZJUk1X QVJFX05PTkU7CiAKLQkvKiBFYXJseSAoYW5kIHNpbGVudCkgcmV0dXJuIGlmIEd1QyBsb2FkaW5n IGlzIGRpc2FibGVkICovCi0JaWYgKCFpOTE1LmVuYWJsZV9ndWNfbG9hZGluZykKLQkJcmV0dXJu OwogCWlmIChmd19wYXRoID09IE5VTEwpCiAJCXJldHVybjsKIAlpZiAoKmZ3X3BhdGggPT0gJ1ww JykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCmluZGV4IGQyZDJiNmMuLmVmOWRjNzIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdWMuYwpAQCAtMjksNiArMjksMjcgQEAKIHN0YXRpYyB2b2lkIHVjX2ZldGNo X2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgc3RydWN0IGludGVs X3VjX2Z3ICp1Y19mdyk7CiAKK3ZvaWQgaW50ZWxfdWNfc2FuaXRpemVfcGFyYW1zKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlpZiAoIUhBU19HVUMoZGV2X3ByaXYpKSB7 CisJCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA+IDApCisJCQlEUk1fSU5GTygiRGlzYWJs aW5nIEd1Qywgbm8gaGFyZHdhcmUiKTsKKworCQlpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA9IDA7 CisJCWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uID0gMDsKKwl9IGVsc2UgeworCQkvKiBBIG5l Z2F0aXZlIHZhbHVlIG1lYW5zICJ1c2UgcGxhdGZvcm0gZGVmYXVsdCIgKi8KKwkJaWYgKGk5MTUu ZW5hYmxlX2d1Y19sb2FkaW5nIDwgMCkKKwkJCWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nID0gSEFT X0dVQ19VQ09ERShkZXZfcHJpdik7CisJCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA8 IDApCisJCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IEhBU19HVUNfU0NIRUQoZGV2X3By aXYpOworCX0KKworCS8qIGNhbid0IGVuYWJsZSBndWMgc3VibWlzc2lvbiB3aXRob3V0IGd1YyBs b2FkZWQgKi8KKwlpZiAoIWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nKQorCQlpOTE1LmVuYWJsZV9n dWNfc3VibWlzc2lvbiA9IDA7Cit9CisKIHZvaWQgaW50ZWxfdWNfaW5pdF9lYXJseShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJbXV0ZXhfaW5pdCgmZGV2X3ByaXYtPmd1 Yy5zZW5kX211dGV4KTsKQEAgLTM2LDggKzU3LDEyIEBAIHZvaWQgaW50ZWxfdWNfaW5pdF9lYXJs eShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHZvaWQgaW50ZWxfZmV0Y2hf dWNfZncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogeworCWlmICghaTkxNS5l bmFibGVfZ3VjX2xvYWRpbmcpCisJCXJldHVybjsKKwogCWRldl9wcml2LT5odWMuZncuZmV0Y2gg PSB1Y19mZXRjaF9mdzsKLQlpbnRlbF9odWNfZmV0Y2hfZncoJmRldl9wcml2LT5odWMpOworCWlm IChIQVNfSFVDX1VDT0RFKGRldl9wcml2KSkKKwkJaW50ZWxfaHVjX2ZldGNoX2Z3KCZkZXZfcHJp di0+aHVjKTsKIAogCWRldl9wcml2LT5ndWMuZncuZmV0Y2ggPSB1Y19mZXRjaF9mdzsKIAlpbnRl bF9ndWNfZmV0Y2hfZncoJmRldl9wcml2LT5ndWMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKaW5k ZXggYzM5MDY2My4uMzY2NTNmMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfdWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCkBAIC0xODYsNiAr MTg2LDcgQEAgc3RydWN0IGludGVsX2h1YyB7CiB9OwogCiAvKiBpbnRlbF91Yy5jICovCit2b2lk IGludGVsX3VjX3Nhbml0aXplX3BhcmFtcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpOwogdm9pZCBpbnRlbF91Y19pbml0X2Vhcmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CiB2b2lkIGludGVsX2ZldGNoX3VjX2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7CiBpbnQgaW50ZWxfZ3VjX3NlbmQoc3RydWN0IGludGVsX2d1YyAqZ3VjLCBj b25zdCB1MzIgKmFjdGlvbiwgdTMyIGxlbik7Ci0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==