From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oscar Mateo Subject: [PATCH 2/2] drm/i915: Create vfuncs for the reset/enable/disable GuC functions Date: Wed, 23 Aug 2017 16:58:25 -0700 Message-ID: <1503532705-3692-2-git-send-email-oscar.mateo@intel.com> References: <1503532705-3692-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 870FD6E663 for ; Wed, 23 Aug 2017 23:58:36 +0000 (UTC) In-Reply-To: <1503532705-3692-1-git-send-email-oscar.mateo@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 Cc: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org RmFjaWxpdGF0ZXMgY3JlYXRpbmcgR2VuLXNwZWNpZmljIHZlcnNpb25zIG9mIHRoZXNlIGZ1bmN0 aW9ucyBsYXRlciBvbi4KCkNjOiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+ CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogTWljaGFs IFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+CkNjOiBEYW5pZWxlIENlcmFv bG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5 OiBPc2NhciBNYXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMgICAgICAgICAgICB8IDEyICsrKysrKysrKy0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgICAgICAgIHwgIDMgLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfbG9nLmMgICAgICAgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VjLmMgICAgICAgICAgICB8ICA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF91Yy5oICAgICAgICAgICAgfCAgNCArKysrCiA2IGZpbGVzIGNoYW5nZWQsIDIy IGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCA0OGExZTkzLi42M2NkOWRhIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC0xMzAyLDcgKzEzMDIsNyBAQCBp bnQgaW50ZWxfZ3VjX3N1c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CWlmIChndWMtPmZ3LmxvYWRfc3RhdHVzICE9IElOVEVMX1VDX0ZJUk1XQVJFX1NVQ0NFU1MpCiAJ CXJldHVybiAwOwogCi0JZ2VuOV9kaXNhYmxlX2d1Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKKwln dWMtPmRpc2FibGVfZ3VjX2ludGVycnVwdHMoZGV2X3ByaXYpOwogCiAJY3R4ID0gZGV2X3ByaXYt Pmtlcm5lbF9jb250ZXh0OwogCkBAIC0xMzI5LDcgKzEzMjksNyBAQCBpbnQgaW50ZWxfZ3VjX3Jl c3VtZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXJldHVybiAwOwogCiAJ aWYgKGk5MTUuZ3VjX2xvZ19sZXZlbCA+PSAwKQotCQlnZW45X2VuYWJsZV9ndWNfaW50ZXJydXB0 cyhkZXZfcHJpdik7CisJCWd1Yy0+ZW5hYmxlX2d1Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKIAog CWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4dDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMK aW5kZXggNWQzOTFlNi4uMjNiZTgyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC00MTMs MTQgKzQxMywxNCBAQCB2b2lkIGdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZ2VuNl9yZXNldF9ycHNfaW50ZXJydXB0cyhkZXZf cHJpdik7CiB9CiAKLXZvaWQgZ2VuOV9yZXNldF9ndWNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCBnZW45X3Jlc2V0X2d1Y19pbnRlcnJ1 cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzcGluX2xvY2tfaXJx KCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCWdlbjZfcmVzZXRfcG1faWlyKGRldl9wcml2LCBkZXZf cHJpdi0+cG1fZ3VjX2V2ZW50cyk7CiAJc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xv Y2spOwogfQogCi12b2lkIGdlbjlfZW5hYmxlX2d1Y19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGdlbjlfZW5hYmxlX2d1Y19pbnRlcnJ1 cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzcGluX2xvY2tfaXJx KCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCWlmICghZGV2X3ByaXYtPmd1Yy5pbnRlcnJ1cHRzX2Vu YWJsZWQpIHsKQEAgLTQzMiw3ICs0MzIsNyBAQCB2b2lkIGdlbjlfZW5hYmxlX2d1Y19pbnRlcnJ1 cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzcGluX3VubG9ja19pcnEo JmRldl9wcml2LT5pcnFfbG9jayk7CiB9CiAKLXZvaWQgZ2VuOV9kaXNhYmxlX2d1Y19pbnRlcnJ1 cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGdlbjlf ZGlzYWJsZV9ndWNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiB7CiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAlkZXZfcHJpdi0+Z3Vj LmludGVycnVwdHNfZW5hYmxlZCA9IGZhbHNlOwpAQCAtNDE2NCw2ICs0MTY0LDEyIEBAIHZvaWQg aW50ZWxfaXJxX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDgpCiAJCWRldl9wcml2LT5ycHMucG1faW50cm1za19tYnog fD0gR0VOOF9QTUlOVFJfRElTQUJMRV9SRURJUkVDVF9UT19HVUM7CiAKKwlpZiAoSU5URUxfR0VO KGRldl9wcml2KSA+PSA5KSB7CisJCWRldl9wcml2LT5ndWMucmVzZXRfZ3VjX2ludGVycnVwdHMg PSBnZW45X3Jlc2V0X2d1Y19pbnRlcnJ1cHRzOworCQlkZXZfcHJpdi0+Z3VjLmVuYWJsZV9ndWNf aW50ZXJydXB0cyA9IGdlbjlfZW5hYmxlX2d1Y19pbnRlcnJ1cHRzOworCQlkZXZfcHJpdi0+Z3Vj LmRpc2FibGVfZ3VjX2ludGVycnVwdHMgPSBnZW45X2Rpc2FibGVfZ3VjX2ludGVycnVwdHM7CisJ fQorCiAJaWYgKElTX0dFTjIoZGV2X3ByaXYpKSB7CiAJCS8qIEdlbjIgZG9lc24ndCBoYXZlIGEg aGFyZHdhcmUgZnJhbWUgY291bnRlciAqLwogCQlkZXYtPm1heF92YmxhbmtfY291bnQgPSAwOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA3NGMxODYwLi40NDJkMzc4IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaApAQCAtMTIzNCw5ICsxMjM0LDYgQEAgdm9pZCBnZW44X2lycV9wb3dl cl93ZWxsX3Bvc3RfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJ CQkgICAgIHU4IHBpcGVfbWFzayk7CiB2b2lkIGdlbjhfaXJxX3Bvd2VyX3dlbGxfcHJlX2Rpc2Fi bGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgICAgdTggcGlwZV9t YXNrKTsKLXZvaWQgZ2VuOV9yZXNldF9ndWNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpOwotdm9pZCBnZW45X2VuYWJsZV9ndWNfaW50ZXJydXB0cyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwotdm9pZCBnZW45X2Rpc2FibGVfZ3VjX2ludGVy cnVwdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAogLyogaW50ZWxfY3J0 LmMgKi8KIHZvaWQgaW50ZWxfY3J0X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYwppbmRleCAxNmQzYjg3Li5kNDAy OTAwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jCkBAIC01MDYsNyArNTA2LDcg QEAgc3RhdGljIHZvaWQgZ3VjX2ZsdXNoX2xvZ3Moc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQly ZXR1cm47CiAKIAkvKiBGaXJzdCBkaXNhYmxlIHRoZSBpbnRlcnJ1cHRzLCB3aWxsIGJlIHJlbmFi bGVkIGFmdGVyd2FyZHMgKi8KLQlnZW45X2Rpc2FibGVfZ3VjX2ludGVycnVwdHMoZGV2X3ByaXYp OworCWd1Yy0+ZGlzYWJsZV9ndWNfaW50ZXJydXB0cyhkZXZfcHJpdik7CiAKIAkvKiBCZWZvcmUg aW5pdGlhdGluZyB0aGUgZm9yY2VmdWwgZmx1c2gsIHdhaXQgZm9yIGFueSBwZW5kaW5nL29uZ29p bmcKIAkgKiBmbHVzaCB0byBjb21wbGV0ZSBvdGhlcndpc2UgZm9yY2VmdWwgZmx1c2ggbWF5IG5v dCBhY3R1YWxseSBoYXBwZW4uCkBAIC02MjMsNyArNjIzLDcgQEAgaW50IGk5MTVfZ3VjX2xvZ19j b250cm9sKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTY0IGNvbnRyb2xfdmFs KQogCQl9CiAKIAkJLyogR3VDIGxvZ2dpbmcgaXMgY3VycmVudGx5IHRoZSBvbmx5IHVzZXIgb2Yg R3VjMkhvc3QgaW50ZXJydXB0cyAqLwotCQlnZW45X2VuYWJsZV9ndWNfaW50ZXJydXB0cyhkZXZf cHJpdik7CisJCWd1Yy0+ZW5hYmxlX2d1Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKIAl9IGVsc2Ug ewogCQkvKiBPbmNlIGxvZ2dpbmcgaXMgZGlzYWJsZWQsIEd1QyB3b24ndCBnZW5lcmF0ZSBsb2dz ICYgc2VuZCBhbgogCQkgKiBpbnRlcnJ1cHQuIEJ1dCB0aGVyZSBjb3VsZCBiZSBzb21lIGRhdGEg aW4gdGhlIGxvZyBidWZmZXIKQEAgLTY1Niw3ICs2NTYsNyBAQCB2b2lkIGk5MTVfZ3VjX2xvZ191 bnJlZ2lzdGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCW11dGV4X2xv Y2soJmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIAkvKiBHdUMgbG9nZ2luZyBpcyBjdXJy ZW50bHkgdGhlIG9ubHkgdXNlciBvZiBHdWMySG9zdCBpbnRlcnJ1cHRzICovCi0JZ2VuOV9kaXNh YmxlX2d1Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKKwlkZXZfcHJpdi0+Z3VjLmVuYWJsZV9ndWNf aW50ZXJydXB0cyhkZXZfcHJpdik7CiAJZ3VjX2xvZ19ydW50aW1lX2Rlc3Ryb3koJmRldl9wcml2 LT5ndWMpOwogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogfQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VjLmMKaW5kZXggMDE3OGJhNC4uNmRmMGQzYiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Yy5jCkBAIC0zMzcsNyArMzM3LDcgQEAgaW50IGludGVsX3VjX2luaXRfaHcoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlyZXR1cm4gMDsKIAogCWd1Y19kaXNh YmxlX2NvbW11bmljYXRpb24oZ3VjKTsKLQlnZW45X3Jlc2V0X2d1Y19pbnRlcnJ1cHRzKGRldl9w cml2KTsKKwlndWMtPnJlc2V0X2d1Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKIAogCS8qIFdlIG5l ZWQgdG8gbm90aWZ5IHRoZSBndWMgd2hlbmV2ZXIgd2UgY2hhbmdlIHRoZSBHR1RUICovCiAJaTkx NV9nZ3R0X2VuYWJsZV9ndWMoZGV2X3ByaXYpOwpAQCAtMzkzLDcgKzM5Myw3IEBAIGludCBpbnRl bF91Y19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpbnRlbF9n dWNfYXV0aF9odWMoZGV2X3ByaXYpOwogCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikg ewogCQlpZiAoaTkxNS5ndWNfbG9nX2xldmVsID49IDApCi0JCQlnZW45X2VuYWJsZV9ndWNfaW50 ZXJydXB0cyhkZXZfcHJpdik7CisJCQlndWMtPmVuYWJsZV9ndWNfaW50ZXJydXB0cyhkZXZfcHJp dik7CiAKIAkJcmV0ID0gaTkxNV9ndWNfc3VibWlzc2lvbl9lbmFibGUoZGV2X3ByaXYpOwogCQlp ZiAocmV0KQpAQCAtNDEzLDcgKzQxMyw3IEBAIGludCBpbnRlbF91Y19pbml0X2h3KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgKi8KIGVycl9pbnRlcnJ1cHRzOgogCWd1Y19k aXNhYmxlX2NvbW11bmljYXRpb24oZ3VjKTsKLQlnZW45X2Rpc2FibGVfZ3VjX2ludGVycnVwdHMo ZGV2X3ByaXYpOworCWd1Yy0+ZGlzYWJsZV9ndWNfaW50ZXJydXB0cyhkZXZfcHJpdik7CiBlcnJf bG9nX2NhcHR1cmU6CiAJZ3VjX2NhcHR1cmVfbG9hZF9lcnJfbG9nKGd1Yyk7CiBlcnJfc3VibWlz c2lvbjoKQEAgLTQ1Miw3ICs0NTIsNyBAQCB2b2lkIGludGVsX3VjX2ZpbmlfaHcoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWd1Y19kaXNhYmxlX2NvbW11bmljYXRpb24oJmRl dl9wcml2LT5ndWMpOwogCiAJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKSB7Ci0JCWdl bjlfZGlzYWJsZV9ndWNfaW50ZXJydXB0cyhkZXZfcHJpdik7CisJCWRldl9wcml2LT5ndWMuZGlz YWJsZV9ndWNfaW50ZXJydXB0cyhkZXZfcHJpdik7CiAJCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZmlu aShkZXZfcHJpdik7CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaAppbmRleCAyMmFlNTJiLi5l ODYyNDU0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKQEAgLTIxMCw2ICsyMTAsMTAgQEAgc3Ry dWN0IGludGVsX2d1YyB7CiAKIAkvKiBHdUMncyBGVyBzcGVjaWZpYyBub3RpZnkgZnVuY3Rpb24g Ki8KIAl2b2lkICgqbm90aWZ5KShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOworCisJdm9pZCAoKnJl c2V0X2d1Y19pbnRlcnJ1cHRzKShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwor CXZvaWQgKCplbmFibGVfZ3VjX2ludGVycnVwdHMpKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CisJdm9pZCAoKmRpc2FibGVfZ3VjX2ludGVycnVwdHMpKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7CiB9OwogCiBzdHJ1Y3QgaW50ZWxfaHVjIHsKLS0gCjEuOS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK