From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v5 05/11] drm/i915: tidy initialisation failure paths (legacy, part 1) Date: Fri, 5 Feb 2016 18:33:42 +0000 Message-ID: <1454697228-33164-6-git-send-email-david.s.gordon@intel.com> References: <1454697228-33164-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id B73D56EA4E for ; Fri, 5 Feb 2016 10:34:06 -0800 (PST) In-Reply-To: <1454697228-33164-1-git-send-email-david.s.gordon@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 TWFrZSBzdXJlIGludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKCkgY2FuIGhhbmRsZSB0aGUgY2Fz ZSB3aGVyZSB0aGUKcmluZ2J1ZmZlciBoYXMgYmVlbiBhbGxvY2F0ZWQgYnV0IG1hcC1hbmQtcGlu IGZhaWxlZC4gUmV0dXJuIGVhcmx5IGlmCnRoZSByaW5nYnVmZmVyIGlzbid0IG1hcHBlZCBbQ2hy aXMgV2lsc29uXS4KClRoYXQgYWxsb3dzIHVzIHRvIHNpbXBsaWZ5IHRoZSBjbGVhbnVwIHBhdGgg aW4gaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcigpLAphcyBpdCBjYW4ganVzdCB0YWtlIHRoZSBlcnJv ciBleGl0IGFuZCBsZXQgaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZlcigpCmRlYWwgd2l0aCBhbnkg cGFydGlhbGx5LXNldC11cCBzdGF0ZS4KClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZp ZC5zLmdvcmRvbkBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAx OCArKysrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA4 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRl eCA2ZjViNTExLi4zZTFhZWM4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jCkBAIC0yMDU1LDYgKzIwNTUsOSBAQCBzdGF0aWMgaW50IGluaXRfcGh5c19zdGF0dXNfcGFn ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCiB2b2lkIGludGVsX3VucGluX3Jpbmdi dWZmZXJfb2JqKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogeworCWlmICghcmlu Z2J1Zi0+dmlydHVhbF9zdGFydCkKKwkJcmV0dXJuOworCiAJaWYgKEhBU19MTEMocmluZ2J1Zi0+ b2JqLT5iYXNlLmRldikgJiYgIXJpbmdidWYtPm9iai0+c3RvbGVuKQogCQl2dW5tYXAocmluZ2J1 Zi0+dmlydHVhbF9zdGFydCk7CiAJZWxzZQpAQCAtMjIzMiw2ICsyMjM1LDEzIEBAIHN0YXRpYyBp bnQgaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0KIAly aW5nLT5idWZmZXIgPSByaW5nYnVmOwogCisJcmV0ID0gaW50ZWxfcGluX2FuZF9tYXBfcmluZ2J1 ZmZlcl9vYmooZGV2LCByaW5nYnVmKTsKKwlpZiAocmV0KSB7CisJCURSTV9FUlJPUigiRmFpbGVk IHRvIHBpbiBhbmQgbWFwIHJpbmdidWZmZXIgJXM6ICVkXG4iLAorCQkJCXJpbmctPm5hbWUsIHJl dCk7CisJCWdvdG8gZXJyb3I7CisJfQorCiAJaWYgKEk5MTVfTkVFRF9HRlhfSFdTKGRldikpIHsK IAkJcmV0ID0gaW5pdF9zdGF0dXNfcGFnZShyaW5nKTsKIAkJaWYgKHJldCkKQEAgLTIyNDMsMTQg KzIyNTMsNiBAQCBzdGF0aWMgaW50IGludGVsX2luaXRfcmluZ19idWZmZXIoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJCWdvdG8gZXJyb3I7CiAJfQogCi0JcmV0ID0gaW50ZWxfcGluX2FuZF9t YXBfcmluZ2J1ZmZlcl9vYmooZGV2LCByaW5nYnVmKTsKLQlpZiAocmV0KSB7Ci0JCURSTV9FUlJP UigiRmFpbGVkIHRvIHBpbiBhbmQgbWFwIHJpbmdidWZmZXIgJXM6ICVkXG4iLAotCQkJCXJpbmct Pm5hbWUsIHJldCk7Ci0JCWludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7Ci0J CWdvdG8gZXJyb3I7Ci0JfQotCiAJcmV0ID0gaTkxNV9jbWRfcGFyc2VyX2luaXRfcmluZyhyaW5n KTsKIAlpZiAocmV0KQogCQlnb3RvIGVycm9yOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==