From: Michel Thierry Subject: [PATCH v2] drm/i915/guc: Clear enable_guc_loading in case of init failure Date: Mon, 5 Jun 2017 10:12:51 -0700 Message-ID: <20170605171251.9905-1-michel.thierry@intel.com> References: <20170602234654.31614-1-michel.thierry@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 8F9C989C1C for ; Mon, 5 Jun 2017 17:13:16 +0000 (UTC) In-Reply-To: <20170602234654.31614-1-michel.thierry@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 QW5kIHByZXZlbnQgY2FsbGluZyBpOTE1X2dndHRfZGlzYWJsZV9ndWMgdHdpY2UgKHRoZSBmaXJz dCB3aGVuIEd1QyBpbml0CmZhaWxlZCwgYW5kIHRoZSBzZWNvbmQgdGltZSBkdXJpbmcgZHJpdmVy IHVubG9hZCAvIGludGVsX3VjX2ZpbmlfaHcpLAphbmQgaGl0dGluZyB0aGUgR0VNX0JVR19PTi4K CnYyOiBDbGVhciBlbmFibGVfZ3VjX2xvYWRpbmcgdW5jb25kaXRpb25hbGx5IChNaWNoYWwpCiAg ICBNYWtlIHN1cmUgZ3VjX2ZyZWVfbG9hZF9lcnJfbG9nIGlzIHN0aWxsIGNhbGxlZCAoRGFuaWVs ZSkKICAgIERvbid0IHNob290IHRoZSBtZXNzZW5nZXIgKENocmlzKQoKRml4ZXM6IDM5NTBiZjNk YmZmMTAgKCJkcm0vaTkxNS9ndWM6IEFkZCBvbmlvbiB0ZWFyZG93biB0byB0aGUgR3VDCnNldHVw IikKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogTWljaGFs IFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+CkNjOiBEYW5pZWxlIENlcmFv bG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgpDYzogSm9vbmFzIExh aHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBN aWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VjLmMgfCA3ICsrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2Vy dGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKaW5kZXggMzUy NGZmMDdhMGYyLi5hODkzMGYyZmVhY2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwpAQCAtNDMz LDE2ICs0MzMsMTkgQEAgaW50IGludGVsX3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCQlEUk1fTk9URSgiRmFsbGluZyBiYWNrIGZyb20gR3VDIHN1Ym1pc3Np b24gdG8gZXhlY2xpc3QgbW9kZVxuIik7CiAJfQogCisJaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcg PSAwOworCURSTV9OT1RFKCJHdUMgZmlybXdhcmUgbG9hZGluZyBkaXNhYmxlZFxuIik7CisKIAly ZXR1cm4gcmV0OwogfQogCiB2b2lkIGludGVsX3VjX2ZpbmlfaHcoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogeworCWd1Y19mcmVlX2xvYWRfZXJyX2xvZygmZGV2X3ByaXYtPmd1 Yyk7CisKIAlpZiAoIWk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nKQogCQlyZXR1cm47CiAKLQlndWNf ZnJlZV9sb2FkX2Vycl9sb2coJmRldl9wcml2LT5ndWMpOwotCiAJaWYgKGk5MTUuZW5hYmxlX2d1 Y19zdWJtaXNzaW9uKQogCQlpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoZGV2X3ByaXYpOwog Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=