From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH 3/4] drm/i915: tidy up initialisation failure
	paths (legacy)
Date: Wed, 16 Dec 2015 18:36:50 +0000
Message-ID: <1450291011-31486-4-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 24EAB6E132
 for <intel-gfx@lists.freedesktop.org>; Wed, 16 Dec 2015 10:37:09 -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

MS4gRml4IGludGVsX2NsZWFudXBfcmluZ19idWZmZXIoKSB0byBoYW5kbGUgdGhlIGVycm9yIGNs
ZWFudXAKICAgY2FzZSB3aGVyZSB0aGUgcmluZ2J1ZmZlciBoYXMgYmVlbiBhbGxvY2F0ZWQgYnV0
IG1hcC1hbmQtcGluCiAgIGZhaWxlZC4gVW5waW4gaXQgaWZmIGl0J3MgcHJldmlvdXNseSBiZWVu
IG1hcHBlZC1hbmQtcGlubmVkLgoKMi4gRml4IHRoZSBlcnJvciBwYXRoIGluIGludGVsX2luaXRf
cmluZ19idWZmZXIoKSwgd2hpY2ggYWxyZWFkeQogICBjYWxsZWQgaW50ZWxfZGVzdHJveV9yaW5n
YnVmZmVyX29iaigpLCBidXQgZmFpbGVkIHRvIGZyZWUgdGhlCiAgIGFjdHVhbCByaW5nYnVmZmVy
IHN0cnVjdHVyZS4gQ2FsbGluZyBpbnRlbF9yaW5nYnVmZmVyX2ZyZWUoKQogICBpbnN0ZWFkIGRv
ZXMgYm90aCBpbiBvbmUgZ28uCgozLiBXaXRoIHRoZSBhYm92ZSBjaGFuZ2UsIGludGVsX2Rlc3Ry
b3lfcmluZ2J1ZmZlcl9vYmooKSBpcyBvbmx5CiAgIGNhbGxlZCBpbiBvbmUgcGxhY2UgKGludGVs
X3JpbmdidWZmZXJfZnJlZSgpKSwgc28gZmxhdHRlbiBpdAogICBpbnRvIHRoYXQgZnVuY3Rpb24u
Cgo0LiBtb3ZlIGxvdy1sZXZlbCByZWdpc3RlciBhY2Nlc3NlcyBmcm9tIGludGVsX2NsZWFudXBf
cmluZ19idWZmZXIoKQogICAod2hpY2ggY2FsbHMgaW50ZWxfc3RvcF9yaW5nX2J1ZmZlcihyaW5n
KSB3aGljaCBjYWxscyBzdG9wX3JpbmcoKSkKICAgZG93biBpbnRvIHN0b3BfcmluZygpIGl0c2Vs
ZiksIHdoaWNoIGlzIGFscmVhZHkgZG9pbmcgbG93LWxldmVsCiAgIHJlZ2lzdGVyIGFjY2Vzc2Vz
LiBUaGVuLCBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKCkgbm8gbG9uZ2VyCiAgIG5lZWRzICdk
ZXZfcHJpdicuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50
ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDQ3
ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIyIGlu
c2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp
bmdidWZmZXIuYwppbmRleCBlZWZjZTlhLi4yODUzNzU0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfcmluZ2J1ZmZlci5jCkBAIC01NDksNiArNTQ5LDggQEAgc3RhdGljIGJvb2wgc3RvcF9y
aW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCUk5MTVfV1JJVEVfTU9ERShyaW5n
LCBfTUFTS0VEX0JJVF9ESVNBQkxFKFNUT1BfUklORykpOwogCX0KIAorCVdBUk5fT04oIUlTX0dF
TjIocmluZy0+ZGV2KSAmJiAoSTkxNV9SRUFEX01PREUocmluZykgJiBNT0RFX0lETEUpID09IDAp
OworCiAJcmV0dXJuIChJOTE1X1JFQURfSEVBRChyaW5nKSAmIEhFQURfQUREUikgPT0gMDsKIH0K
IApAQCAtMjA1NywxMiArMjA1OSw2IEBAIGludCBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVy
X29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9p
ZCBpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpy
aW5nYnVmKQotewotCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZyaW5nYnVmLT5vYmotPmJh
c2UpOwotCXJpbmdidWYtPm9iaiA9IE5VTEw7Ci19Ci0KIHN0YXRpYyBpbnQgaW50ZWxfYWxsb2Nf
cmluZ2J1ZmZlcl9vYmooc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgICAgICBzdHJ1Y3Qg
aW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIHsKQEAgLTIxMjUsMTEgKzIxMjEsMTQgQEAgaW50
ZWxfZW5naW5lX2NyZWF0ZV9yaW5nYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu
ZSwgaW50IHNpemUpCiB9CiAKIHZvaWQKLWludGVsX3JpbmdidWZmZXJfZnJlZShzdHJ1Y3QgaW50
ZWxfcmluZ2J1ZmZlciAqcmluZykKK2ludGVsX3JpbmdidWZmZXJfZnJlZShzdHJ1Y3QgaW50ZWxf
cmluZ2J1ZmZlciAqcmluZ2J1ZikKIHsKLQlpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHJp
bmcpOwotCWxpc3RfZGVsKCZyaW5nLT5saW5rKTsKLQlrZnJlZShyaW5nKTsKKwlpZiAocmluZ2J1
Zi0+b2JqKSB7CisJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZyaW5nYnVmLT5vYmotPmJh
c2UpOworCQlyaW5nYnVmLT5vYmogPSBOVUxMOworCX0KKwlsaXN0X2RlbCgmcmluZ2J1Zi0+bGlu
ayk7CisJa2ZyZWUocmluZ2J1Zik7CiB9CiAKIHN0YXRpYyBpbnQgaW50ZWxfaW5pdF9yaW5nX2J1
ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LApAQCAtMjE1Nyw2ICsyMTU2LDEzIEBAIHN0YXRp
YyBpbnQgaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0K
IAlyaW5nLT5idWZmZXIgPSByaW5nYnVmOwogCisJcmV0ID0gaW50ZWxfcGluX2FuZF9tYXBfcmlu
Z2J1ZmZlcl9vYmooZGV2LCByaW5nYnVmKTsKKwlpZiAocmV0KSB7CisJCURSTV9FUlJPUigiRmFp
bGVkIHRvIHBpbiBhbmQgbWFwIHJpbmdidWZmZXIgJXM6ICVkXG4iLAorCQkJCXJpbmctPm5hbWUs
IHJldCk7CisJCWdvdG8gZXJyb3I7CisJfQorCiAJaWYgKEk5MTVfTkVFRF9HRlhfSFdTKGRldikp
IHsKIAkJcmV0ID0gaW5pdF9zdGF0dXNfcGFnZShyaW5nKTsKIAkJaWYgKHJldCkKQEAgLTIxNjgs
MTQgKzIxNzQsNiBAQCBzdGF0aWMgaW50IGludGVsX2luaXRfcmluZ19idWZmZXIoc3RydWN0IGRy
bV9kZXZpY2UgKmRldiwKIAkJCWdvdG8gZXJyb3I7CiAJfQogCi0JcmV0ID0gaW50ZWxfcGluX2Fu
ZF9tYXBfcmluZ2J1ZmZlcl9vYmooZGV2LCByaW5nYnVmKTsKLQlpZiAocmV0KSB7Ci0JCURSTV9F
UlJPUigiRmFpbGVkIHRvIHBpbiBhbmQgbWFwIHJpbmdidWZmZXIgJXM6ICVkXG4iLAotCQkJCXJp
bmctPm5hbWUsIHJldCk7Ci0JCWludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7
Ci0JCWdvdG8gZXJyb3I7Ci0JfQotCiAJcmV0ID0gaTkxNV9jbWRfcGFyc2VyX2luaXRfcmluZyhy
aW5nKTsKIAlpZiAocmV0KQogCQlnb3RvIGVycm9yOwpAQCAtMjE4OSwxOSArMjE4NywxOCBAQCBl
cnJvcjoKIAogdm9pZCBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKnJpbmcpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2OworCXN0
cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmOwogCiAJaWYgKCFpbnRlbF9yaW5nX2luaXRp
YWxpemVkKHJpbmcpKQogCQlyZXR1cm47CiAKLQlkZXZfcHJpdiA9IHRvX2k5MTUocmluZy0+ZGV2
KTsKLQotCWlmIChyaW5nLT5idWZmZXIpIHsKKwlyaW5nYnVmID0gcmluZy0+YnVmZmVyOworCWlm
IChyaW5nYnVmKSB7CiAJCWludGVsX3N0b3BfcmluZ19idWZmZXIocmluZyk7Ci0JCVdBUk5fT04o
IUlTX0dFTjIocmluZy0+ZGV2KSAmJiAoSTkxNV9SRUFEX01PREUocmluZykgJiBNT0RFX0lETEUp
ID09IDApOwogCi0JCWludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKHJpbmctPmJ1ZmZlcik7Ci0J
CWludGVsX3JpbmdidWZmZXJfZnJlZShyaW5nLT5idWZmZXIpOworCQlpZiAocmluZ2J1Zi0+dmly
dHVhbF9zdGFydCkKKwkJCWludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKHJpbmdidWYpOworCQlp
bnRlbF9yaW5nYnVmZmVyX2ZyZWUocmluZ2J1Zik7CiAJCXJpbmctPmJ1ZmZlciA9IE5VTEw7CiAJ
fQogCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au
b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n
ZngK