From: Oscar Mateo Subject: [PATCH] drm/i915/guc: Take enable_guc_loading check out of GEM core code Date: Tue, 28 Mar 2017 09:53:47 -0700 Message-ID: <1490720027-23234-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5458889708 for ; Tue, 28 Mar 2017 23:53:40 +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 VGhlIHNob3VsZCBoYXBwZW4gYXMgc29vbiBhcyBwb3NzaWJsZSwgYnV0IGFsd2F5cyB3aXRoaW4g dGhlIGxvZ2ljIHRoYXQKZGVwZW5kcyBvbiBpdCAoYW5kIG5vdCBpbnRlcnJ1cHRpbmcgdGhlIHRv cC1sZXZlbCBkcml2ZXIgY29udHJvbCBmbG93KS4KCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxp bnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIHwgIDMgKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgMTAgKysrKy0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfdWMuYyB8ICA2ICsrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAxMSBp bnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4 IGQwNTI0ZmIuLmM2MTZiNGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtNTQ5LDggKzU0 OSw3IEBAIHN0YXRpYyBib29sIGk5MTVfc3dpdGNoZXJvb19jYW5fc3dpdGNoKHN0cnVjdCBwY2lf ZGV2ICpwZGV2KQogc3RhdGljIHZvaWQgaTkxNV9nZW1fZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7CiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0 ZXgpOwotCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZykKLQkJaW50ZWxfdWNfZmluaV9odyhk ZXZfcHJpdik7CisJaW50ZWxfdWNfZmluaV9odyhkZXZfcHJpdik7CiAJaTkxNV9nZW1fY2xlYW51 cF9lbmdpbmVzKGRldl9wcml2KTsKIAlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoZGV2X3ByaXYpOwog CW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKaW5kZXggODRlYTI0OS4uMjcwOWJlOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j CkBAIC00NjExLDEyICs0NjExLDEwIEBAIGludCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCWludGVsX21vY3NfaW5pdF9sM2NjX3RhYmxlKGRl dl9wcml2KTsKIAotCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZykgewotCQkvKiBXZSBjYW4n dCBlbmFibGUgY29udGV4dHMgdW50aWwgYWxsIGZpcm13YXJlIGlzIGxvYWRlZCAqLwotCQlyZXQg PSBpbnRlbF91Y19pbml0X2h3KGRldl9wcml2KTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gb3V0Owot CX0KKwkvKiBXZSBjYW4ndCBlbmFibGUgY29udGV4dHMgdW50aWwgYWxsIGZpcm13YXJlIGlzIGxv YWRlZCAqLworCXJldCA9IGludGVsX3VjX2luaXRfaHcoZGV2X3ByaXYpOworCWlmIChyZXQpCisJ CWdvdG8gb3V0OwogCiBvdXQ6CiAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9wdXQoZGV2X3ByaXYs IEZPUkNFV0FLRV9BTEwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKaW5kZXggYzc2N2RjMy4uMTk2 NTMyMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCkBAIC0yNTQsNiArMjU0LDkgQEAgaW50IGlu dGVsX3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCWlu dCByZXQsIGF0dGVtcHRzOwogCisJaWYgKCFpOTE1LmVuYWJsZV9ndWNfbG9hZGluZykKKwkJcmV0 dXJuIDA7CisKIAlnZW45X3Jlc2V0X2d1Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKIAogCS8qIFdl IG5lZWQgdG8gbm90aWZ5IHRoZSBndWMgd2hlbmV2ZXIgd2UgY2hhbmdlIHRoZSBHR1RUICovCkBA IC0zNDMsNiArMzQ2LDkgQEAgaW50IGludGVsX3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCiB2b2lkIGludGVsX3VjX2ZpbmlfaHcoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogeworCWlmICghaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpCisJ CXJldHVybjsKKwogCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikgewogCQlpOTE1X2d1 Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2X3ByaXYpOwogCQlnZW45X2Rpc2FibGVfZ3VjX2ludGVy cnVwdHMoZGV2X3ByaXYpOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=