From: Sagar Arun Kamble Subject: [PATCH v12 06/11] drm/i915/guc: Make GuC related disable/destroy functions not depend on i915.enable_guc_submission Date: Thu, 28 Sep 2017 12:18:44 +0530 Message-ID: <1506581329-29720-7-git-send-email-sagar.a.kamble@intel.com> References: <1506581329-29720-1-git-send-email-sagar.a.kamble@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 2F3EB6E855 for ; Thu, 28 Sep 2017 06:45:39 +0000 (UTC) In-Reply-To: <1506581329-29720-1-git-send-email-sagar.a.kamble@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 RHVyaW5nIEd1QyBsb2FkL2VuYWJsZSwgc3RhdGUgaXMgc2V0dXAgYnkgZHJpdmVyIHRoYXQgY2Fu IGJlIGxvb2tlZCBhdAp3aGlsZSBkaXNhYmxpbmcuIFNvIHJlbW92ZSB0aGUgY2hlY2sgZm9yIGk5 MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uCnBhcmFtZXRlciBpbiB0aG9zZSBmdW5jdGlvbnMuCgpT dWdnZXN0ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWdu ZWQtb2ZmLWJ5OiBTYWdhciBBcnVuIEthbWJsZSA8c2FnYXIuYS5rYW1ibGVAaW50ZWwuY29tPgpD YzogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+CkNjOiBNaWNo YcWCIFdpbmlhcnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgMTMgKysrKysrKysrKy0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICAgICAgIHwgIDYgKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMgICAgICAgfCAgNiArKy0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgICAgICAgICAgICB8IDEyICsrKystLS0tLS0tLQog NCBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggMDRmMTI4MS4uYTJm NjdjYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv bi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAt MTAwMiw3ICsxMDAyLDggQEAgc3RhdGljIGludCBndWNfYWRzX2NyZWF0ZShzdHJ1Y3QgaW50ZWxf Z3VjICpndWMpCiAKIHN0YXRpYyB2b2lkIGd1Y19hZHNfZGVzdHJveShzdHJ1Y3QgaW50ZWxfZ3Vj ICpndWMpCiB7Ci0JaTkxNV92bWFfdW5waW5fYW5kX3JlbGVhc2UoJmd1Yy0+YWRzX3ZtYSk7CisJ aWYgKGd1Yy0+YWRzX3ZtYSkKKwkJaTkxNV92bWFfdW5waW5fYW5kX3JlbGVhc2UoJmd1Yy0+YWRz X3ZtYSk7CiB9CiAKIC8qCkBAIC0xMDYwLDExICsxMDYxLDE0IEBAIHZvaWQgaTkxNV9ndWNfc3Vi bWlzc2lvbl9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKIAorCVdBUk5fT05fT05DRSghaWRh X2lzX2VtcHR5KCZndWMtPnN0YWdlX2lkcykpOwogCWlkYV9kZXN0cm95KCZndWMtPnN0YWdlX2lk cyk7CiAJZ3VjX2Fkc19kZXN0cm95KGd1Yyk7CiAJaW50ZWxfZ3VjX2xvZ19kZXN0cm95KGd1Yyk7 Ci0JaTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChndWMtPnN0YWdlX2Rlc2NfcG9vbC0+b2JqKTsK LQlpOTE1X3ZtYV91bnBpbl9hbmRfcmVsZWFzZSgmZ3VjLT5zdGFnZV9kZXNjX3Bvb2wpOworCWlm IChndWMtPnN0YWdlX2Rlc2NfcG9vbCkgeworCQlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKGd1 Yy0+c3RhZ2VfZGVzY19wb29sLT5vYmopOworCQlpOTE1X3ZtYV91bnBpbl9hbmRfcmVsZWFzZSgm Z3VjLT5zdGFnZV9kZXNjX3Bvb2wpOworCX0KIH0KIAogc3RhdGljIHZvaWQgZ3VjX2ludGVycnVw dHNfY2FwdHVyZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCkBAIC0xMjA0LDYg KzEyMDgsOSBAQCB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9w cml2LT5ndWM7CiAKKwlpZiAoIWd1Yy0+ZXhlY2J1Zl9jbGllbnQpCisJCXJldHVybjsKKwogCWd1 Y19pbnRlcnJ1cHRzX3JlbGVhc2UoZGV2X3ByaXYpOwogCiAJLyogUmV2ZXJ0IGJhY2sgdG8gbWFu dWFsIEVMU1Agc3VibWlzc2lvbiAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggMGI3NTYy MTMuLjc1NDA2ZWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtNDU1LDYgKzQ1NSw5IEBA IHZvaWQgZ2VuOV9yZXNldF9ndWNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAKIHZvaWQgZ2VuOV9lbmFibGVfZ3VjX2ludGVycnVwdHMoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogeworCWlmIChSRUFEX09OQ0UoZGV2X3ByaXYtPmd1Yy5p bnRlcnJ1cHRzX2VuYWJsZWQpKQorCQlyZXR1cm47CisKIAlzcGluX2xvY2tfaXJxKCZkZXZfcHJp di0+aXJxX2xvY2spOwogCWlmICghZGV2X3ByaXYtPmd1Yy5pbnRlcnJ1cHRzX2VuYWJsZWQpIHsK IAkJV0FSTl9PTl9PTkNFKEk5MTVfUkVBRChnZW42X3BtX2lpcihkZXZfcHJpdikpICYKQEAgLTQ2 Nyw2ICs0NzAsOSBAQCB2b2lkIGdlbjlfZW5hYmxlX2d1Y19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogdm9pZCBnZW45X2Rpc2FibGVfZ3VjX2ludGVycnVw dHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogeworCWlmICghUkVBRF9PTkNF KGRldl9wcml2LT5ndWMuaW50ZXJydXB0c19lbmFibGVkKSkKKwkJcmV0dXJuOworCiAJc3Bpbl9s b2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAlkZXZfcHJpdi0+Z3VjLmludGVycnVwdHNf ZW5hYmxlZCA9IGZhbHNlOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfbG9nLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKaW5kZXgg NjU3MWQ5Ni4uNzMzMzNiNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX2xvZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYwpAQCAt NTg0LDcgKzU4NCw4IEBAIGludCBpbnRlbF9ndWNfbG9nX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3Vj ICpndWMpCiB2b2lkIGludGVsX2d1Y19sb2dfZGVzdHJveShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMp CiB7CiAJZ3VjX2xvZ19ydW50aW1lX2Rlc3Ryb3koZ3VjKTsKLQlpOTE1X3ZtYV91bnBpbl9hbmRf cmVsZWFzZSgmZ3VjLT5sb2cudm1hKTsKKwlpZiAoZ3VjLT5sb2cudm1hKQorCQlpOTE1X3ZtYV91 bnBpbl9hbmRfcmVsZWFzZSgmZ3VjLT5sb2cudm1hKTsKIH0KIAogaW50IGk5MTVfZ3VjX2xvZ19j b250cm9sKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTY0IGNvbnRyb2xfdmFs KQpAQCAtNjUzLDkgKzY1NCw2IEBAIHZvaWQgaTkxNV9ndWNfbG9nX3JlZ2lzdGVyKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogdm9pZCBpOTE1X2d1Y19sb2dfdW5yZWdpc3Rl cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JaWYgKCFpOTE1X21vZHBh cmFtcy5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pCi0JCXJldHVybjsKLQogCW11dGV4X2xvY2soJmRl dl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIAkvKiBHdUMgbG9nZ2luZyBpcyBjdXJyZW50bHkg dGhlIG9ubHkgdXNlciBvZiBHdWMySG9zdCBpbnRlcnJ1cHRzICovCiAJZ2VuOV9kaXNhYmxlX2d1 Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCmluZGV4IGFiMjYy MzIuLmVhN2MzOWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwpAQCAtNDQ1LDggKzQ0NSw3IEBA IGludCBpbnRlbF91Y19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IGVycl9sb2dfY2FwdHVyZToKIAlndWNfY2FwdHVyZV9sb2FkX2Vycl9sb2coZ3VjKTsKIGVycl9z dWJtaXNzaW9uOgotCWlmIChpOTE1X21vZHBhcmFtcy5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pCi0J CWk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShkZXZfcHJpdik7CisJaTkxNV9ndWNfc3VibWlzc2lv bl9maW5pKGRldl9wcml2KTsKIGVycl9ndWM6CiAJaTkxNV9nZ3R0X2Rpc2FibGVfZ3VjKGRldl9w cml2KTsKIApAQCAtNDc1LDE1ICs0NzQsMTIgQEAgdm9pZCBpbnRlbF91Y19maW5pX2h3KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAoIWk5MTVfbW9kcGFyYW1zLmVuYWJs ZV9ndWNfbG9hZGluZykKIAkJcmV0dXJuOwogCi0JaWYgKGk5MTVfbW9kcGFyYW1zLmVuYWJsZV9n dWNfc3VibWlzc2lvbikKLQkJaTkxNV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKGRldl9wcml2KTsK KwlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2X3ByaXYpOwogCiAJZ3VjX2Rpc2FibGVf Y29tbXVuaWNhdGlvbigmZGV2X3ByaXYtPmd1Yyk7CiAKLQlpZiAoaTkxNV9tb2RwYXJhbXMuZW5h YmxlX2d1Y19zdWJtaXNzaW9uKSB7Ci0JCWdlbjlfZGlzYWJsZV9ndWNfaW50ZXJydXB0cyhkZXZf cHJpdik7Ci0JCWk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShkZXZfcHJpdik7Ci0JfQorCWdlbjlf ZGlzYWJsZV9ndWNfaW50ZXJydXB0cyhkZXZfcHJpdik7CisJaTkxNV9ndWNfc3VibWlzc2lvbl9m aW5pKGRldl9wcml2KTsKIAogCWk5MTVfZ2d0dF9kaXNhYmxlX2d1YyhkZXZfcHJpdik7CiB9Ci0t IAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==