From: Michal Wajdeczko Subject: [PATCH v2] drm/i915/guc: Unify parameters of public CT functions Date: Tue, 20 Mar 2018 16:20:20 +0000 Message-ID: <20180320162020.38672-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 22DAC6E80A for ; Tue, 20 Mar 2018 16:24:35 +0000 (UTC) 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 VGhlcmUgaXMgbm8gbmVlZCB0byBtaXggcGFyYW1ldGVyIHR5cGVzIGluIHB1YmxpYyBDVCBmdW5j dGlvbnMKYXMgd2UgY2FuIGFsd2F5cyBhY2NlcHQgaW50ZWxfZ3VjX2N0LgoKdjI6IGZpeCAnUmV0 dXJuJyBkb2MsIHMvZGV2X3ByaXYvaTkxNSAoU2FnYXIpCgpTaWduZWQtb2ZmLWJ5OiBNaWNoYWwg V2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KQ2M6IFNhZ2FyIEFydW4gS2Ft YmxlIDxzYWdhci5hLmthbWJsZUBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KUmV2aWV3ZWQtYnk6IFNhZ2FyIEFydW4gS2FtYmxlIDxzYWdhci5h LmthbWJsZUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0 LmMgfCA0MSArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfY3QuaCB8ICA2ICsrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdWMuYyAgICAgfCAgNCArKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlv bnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19jdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMKaW5k ZXggMGEwZDNkNS4uYTcyNjI4MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjX2N0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMKQEAg LTI4LDEyICsyOCwyMSBAQAogCiBlbnVtIHsgQ1RCX09XTkVSX0hPU1QgPSAwIH07CiAKKy8qKgor ICogaW50ZWxfZ3VjX2N0X2luaXRfZWFybHkgLSBJbml0aWFsaXplIENUIHN0YXRlIHdpdGhvdXQg cmVxdWlyaW5nIGRldmljZSBhY2Nlc3MKKyAqIEBjdDogcG9pbnRlciB0byBDVCBzdHJ1Y3QKKyAq Lwogdm9pZCBpbnRlbF9ndWNfY3RfaW5pdF9lYXJseShzdHJ1Y3QgaW50ZWxfZ3VjX2N0ICpjdCkK IHsKIAkvKiB3ZSdyZSB1c2luZyBzdGF0aWMgY2hhbm5lbCBvd25lcnMgKi8KIAljdC0+aG9zdF9j aGFubmVsLm93bmVyID0gQ1RCX09XTkVSX0hPU1Q7CiB9CiAKK3N0YXRpYyBpbmxpbmUgc3RydWN0 IGludGVsX2d1YyAqY3RfdG9fZ3VjKHN0cnVjdCBpbnRlbF9ndWNfY3QgKmN0KQoreworCXJldHVy biBjb250YWluZXJfb2YoY3QsIHN0cnVjdCBpbnRlbF9ndWMsIGN0KTsKK30KKwogc3RhdGljIGlu bGluZSBjb25zdCBjaGFyICpndWNfY3RfYnVmZmVyX3R5cGVfdG9fc3RyKHUzMiB0eXBlKQogewog CXN3aXRjaCAodHlwZSkgewpAQCAtNDE2LDE5ICs0MjUsMjEgQEAgc3RhdGljIGludCBpbnRlbF9n dWNfc2VuZF9jdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIGNvbnN0IHUzMiAqYWN0aW9uLCB1MzIg bGVuKQogfQogCiAvKioKLSAqIEVuYWJsZSBidWZmZXIgYmFzZWQgY29tbWFuZCB0cmFuc3BvcnQK KyAqIGludGVsX2d1Y19jdF9lbmFibGUgLSBFbmFibGUgYnVmZmVyIGJhc2VkIGNvbW1hbmQgdHJh bnNwb3J0LgorICogQGN0OiBwb2ludGVyIHRvIENUIHN0cnVjdAorICoKICAqIFNoYWxsIG9ubHkg YmUgY2FsbGVkIGZvciBwbGF0Zm9ybXMgd2l0aCBIQVNfR1VDX0NULgotICogQGd1YzoJdGhlIGd1 YwotICogcmV0dXJuOgkwIG9uIHN1Y2Nlc3MKLSAqCQlub24temVybyBvbiBmYWlsdXJlCisgKgor ICogUmV0dXJuOiAwIG9uIHN1Y2Nlc3MsIGEgbmVnYXRpdmUgZXJybm8gY29kZSBvbiBmYWlsdXJl LgogICovCi1pbnQgaW50ZWxfZ3VjX2VuYWJsZV9jdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCitp bnQgaW50ZWxfZ3VjX2N0X2VuYWJsZShzdHJ1Y3QgaW50ZWxfZ3VjX2N0ICpjdCkKIHsKLQlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOwotCXN0cnVj dCBpbnRlbF9ndWNfY3RfY2hhbm5lbCAqY3RjaCA9ICZndWMtPmN0Lmhvc3RfY2hhbm5lbDsKKwlz dHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSBjdF90b19ndWMoY3QpOworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICppOTE1ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKKwlzdHJ1Y3QgaW50ZWxfZ3VjX2N0X2No YW5uZWwgKmN0Y2ggPSAmY3QtPmhvc3RfY2hhbm5lbDsKIAlpbnQgZXJyOwogCi0JR0VNX0JVR19P TighSEFTX0dVQ19DVChkZXZfcHJpdikpOworCUdFTV9CVUdfT04oIUhBU19HVUNfQ1QoaTkxNSkp OwogCiAJZXJyID0gY3RjaF9vcGVuKGd1YywgY3RjaCk7CiAJaWYgKHVubGlrZWx5KGVycikpCkBA IC00NDEsMTYgKzQ1MiwxOCBAQCBpbnQgaW50ZWxfZ3VjX2VuYWJsZV9jdChzdHJ1Y3QgaW50ZWxf Z3VjICpndWMpCiB9CiAKIC8qKgotICogRGlzYWJsZSBidWZmZXIgYmFzZWQgY29tbWFuZCB0cmFu c3BvcnQuCisgKiBpbnRlbF9ndWNfY3RfZGlzYWJsZSAtIERpc2FibGUgYnVmZmVyIGJhc2VkIGNv bW1hbmQgdHJhbnNwb3J0LgorICogQGN0OiBwb2ludGVyIHRvIENUIHN0cnVjdAorICoKICAqIFNo YWxsIG9ubHkgYmUgY2FsbGVkIGZvciBwbGF0Zm9ybXMgd2l0aCBIQVNfR1VDX0NULgotICogQGd1 YzogdGhlIGd1YwogICovCi12b2lkIGludGVsX2d1Y19kaXNhYmxlX2N0KHN0cnVjdCBpbnRlbF9n dWMgKmd1YykKK3ZvaWQgaW50ZWxfZ3VjX2N0X2Rpc2FibGUoc3RydWN0IGludGVsX2d1Y19jdCAq Y3QpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUo Z3VjKTsKLQlzdHJ1Y3QgaW50ZWxfZ3VjX2N0X2NoYW5uZWwgKmN0Y2ggPSAmZ3VjLT5jdC5ob3N0 X2NoYW5uZWw7CisJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gY3RfdG9fZ3VjKGN0KTsKKwlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IGd1Y190b19pOTE1KGd1Yyk7CisJc3RydWN0IGlu dGVsX2d1Y19jdF9jaGFubmVsICpjdGNoID0gJmN0LT5ob3N0X2NoYW5uZWw7CiAKLQlHRU1fQlVH X09OKCFIQVNfR1VDX0NUKGRldl9wcml2KSk7CisJR0VNX0JVR19PTighSEFTX0dVQ19DVChpOTE1 KSk7CiAKIAlpZiAoIWN0Y2hfaXNfb3BlbihjdGNoKSkKIAkJcmV0dXJuOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWNfY3QuaAppbmRleCA2ZDk3ZjM2Li41OTVjOGFkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfY3QuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWNfY3QuaApAQCAtNzgsOSArNzgsNyBAQCBzdHJ1Y3QgaW50ZWxfZ3VjX2N0IHsK IH07CiAKIHZvaWQgaW50ZWxfZ3VjX2N0X2luaXRfZWFybHkoc3RydWN0IGludGVsX2d1Y19jdCAq Y3QpOwotCi0vKiBYWFg6IG1vdmUgdG8gaW50ZWxfdWMuaCA/IGRvbid0IGZpdCB0aGVyZSBlaXRo ZXIgKi8KLWludCBpbnRlbF9ndWNfZW5hYmxlX2N0KHN0cnVjdCBpbnRlbF9ndWMgKmd1Yyk7Ci12 b2lkIGludGVsX2d1Y19kaXNhYmxlX2N0KHN0cnVjdCBpbnRlbF9ndWMgKmd1Yyk7CitpbnQgaW50 ZWxfZ3VjX2N0X2VuYWJsZShzdHJ1Y3QgaW50ZWxfZ3VjX2N0ICpjdCk7Cit2b2lkIGludGVsX2d1 Y19jdF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9ndWNfY3QgKmN0KTsKIAogI2VuZGlmIC8qIF9JTlRF TF9HVUNfQ1RfSF8gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Vj LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCmluZGV4IDJiZWZjYWYuLjM0Zjhh MmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwpAQCAtMjMxLDcgKzIzMSw3IEBAIHN0YXRpYyBp bnQgZ3VjX2VuYWJsZV9jb21tdW5pY2F0aW9uKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAlnZW45 X2VuYWJsZV9ndWNfaW50ZXJydXB0cyhkZXZfcHJpdik7CiAKIAlpZiAoSEFTX0dVQ19DVChkZXZf cHJpdikpCi0JCXJldHVybiBpbnRlbF9ndWNfZW5hYmxlX2N0KGd1Yyk7CisJCXJldHVybiBpbnRl bF9ndWNfY3RfZW5hYmxlKCZndWMtPmN0KTsKIAogCWd1Yy0+c2VuZCA9IGludGVsX2d1Y19zZW5k X21taW87CiAJcmV0dXJuIDA7CkBAIC0yNDIsNyArMjQyLDcgQEAgc3RhdGljIHZvaWQgZ3VjX2Rp c2FibGVfY29tbXVuaWNhdGlvbihzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKIAogCWlmIChIQVNfR1VD X0NUKGRldl9wcml2KSkKLQkJaW50ZWxfZ3VjX2Rpc2FibGVfY3QoZ3VjKTsKKwkJaW50ZWxfZ3Vj X2N0X2Rpc2FibGUoJmd1Yy0+Y3QpOwogCiAJZ2VuOV9kaXNhYmxlX2d1Y19pbnRlcnJ1cHRzKGRl dl9wcml2KTsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=