From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v5 06/11] drm/i915: tidy initialisation failure paths (legacy, part 2) Date: Fri, 5 Feb 2016 18:33:43 +0000 Message-ID: <1454697228-33164-7-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 00A756EA52 for ; Fri, 5 Feb 2016 10:34:07 -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 QWZ0ZXIgdGhlIGxhc3QgcGF0Y2gsIHRoZXJlIGlzIG9ubHkgb25lIGNhbGxlciBvZiB0aGUgdHJp dmlhbCBmdW5jdGlvbgppbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKCksIHNvIHdlIG1pZ2h0 IGFzIHdlbGwgZm9sZCBpdCBpbnRvIHRoZQpjYWxsZXIuCgp2MzoKICAgRG9uJ3QgYm90aGVyIHRv IGNsZWFyIGEgcG9pbnRlciBpbiBhbiBvYmplY3QgYWJvdXQgdG8gYmUgZnJlZWQuCiAgIFtDaHJp cyBXaWxzb25dCgp2NDoKICAgRG9uJ3QgYm90aGVyIHRvIGNoZWNrIGZvciBOVUxMIHBvaW50ZXIs IGFzIGRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlCiAgIGNhbiBoYW5kbGUgTlVMTCBbQ2hyaXMg V2lsc29uXS4gVGhpcyByZWxpZXMgb24gJ2Jhc2UnIGJlaW5nIHRoZSB2ZXJ5CiAgIGZpcnN0IG1l bWJlciBvZiAnc3RydWN0IGludGVsX3JpbmdidWZmZXInIQoKU2lnbmVkLW9mZi1ieTogRGF2ZSBH b3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYyB8IDE0ICsrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25z KCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmMKaW5kZXggM2UxYWVjOC4uMjg0ZGExMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYwpAQCAtMjEzNSwxMiArMjEzNSw2IEBAIGludCBpbnRlbF9waW5fYW5kX21hcF9y aW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiAwOwogfQogCi1z dGF0aWMgdm9pZCBpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmKQotewotCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZyaW5nYnVm LT5vYmotPmJhc2UpOwotCXJpbmdidWYtPm9iaiA9IE5VTEw7Ci19Ci0KIHN0YXRpYyBpbnQgaW50 ZWxfYWxsb2NfcmluZ2J1ZmZlcl9vYmooc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgICAg ICBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIHsKQEAgLTIyMDMsMTEgKzIxOTcs MTEgQEAgc3RydWN0IGludGVsX3JpbmdidWZmZXIgKgogfQogCiB2b2lkCi1pbnRlbF9yaW5nYnVm ZmVyX2ZyZWUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmcpCitpbnRlbF9yaW5nYnVmZmVy X2ZyZWUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCiB7Ci0JaW50ZWxfZGVzdHJv eV9yaW5nYnVmZmVyX29iaihyaW5nKTsKLQlsaXN0X2RlbCgmcmluZy0+bGluayk7Ci0Ja2ZyZWUo cmluZyk7CisJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJnJpbmdidWYtPm9iai0+YmFzZSk7 CisJbGlzdF9kZWwoJnJpbmdidWYtPmxpbmspOworCWtmcmVlKHJpbmdidWYpOwogfQogCiBzdGF0 aWMgaW50IGludGVsX2luaXRfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKLS0g CjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=