From: Michal Wajdeczko Subject: [PATCH v3 06/14] drm/i915/guc: Reorder functions in intel_guc_fw.c Date: Thu, 12 Oct 2017 22:54:39 +0000 Message-ID: <20171012225447.256-7-michal.wajdeczko@intel.com> References: <20171012225447.256-1-michal.wajdeczko@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7608B6E9BB for ; Thu, 12 Oct 2017 22:55:05 +0000 (UTC) In-Reply-To: <20171012225447.256-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 RnVuY3Rpb25zIHNob3VsZCBiZSBkZWZpbmVkIGluIHRoZWlyIHVzZSBvcmRlci4KClNpZ25lZC1v ZmYtYnk6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgpDYzog Sm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpSZXZpZXdl ZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMgfCA4MSArKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDEgaW5zZXJ0aW9ucygrKSwgNDAgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYwppbmRleCA2MWQ2MzY5Li43 MWRhY2MzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYwpAQCAtNTYsNiArNTYsNDcg QEAgTU9EVUxFX0ZJUk1XQVJFKEk5MTVfS0JMX0dVQ19VQ09ERSk7CiAKICNkZWZpbmUgSTkxNV9H TEtfR1VDX1VDT0RFIEdVQ19GV19QQVRIKGdsaywgR0xLX0ZXX01BSk9SLCBHTEtfRldfTUlOT1Ip CiAKKy8qKgorICogaW50ZWxfZ3VjX2Z3X3NlbGVjdCgpIC0gc2VsZWN0cyBHdUMgZmlybXdhcmUg Zm9yIHVwbG9hZGluZworICoKKyAqIEBndWM6CWludGVsX2d1YyBzdHJ1Y3QKKyAqCisgKiBSZXR1 cm46IHplcm8gd2hlbiB3ZSBrbm93IGZpcm13YXJlLCBub24temVybyBpbiBvdGhlciBjYXNlCisg Ki8KK2ludCBpbnRlbF9ndWNfZndfc2VsZWN0KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKK3sKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOworCisJ aW50ZWxfdWNfZndfaW5pdCgmZ3VjLT5mdywgSU5URUxfVUNfRldfVFlQRV9HVUMpOworCisJaWYg KGk5MTVfbW9kcGFyYW1zLmd1Y19maXJtd2FyZV9wYXRoKSB7CisJCWd1Yy0+ZncucGF0aCA9IGk5 MTVfbW9kcGFyYW1zLmd1Y19maXJtd2FyZV9wYXRoOworCQlndWMtPmZ3Lm1ham9yX3Zlcl93YW50 ZWQgPSAwOworCQlndWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSAwOworCX0gZWxzZSBpZiAoSVNf U0tZTEFLRShkZXZfcHJpdikpIHsKKwkJZ3VjLT5mdy5wYXRoID0gSTkxNV9TS0xfR1VDX1VDT0RF OworCQlndWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBTS0xfRldfTUFKT1I7CisJCWd1Yy0+Zncu bWlub3JfdmVyX3dhbnRlZCA9IFNLTF9GV19NSU5PUjsKKwl9IGVsc2UgaWYgKElTX0JST1hUT04o ZGV2X3ByaXYpKSB7CisJCWd1Yy0+ZncucGF0aCA9IEk5MTVfQlhUX0dVQ19VQ09ERTsKKwkJZ3Vj LT5mdy5tYWpvcl92ZXJfd2FudGVkID0gQlhUX0ZXX01BSk9SOworCQlndWMtPmZ3Lm1pbm9yX3Zl cl93YW50ZWQgPSBCWFRfRldfTUlOT1I7CisJfSBlbHNlIGlmIChJU19LQUJZTEFLRShkZXZfcHJp dikgfHwgSVNfQ09GRkVFTEFLRShkZXZfcHJpdikpIHsKKwkJZ3VjLT5mdy5wYXRoID0gSTkxNV9L QkxfR1VDX1VDT0RFOworCQlndWMtPmZ3Lm1ham9yX3Zlcl93YW50ZWQgPSBLQkxfRldfTUFKT1I7 CisJCWd1Yy0+ZncubWlub3JfdmVyX3dhbnRlZCA9IEtCTF9GV19NSU5PUjsKKwl9IGVsc2UgaWYg KElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKSB7CisJCWd1Yy0+ZncucGF0aCA9IEk5MTVfR0xLX0dV Q19VQ09ERTsKKwkJZ3VjLT5mdy5tYWpvcl92ZXJfd2FudGVkID0gR0xLX0ZXX01BSk9SOworCQln dWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSBHTEtfRldfTUlOT1I7CisJfSBlbHNlIHsKKwkJRFJN X0VSUk9SKCJObyBHdUMgZmlybXdhcmUga25vd24gZm9yIHBsYXRmb3JtIHdpdGggR3VDIVxuIik7 CisJCXJldHVybiAtRU5PRU5UOworCX0KKworCXJldHVybiAwOworfQorCiAvKgogICogUmVhZCB0 aGUgR3VDIHN0YXR1cyByZWdpc3RlciAoR1VDX1NUQVRVUykgYW5kIHN0b3JlIGl0IGluIHRoZQog ICogc3BlY2lmaWVkIGxvY2F0aW9uOyB0aGVuIHJldHVybiBhIGJvb2xlYW4gaW5kaWNhdGluZyB3 aGV0aGVyCkBAIC0yNTYsNDMgKzI5NywzIEBAIGludCBpbnRlbF9ndWNfZndfdXBsb2FkKHN0cnVj dCBpbnRlbF9ndWMgKmd1YykKIAogCXJldHVybiAwOwogfQotCi0vKioKLSAqIGludGVsX2d1Y19m d19zZWxlY3QoKSAtIHNlbGVjdHMgR3VDIGZpcm13YXJlIGZvciBsb2FkaW5nCi0gKiBAZ3VjOglp bnRlbF9ndWMgc3RydWN0Ci0gKgotICogUmV0dXJuOiB6ZXJvIHdoZW4gd2Uga25vdyBmaXJtd2Fy ZSwgbm9uLXplcm8gaW4gb3RoZXIgY2FzZQotICovCi1pbnQgaW50ZWxfZ3VjX2Z3X3NlbGVjdChz dHJ1Y3QgaW50ZWxfZ3VjICpndWMpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKLQotCWludGVsX3VjX2Z3X2luaXQoJmd1Yy0+ZncsIElO VEVMX1VDX0ZXX1RZUEVfR1VDKTsKLQotCWlmIChpOTE1X21vZHBhcmFtcy5ndWNfZmlybXdhcmVf cGF0aCkgewotCQlndWMtPmZ3LnBhdGggPSBpOTE1X21vZHBhcmFtcy5ndWNfZmlybXdhcmVfcGF0 aDsKLQkJZ3VjLT5mdy5tYWpvcl92ZXJfd2FudGVkID0gMDsKLQkJZ3VjLT5mdy5taW5vcl92ZXJf d2FudGVkID0gMDsKLQl9IGVsc2UgaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKSB7Ci0JCWd1Yy0+ ZncucGF0aCA9IEk5MTVfU0tMX0dVQ19VQ09ERTsKLQkJZ3VjLT5mdy5tYWpvcl92ZXJfd2FudGVk ID0gU0tMX0ZXX01BSk9SOwotCQlndWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQgPSBTS0xfRldfTUlO T1I7Ci0JfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewotCQlndWMtPmZ3LnBhdGgg PSBJOTE1X0JYVF9HVUNfVUNPREU7Ci0JCWd1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IEJYVF9G V19NQUpPUjsKLQkJZ3VjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gQlhUX0ZXX01JTk9SOwotCX0g ZWxzZSBpZiAoSVNfS0FCWUxBS0UoZGV2X3ByaXYpIHx8IElTX0NPRkZFRUxBS0UoZGV2X3ByaXYp KSB7Ci0JCWd1Yy0+ZncucGF0aCA9IEk5MTVfS0JMX0dVQ19VQ09ERTsKLQkJZ3VjLT5mdy5tYWpv cl92ZXJfd2FudGVkID0gS0JMX0ZXX01BSk9SOwotCQlndWMtPmZ3Lm1pbm9yX3Zlcl93YW50ZWQg PSBLQkxfRldfTUlOT1I7Ci0JfSBlbHNlIGlmIChJU19HRU1JTklMQUtFKGRldl9wcml2KSkgewot CQlndWMtPmZ3LnBhdGggPSBJOTE1X0dMS19HVUNfVUNPREU7Ci0JCWd1Yy0+ZncubWFqb3JfdmVy X3dhbnRlZCA9IEdMS19GV19NQUpPUjsKLQkJZ3VjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gR0xL X0ZXX01JTk9SOwotCX0gZWxzZSB7Ci0JCURSTV9FUlJPUigiTm8gR3VDIGZpcm13YXJlIGtub3du IGZvciBwbGF0Zm9ybSB3aXRoIEd1QyFcbiIpOwotCQlyZXR1cm4gLUVOT0VOVDsKLQl9Ci0KLQly ZXR1cm4gMDsKLX0KLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK