From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH 4/4] drm/i915: tidy up initialisation failure
	paths (GEM & LRC)
Date: Wed, 16 Dec 2015 18:36:51 +0000
Message-ID: <1450291011-31486-5-git-send-email-david.s.gordon@intel.com>
References: <1450291011-31486-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id 471C26E122
 for <intel-gfx@lists.freedesktop.org>; Wed, 16 Dec 2015 10:37:10 -0800 (PST)
In-Reply-To: <1450291011-31486-1-git-send-email-david.s.gordon@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

MS4gYWRkIGNhbGwgdG8gaTkxNV9nZW1fY29udGV4dF9maW5pKCkgdG8gZGVhbGxvY2F0ZSB0aGUg
ZGVmYXVsdAogICBjb250ZXh0KHMpIGlmIHRoZSBjYWxsIHRvIGluaXRfcmluZ3MoKSBmYWlscywg
c28gdGhhdCB3ZSBkb24ndAogICBsZWFrIHRoZSBjb250ZXh0IGluIHRoYXQgc2l0dWF0aW9uLgoK
Mi4gcmVtb3ZlIHVzZWxlc3MgY29kZSBpbiBpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cCgpLCBw
cmVzdW1hYmx5CiAgIGNvcHlwYXN0ZWQgZnJvbSBsZWdhY3kgcmluZ2J1ZmZlciB2ZXJzaW9uIGF0
IGNyZWF0aW9uLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGlu
dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICB8ICA1ICsrKyst
CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyB8IDEwICsrLS0tLS0tLS0KIDIgZmls
ZXMgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbS5jCmluZGV4IDY2YjE3MDUuLjE1Zjg5ODkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u
YwpAQCAtNDg5MCw4ICs0ODkwLDExIEBAIGludCBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1fZGV2
aWNlICpkZXYpCiAJCWdvdG8gb3V0X3VubG9jazsKIAogCXJldCA9IGRldl9wcml2LT5ndC5pbml0
X3JpbmdzKGRldik7Ci0JaWYgKHJldCkKKwlpZiAocmV0KSB7CisJCWk5MTVfZ2VtX2NvbnRleHRf
ZmluaShkZXYpOworCQkvKiBYWFg6IGFueXRoaW5nIGVsc2UgdG8gYmUgdW5kb25lIGhlcmU/ICov
CiAJCWdvdG8gb3V0X3VubG9jazsKKwl9CiAKIAlyZXQgPSBpOTE1X2dlbV9pbml0X2h3KGRldik7
CiAJaWYgKHJldCA9PSAtRUlPKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDIzZjkw
YjIuLmNkYjY1ZWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xODg3LDE3ICsxODg3
LDExIEBAIHN0YXRpYyBpbnQgZ2VuOF9pbml0X3Jjc19jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9n
ZW1fcmVxdWVzdCAqcmVxKQogICovCiB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19jbGVhbnVwKHN0
cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2OwotCiAJaWYgKCFpbnRlbF9yaW5nX2luaXRpYWxpemVkKHJpbmcpKQogCQlyZXR1
cm47CiAKLQlkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7Ci0KLQlpZiAocmluZy0+
YnVmZmVyKSB7Ci0JCWludGVsX2xvZ2ljYWxfcmluZ19zdG9wKHJpbmcpOwotCQlXQVJOX09OKChJ
OTE1X1JFQURfTU9ERShyaW5nKSAmIE1PREVfSURMRSkgPT0gMCk7Ci0JfQorCS8qIHNob3VsZCBu
b3QgYmUgc2V0IGluIExSQyBtb2RlICovCisJV0FSTl9PTihyaW5nLT5idWZmZXIpOwogCiAJaWYg
KHJpbmctPmNsZWFudXApCiAJCXJpbmctPmNsZWFudXAocmluZyk7Ci0tIAoxLjkuMQoKX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp
bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl
ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK