From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v5 07/11] drm/i915: tidy initialisation failure paths (legacy, part 3) Date: Fri, 5 Feb 2016 18:33:44 +0000 Message-ID: <1454697228-33164-8-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 0EE546EA52 for ; Fri, 5 Feb 2016 10:34:09 -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 aW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZlcigpIGNvbnRhaW5zIG9uZSBsb3ctbGV2ZWwgcmVnaXN0 ZXIgYWNjZXNzLAp3aGljaCBpcyBub3QgcmVhbGx5IGFwcHJvcHJpYXRlIGZvciBpdHMgbGV2ZWwg b2YgYWJzdHJhY3Rpb24uCgpJdCBjYWxscyBpbnRlbF9zdG9wX3JpbmdfYnVmZmVyKCkgd2hpY2gg dGhlbiBjYWxscyBzdG9wX3JpbmcoKSAtLSB3aGljaAppcyB0aGUgbGV2ZWwgdGhhdCBkZWFscyB3 aXRoIGgvdyByZWdpc3RlcnMgLS0gdGhlbiByZWFkcyBhIEdFTi1zcGVjaWZpYwpyZWdpc3RlciB0 byBzZWUgd2hldGhlciB0aGUgcmluZyBpcyBhY3R1YWxseSBub3cgaWRsZS4gSXQgb25seSBwcmlu dHMgYQpXQVJOSU5HLCB0aG91Z2gsIGFuZCBkb2Vzbid0IGFjdHVhbGx5IHJlZnJhaW4gZnJvbSBj b250aW51aW5nIGV2ZW4gaWYKdGhlIHRlc3QgZmFpbHMhCgpTbywgbGV0J3MgbW92ZSB0aGUgcmVn aXN0ZXItbGV2ZWwgY2hlY2sgYW5kIFdBUk5JTkcgZG93biBpbnRvIHRoZQpsb3ctbGV2ZWwgZnVu Y3Rpb24gdGhhdCdzIGFscmVhZHkgZG9pbmcgcmVnaXN0ZXIgYWNjZXNzLiBJZiB3ZSB3YW50ZWQK dG8sIHdlIGNvdWxkIHBhc3MgYSBwYXNzL2ZhaWwgc3RhdHVzIGJhY2ssIGJ1dCBzaW5jZSB0aGUg aGlnaC1sZXZlbApjb2RlIGNvbnRpbnVlcyBhbnl3YXksIHRoZXJlJ3Mgbm8gcmVhc29uIHRvIGF0 IHByZXNlbnQuCgpBcyBhIGJvbnVzLCBhcGFydCBmcm9tIGZpeGluZyB0aGUgbGF2ZXJpbmcgdmlv bGF0aW9uLCBtb3ZpbmcgdGhlIGNvZGUKbGV0cyB1cyBlbGltaW5hdGUgdGhlIGltcGxpY2l0bHkt dXNlZCBsb2NhbCAnZGV2X3ByaXYnIGZyb20gdGhlIGNhbGxlci4KClNpZ25lZC1vZmYtYnk6IERh dmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgOCArKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIg aW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMKaW5kZXggMjg0ZGExMC4uYjQ3ZDE0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtNTUxLDYgKzU1MSw4IEBAIHN0YXRpYyBib29sIHN0b3Bf cmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCQlJOTE1X1dSSVRFX01PREUocmlu ZywgX01BU0tFRF9CSVRfRElTQUJMRShTVE9QX1JJTkcpKTsKIAl9CiAKKwlXQVJOX09OKCFJU19H RU4yKHJpbmctPmRldikgJiYgKEk5MTVfUkVBRF9NT0RFKHJpbmcpICYgTU9ERV9JRExFKSA9PSAw KTsKKwogCXJldHVybiAoSTkxNV9SRUFEX0hFQUQocmluZykgJiBIRUFEX0FERFIpID09IDA7CiB9 CiAKQEAgLTIyNjAsMTcgKzIyNjIsMTEgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVm ZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIHZvaWQgaW50ZWxfY2xlYW51cF9yaW5nX2J1 ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewotCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdjsKLQogCWlmICghaW50ZWxfcmluZ19pbml0aWFsaXplZChyaW5nKSkK IAkJcmV0dXJuOwogCi0JZGV2X3ByaXYgPSB0b19pOTE1KHJpbmctPmRldik7Ci0KIAlpZiAocmlu Zy0+YnVmZmVyKSB7CiAJCWludGVsX3N0b3BfcmluZ19idWZmZXIocmluZyk7Ci0JCVdBUk5fT04o IUlTX0dFTjIocmluZy0+ZGV2KSAmJiAoSTkxNV9SRUFEX01PREUocmluZykgJiBNT0RFX0lETEUp ID09IDApOwotCiAJCWludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKHJpbmctPmJ1ZmZlcik7CiAJ CWludGVsX3JpbmdidWZmZXJfZnJlZShyaW5nLT5idWZmZXIpOwogCQlyaW5nLT5idWZmZXIgPSBO VUxMOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==