From: Oscar Mateo Subject: [PATCH] drm/i915/guc: Make intel_guc_send a function pointer Date: Thu, 2 Feb 2017 07:42:46 -0800 Message-ID: <1486050166-32672-1-git-send-email-oscar.mateo@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 8592C6EAEF for ; Thu, 2 Feb 2017 23:42:47 +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 RnJvbTogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+CgpQcmVw YXJlIGZvciBhbiBhbHRlcm5hdGUgR3VDIGNvbW11bmljYXRpb24gaW50ZXJmYWNlLgoKdjI6IE1h a2UgYSBmZXcgZnVuY3Rpb25zIHN0YXRpYyBhbmQgbmFtZSB0aGVtIGNvcnJlY3RseSB3aGlsZSB3 ZSBhcmUgYXQgaXQgKE9zY2FyKQoKU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hl bC50aGllcnJ5QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWljaGFsIFdhamRlY3prbyA8bWlj aGFsLndhamRlY3prb0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE9zY2FyIE1hdGVvIDxvc2Nh ci5tYXRlb0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyB8 IDI1ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VjLmggfCAgOSArKysrKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwg MTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKaW5kZXggYzQ2YmM4NS4uMGU0 NWVmMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCkBAIC0yNSwxNiArMjUsMTEgQEAKICNpbmNs dWRlICJpOTE1X2Rydi5oIgogI2luY2x1ZGUgImludGVsX3VjLmgiCiAKLXZvaWQgaW50ZWxfdWNf aW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0JbXV0ZXhf aW5pdCgmZGV2X3ByaXYtPmd1Yy5zZW5kX211dGV4KTsKLX0KLQogLyoKICAqIFJlYWQgR3VDIGNv bW1hbmQvc3RhdHVzIHJlZ2lzdGVyIChTT0ZUX1NDUkFUQ0hfMCkKICAqIFJldHVybiB0cnVlIGlm IGl0IGNvbnRhaW5zIGEgcmVzcG9uc2UgcmF0aGVyIHRoYW4gYSBjb21tYW5kCiAgKi8KLXN0YXRp YyBib29sIGludGVsX2d1Y19yZWN2KHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyICpzdGF0dXMp CitzdGF0aWMgYm9vbCBndWNfcmVjdihzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIHUzMiAqc3RhdHVz KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1 Yyk7CiAKQEAgLTQzLDcgKzM4LDEwIEBAIHN0YXRpYyBib29sIGludGVsX2d1Y19yZWN2KHN0cnVj dCBpbnRlbF9ndWMgKmd1YywgdTMyICpzdGF0dXMpCiAJcmV0dXJuIElOVEVMX0dVQ19SRUNWX0lT X1JFU1BPTlNFKHZhbCk7CiB9CiAKLWludCBpbnRlbF9ndWNfc2VuZChzdHJ1Y3QgaW50ZWxfZ3Vj ICpndWMsIGNvbnN0IHUzMiAqYWN0aW9uLCB1MzIgbGVuKQorLyoKKyAqIFRoaXMgZnVuY3Rpb24g aW1wbGVtZW50cyB0aGUgTU1JTyBiYXNlZCBob3N0IHRvIEd1QyBpbnRlcmZhY2UuCisgKi8KK3N0 YXRpYyBpbnQgZ3VjX3NlbmRfbW1pbyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIGNvbnN0IHUzMiAq YWN0aW9uLCB1MzIgbGVuKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGd1Y190b19pOTE1KGd1Yyk7CiAJdTMyIHN0YXR1czsKQEAgLTcxLDkgKzY5LDkgQEAgaW50IGlu dGVsX2d1Y19zZW5kKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgY29uc3QgdTMyICphY3Rpb24sIHUz MiBsZW4pCiAJICogdXAgdG8gdGhhdCBsZW5ndGggb2YgdGltZSwgdGhlbiBzd2l0Y2ggdG8gYSBz bG93ZXIgc2xlZXAtd2FpdCBsb29wLgogCSAqIE5vIGludGVfZ3VjX3NlbmQgY29tbWFuZCBzaG91 bGQgZXZlciB0YWtlIGxvbmdlciB0aGFuIDEwbXMuCiAJICovCi0JcmV0ID0gd2FpdF9mb3JfdXMo aW50ZWxfZ3VjX3JlY3YoZ3VjLCAmc3RhdHVzKSwgMTApOworCXJldCA9IHdhaXRfZm9yX3VzKGd1 Y19yZWN2KGd1YywgJnN0YXR1cyksIDEwKTsKIAlpZiAocmV0KQotCQlyZXQgPSB3YWl0X2Zvcihp bnRlbF9ndWNfcmVjdihndWMsICZzdGF0dXMpLCAxMCk7CisJCXJldCA9IHdhaXRfZm9yKGd1Y19y ZWN2KGd1YywgJnN0YXR1cyksIDEwKTsKIAlpZiAoc3RhdHVzICE9IElOVEVMX0dVQ19TVEFUVVNf U1VDQ0VTUykgewogCQkvKgogCQkgKiBFaXRoZXIgdGhlIEd1QyBleHBsaWNpdGx5IHJldHVybmVk IGFuIGVycm9yICh3aGljaApAQCAtOTgsNiArOTYsMTQgQEAgaW50IGludGVsX2d1Y19zZW5kKHN0 cnVjdCBpbnRlbF9ndWMgKmd1YywgY29uc3QgdTMyICphY3Rpb24sIHUzMiBsZW4pCiAJcmV0dXJu IHJldDsKIH0KIAordm9pZCBpbnRlbF91Y19pbml0X2Vhcmx5KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKK3sKKwlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1 YzsKKworCW11dGV4X2luaXQoJmRldl9wcml2LT5ndWMuc2VuZF9tdXRleCk7CisJZ3VjLT5zZW5k ID0gZ3VjX3NlbmRfbW1pbzsKK30KKwogaW50IGludGVsX2d1Y19zYW1wbGVfZm9yY2V3YWtlKHN0 cnVjdCBpbnRlbF9ndWMgKmd1YykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBndWNfdG9faTkxNShndWMpOwpAQCAtMTEzLDQgKzExOSwzIEBAIGludCBpbnRlbF9ndWNf c2FtcGxlX2ZvcmNld2FrZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAKIAlyZXR1cm4gaW50ZWxf Z3VjX3NlbmQoZ3VjLCBhY3Rpb24sIEFSUkFZX1NJWkUoYWN0aW9uKSk7CiB9Ci0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Yy5oCmluZGV4IGQ3NGY0ZDMuLmFlZDg2NTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dWMuaApAQCAtMTc0LDYgKzE3NCw5IEBAIHN0cnVjdCBpbnRlbF9ndWMgewogCiAJLyogVG8gc2Vy aWFsaXplIHRoZSBpbnRlbF9ndWNfc2VuZCBhY3Rpb25zICovCiAJc3RydWN0IG11dGV4IHNlbmRf bXV0ZXg7CisKKwkvKiBHdUMncyBGVyBzcGVjaWZpYyBzZW5kIGZ1bmN0aW9uICovCisJaW50ICgq c2VuZCkoc3RydWN0IGludGVsX2d1YyAqZ3VjLCBjb25zdCB1MzIgKmRhdGEsIHUzMiBsZW4pOwog fTsKIAogc3RydWN0IGludGVsX2h1YyB7CkBAIC0xODUsOSArMTg4LDEzIEBAIHN0cnVjdCBpbnRl bF9odWMgewogCiAvKiBpbnRlbF91Yy5jICovCiB2b2lkIGludGVsX3VjX2luaXRfZWFybHkoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKLWludCBpbnRlbF9ndWNfc2VuZChzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMsIGNvbnN0IHUzMiAqYWN0aW9uLCB1MzIgbGVuKTsKIGludCBpbnRl bF9ndWNfc2FtcGxlX2ZvcmNld2FrZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwogCitzdGF0aWMg aW5saW5lIGludCBpbnRlbF9ndWNfc2VuZChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIGNvbnN0IHUz MiAqYWN0aW9uLCB1MzIgbGVuKQoreworCXJldHVybiBndWMtPnNlbmQoZ3VjLCBhY3Rpb24sIGxl bik7Cit9CisKIC8qIGludGVsX2d1Y19sb2FkZXIuYyAqLwogZXh0ZXJuIHZvaWQgaW50ZWxfZ3Vj X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGV4dGVybiBpbnQgaW50 ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci0tIAoxLjku MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==