From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH v4 1/6] drm/i915: tidy up initialisation failure
	paths (legacy)
Date: Fri, 29 Jan 2016 19:19:26 +0000
Message-ID: <1454095171-22475-2-git-send-email-david.s.gordon@intel.com>
References: <1454095171-22475-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 B98766EA08
 for <intel-gfx@lists.freedesktop.org>; Fri, 29 Jan 2016 11:19:46 -0800 (PST)
In-Reply-To: <1454095171-22475-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

MS4gRml4IGludGVsX2NsZWFudXBfcmluZ19idWZmZXIoKSB0byBoYW5kbGUgdGhlIGVycm9yIGNs
ZWFudXAKICAgY2FzZSB3aGVyZSB0aGUgcmluZ2J1ZmZlciBoYXMgYmVlbiBhbGxvY2F0ZWQgYnV0
IG1hcC1hbmQtcGluCiAgIGZhaWxlZC4gVW5waW4gaXQgaWZmIGl0J3MgcHJldmlvdXNseSBiZWVu
IG1hcHBlZC1hbmQtcGlubmVkLgoKMi4gRml4IHRoZSBlcnJvciBwYXRoIGluIGludGVsX2luaXRf
cmluZ19idWZmZXIoKSwgd2hpY2ggYWxyZWFkeQogICBjYWxsZWQgaW50ZWxfZGVzdHJveV9yaW5n
YnVmZmVyX29iaigpLCBidXQgZmFpbGVkIHRvIGZyZWUgdGhlCiAgIGFjdHVhbCByaW5nYnVmZmVy
IHN0cnVjdHVyZS4gQ2FsbGluZyBpbnRlbF9yaW5nYnVmZmVyX2ZyZWUoKQogICBpbnN0ZWFkIGRv
ZXMgYm90aCBpbiBvbmUgZ28uCgozLiBXaXRoIHRoZSBhYm92ZSBjaGFuZ2UsIGludGVsX2Rlc3Ry
b3lfcmluZ2J1ZmZlcl9vYmooKSBpcyBvbmx5CiAgIGNhbGxlZCBpbiBvbmUgcGxhY2UgKGludGVs
X3JpbmdidWZmZXJfZnJlZSgpKSwgc28gZmxhdHRlbiBpdAogICBpbnRvIHRoYXQgZnVuY3Rpb24u
Cgo0LiBtb3ZlIGxvdy1sZXZlbCByZWdpc3RlciBhY2Nlc3NlcyBmcm9tIGludGVsX2NsZWFudXBf
cmluZ19idWZmZXIoKQogICAod2hpY2ggY2FsbHMgaW50ZWxfc3RvcF9yaW5nX2J1ZmZlcihyaW5n
KSB3aGljaCBjYWxscyBzdG9wX3JpbmcoKSkKICAgZG93biBpbnRvIHN0b3BfcmluZygpIGl0c2Vs
ZiksIHdoaWNoIGlzIGFscmVhZHkgZG9pbmcgbG93LWxldmVsCiAgIHJlZ2lzdGVyIGFjY2Vzc2Vz
LiBUaGVuLCBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKCkgbm8gbG9uZ2VyCiAgIG5lZWRzICdk
ZXZfcHJpdicuCgp2MzoKICAgTWFrZSBpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaigpIHJldHVy
biBlYXJseSBpZiByaW5nYnVmZmVyIGlzCiAgIG5vdCBtYXBwZWQsIHNpbXBsaWZ5aW5nIG1hdHRl
cnMgZm9yIHRoZSBjYWxsZXIuIFtDaHJpcyBXaWxzb24sCiAgIERhbmllbCBWZXR0ZXJdCiAgIERv
bid0IGJvdGhlciB0byBjbGVhciBhIHBvaW50ZXIgaW4gYW4gb2JqZWN0IGFib3V0IHRvIGJlIGZy
ZWVkLgogICBbQ2hyaXMgV2lsc29uXQoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlk
LnMuZ29yZG9uQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u
LmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDQ5
ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIzIGlu
c2VydGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp
bmdidWZmZXIuYwppbmRleCA2ZjViNTExLi5kYjAyODkzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfcmluZ2J1ZmZlci5jCkBAIC01NTEsNiArNTUxLDggQEAgc3RhdGljIGJvb2wgc3RvcF9y
aW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCUk5MTVfV1JJVEVfTU9ERShyaW5n
LCBfTUFTS0VEX0JJVF9ESVNBQkxFKFNUT1BfUklORykpOwogCX0KIAorCVdBUk5fT04oIUlTX0dF
TjIocmluZy0+ZGV2KSAmJiAoSTkxNV9SRUFEX01PREUocmluZykgJiBNT0RFX0lETEUpID09IDAp
OworCiAJcmV0dXJuIChJOTE1X1JFQURfSEVBRChyaW5nKSAmIEhFQURfQUREUikgPT0gMDsKIH0K
IApAQCAtMjA1NSw2ICsyMDU3LDkgQEAgc3RhdGljIGludCBpbml0X3BoeXNfc3RhdHVzX3BhZ2Uo
c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAogdm9pZCBpbnRlbF91bnBpbl9yaW5nYnVm
ZmVyX29iaihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIHsKKwlpZiAoIXJpbmdi
dWYtPnZpcnR1YWxfc3RhcnQpCisJCXJldHVybjsKKwogCWlmIChIQVNfTExDKHJpbmdidWYtPm9i
ai0+YmFzZS5kZXYpICYmICFyaW5nYnVmLT5vYmotPnN0b2xlbikKIAkJdnVubWFwKHJpbmdidWYt
PnZpcnR1YWxfc3RhcnQpOwogCWVsc2UKQEAgLTIxMzIsMTIgKzIxMzcsNiBAQCBpbnQgaW50ZWxf
cGluX2FuZF9tYXBfcmluZ2J1ZmZlcl9vYmooc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlyZXR1
cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfZGVzdHJveV9yaW5nYnVmZmVyX29iaihzdHJ1
Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKLXsKLQlkcm1fZ2VtX29iamVjdF91bnJlZmVy
ZW5jZSgmcmluZ2J1Zi0+b2JqLT5iYXNlKTsKLQlyaW5nYnVmLT5vYmogPSBOVUxMOwotfQotCiBz
dGF0aWMgaW50IGludGVsX2FsbG9jX3JpbmdidWZmZXJfb2JqKHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYsCiAJCQkJICAgICAgc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCiB7CkBAIC0y
MjAwLDExICsyMTk5LDEzIEBAIHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICoKIH0KIAogdm9pZAot
aW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nKQoraW50
ZWxfcmluZ2J1ZmZlcl9mcmVlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogewot
CWludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmoocmluZyk7Ci0JbGlzdF9kZWwoJnJpbmctPmxp
bmspOwotCWtmcmVlKHJpbmcpOworCWlmIChyaW5nYnVmLT5vYmopCisJCWRybV9nZW1fb2JqZWN0
X3VucmVmZXJlbmNlKCZyaW5nYnVmLT5vYmotPmJhc2UpOworCisJbGlzdF9kZWwoJnJpbmdidWYt
PmxpbmspOworCWtmcmVlKHJpbmdidWYpOwogfQogCiBzdGF0aWMgaW50IGludGVsX2luaXRfcmlu
Z19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKQEAgLTIyMzIsNiArMjIzMywxMyBAQCBz
dGF0aWMgaW50IGludGVsX2luaXRfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK
IAl9CiAJcmluZy0+YnVmZmVyID0gcmluZ2J1ZjsKIAorCXJldCA9IGludGVsX3Bpbl9hbmRfbWFw
X3JpbmdidWZmZXJfb2JqKGRldiwgcmluZ2J1Zik7CisJaWYgKHJldCkgeworCQlEUk1fRVJST1Io
IkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVmZmVyICVzOiAlZFxuIiwKKwkJCQlyaW5nLT5u
YW1lLCByZXQpOworCQlnb3RvIGVycm9yOworCX0KKwogCWlmIChJOTE1X05FRURfR0ZYX0hXUyhk
ZXYpKSB7CiAJCXJldCA9IGluaXRfc3RhdHVzX3BhZ2UocmluZyk7CiAJCWlmIChyZXQpCkBAIC0y
MjQzLDE0ICsyMjUxLDYgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVj
dCBkcm1fZGV2aWNlICpkZXYsCiAJCQlnb3RvIGVycm9yOwogCX0KIAotCXJldCA9IGludGVsX3Bp
bl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKGRldiwgcmluZ2J1Zik7Ci0JaWYgKHJldCkgewotCQlE
Uk1fRVJST1IoIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVmZmVyICVzOiAlZFxuIiwKLQkJ
CQlyaW5nLT5uYW1lLCByZXQpOwotCQlpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHJpbmdi
dWYpOwotCQlnb3RvIGVycm9yOwotCX0KLQogCXJldCA9IGk5MTVfY21kX3BhcnNlcl9pbml0X3Jp
bmcocmluZyk7CiAJaWYgKHJldCkKIAkJZ290byBlcnJvcjsKQEAgLTIyNjQsMTkgKzIyNjQsMTYg
QEAgc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYsCiAKIHZvaWQgaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5l
X2NzICpyaW5nKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdjsKKwlzdHJ1
Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZjsKIAogCWlmICghaW50ZWxfcmluZ19pbml0aWFs
aXplZChyaW5nKSkKIAkJcmV0dXJuOwogCi0JZGV2X3ByaXYgPSB0b19pOTE1KHJpbmctPmRldik7
Ci0KLQlpZiAocmluZy0+YnVmZmVyKSB7CisJcmluZ2J1ZiA9IHJpbmctPmJ1ZmZlcjsKKwlpZiAo
cmluZ2J1ZikgewogCQlpbnRlbF9zdG9wX3JpbmdfYnVmZmVyKHJpbmcpOwotCQlXQVJOX09OKCFJ
U19HRU4yKHJpbmctPmRldikgJiYgKEk5MTVfUkVBRF9NT0RFKHJpbmcpICYgTU9ERV9JRExFKSA9
PSAwKTsKLQotCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihyaW5nLT5idWZmZXIpOwotCQlp
bnRlbF9yaW5nYnVmZmVyX2ZyZWUocmluZy0+YnVmZmVyKTsKKwkJaW50ZWxfdW5waW5fcmluZ2J1
ZmZlcl9vYmoocmluZ2J1Zik7CisJCWludGVsX3JpbmdidWZmZXJfZnJlZShyaW5nYnVmKTsKIAkJ
cmluZy0+YnVmZmVyID0gTlVMTDsKIAl9CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs
LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t
YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=