From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH v2 3/6] drm/i915: tidy up initialisation failure
	paths (legacy)
Date: Fri, 22 Jan 2016 23:10:08 +0000
Message-ID: <1453504211-7982-4-git-send-email-david.s.gordon@intel.com>
References: <1453504211-7982-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 mga04.intel.com (mga04.intel.com [192.55.52.120])
 by gabe.freedesktop.org (Postfix) with ESMTP id 4B7D86ECF2
 for <intel-gfx@lists.freedesktop.org>; Fri, 22 Jan 2016 15:10:21 -0800 (PST)
In-Reply-To: <1453504211-7982-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
ZWFudXAgY2FzZSB3aGVyZQogICB0aGUgcmluZ2J1ZmZlciBoYXMgYmVlbiBhbGxvY2F0ZWQgYnV0
IG1hcC1hbmQtcGluIGZhaWxlZC4gIFVucGluIGl0IGlmZgogICBpdCdzIHByZXZpb3VzbHkgYmVl
biBtYXBwZWQtYW5kLXBpbm5lZC4KCjIuIEZpeCB0aGUgZXJyb3IgcGF0aCBpbiBpbnRlbF9pbml0
X3JpbmdfYnVmZmVyKCksIHdoaWNoIGFscmVhZHkgY2FsbGVkCiAgIGludGVsX2Rlc3Ryb3lfcmlu
Z2J1ZmZlcl9vYmooKSwgYnV0IGZhaWxlZCB0byBmcmVlIHRoZSBhY3R1YWwgcmluZ2J1ZmZlcgog
ICBzdHJ1Y3R1cmUuIENhbGxpbmcgaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKCkgaW5zdGVhZCBkb2Vz
IGJvdGggaW4gb25lIGdvLgoKMy4gV2l0aCB0aGUgYWJvdmUgY2hhbmdlLCBpbnRlbF9kZXN0cm95
X3JpbmdidWZmZXJfb2JqKCkgaXMgb25seSBjYWxsZWQgaW4KICAgb25lIHBsYWNlIChpbnRlbF9y
aW5nYnVmZmVyX2ZyZWUoKSksIHNvIGZsYXR0ZW4gaXQgaW50byB0aGF0IGZ1bmN0aW9uLgoKNC4g
bW92ZSBsb3ctbGV2ZWwgcmVnaXN0ZXIgYWNjZXNzZXMgZnJvbSBpbnRlbF9jbGVhbnVwX3Jpbmdf
YnVmZmVyKCkKICAgKHdoaWNoIGNhbGxzIGludGVsX3N0b3BfcmluZ19idWZmZXIocmluZykgd2hp
Y2ggY2FsbHMgc3RvcF9yaW5nKCkpCiAgIGRvd24gaW50byBzdG9wX3JpbmcoKSBpdHNlbGYpLCB3
aGljaCBpcyBhbHJlYWR5IGRvaW5nIGxvdy1sZXZlbAogICByZWdpc3RlciBhY2Nlc3Nlcy4gVGhl
biwgaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZlcigpIG5vIGxvbmdlcgogICBuZWVkcyAnZGV2X3By
aXYnLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNv
bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCA0NyArKysr
KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRp
b25zKCspLCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm
ZmVyLmMKaW5kZXggOTAzMGUyYi4uMjlkZTY0ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X3JpbmdidWZmZXIuYwpAQCAtNTUxLDYgKzU1MSw4IEBAIHN0YXRpYyBib29sIHN0b3BfcmluZyhz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCQlJOTE1X1dSSVRFX01PREUocmluZywgX01B
U0tFRF9CSVRfRElTQUJMRShTVE9QX1JJTkcpKTsKIAl9CiAKKwlXQVJOX09OKCFJU19HRU4yKHJp
bmctPmRldikgJiYgKEk5MTVfUkVBRF9NT0RFKHJpbmcpICYgTU9ERV9JRExFKSA9PSAwKTsKKwog
CXJldHVybiAoSTkxNV9SRUFEX0hFQUQocmluZykgJiBIRUFEX0FERFIpID09IDA7CiB9CiAKQEAg
LTIwNzEsMTIgKzIwNzMsNiBAQCBpbnQgaW50ZWxfcGluX2FuZF9tYXBfcmluZ2J1ZmZlcl9vYmoo
c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgaW50
ZWxfZGVzdHJveV9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1
ZikKLXsKLQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmcmluZ2J1Zi0+b2JqLT5iYXNlKTsK
LQlyaW5nYnVmLT5vYmogPSBOVUxMOwotfQotCiBzdGF0aWMgaW50IGludGVsX2FsbG9jX3Jpbmdi
dWZmZXJfb2JqKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICAgICAgc3RydWN0IGludGVs
X3JpbmdidWZmZXIgKnJpbmdidWYpCiB7CkBAIC0yMTM5LDExICsyMTM1LDE0IEBAIHN0cnVjdCBp
bnRlbF9yaW5nYnVmZmVyICoKIH0KIAogdm9pZAotaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHN0cnVj
dCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nKQoraW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHN0cnVjdCBp
bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogewotCWludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9v
YmoocmluZyk7Ci0JbGlzdF9kZWwoJnJpbmctPmxpbmspOwotCWtmcmVlKHJpbmcpOworCWlmIChy
aW5nYnVmLT5vYmopIHsKKwkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJnJpbmdidWYtPm9i
ai0+YmFzZSk7CisJCXJpbmdidWYtPm9iaiA9IE5VTEw7CisJfQorCWxpc3RfZGVsKCZyaW5nYnVm
LT5saW5rKTsKKwlrZnJlZShyaW5nYnVmKTsKIH0KIAogc3RhdGljIGludCBpbnRlbF9pbml0X3Jp
bmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCkBAIC0yMTcxLDYgKzIxNzAsMTMgQEAg
c3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs
CiAJfQogCXJpbmctPmJ1ZmZlciA9IHJpbmdidWY7CiAKKwlyZXQgPSBpbnRlbF9waW5fYW5kX21h
cF9yaW5nYnVmZmVyX29iaihkZXYsIHJpbmdidWYpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9S
KCJGYWlsZWQgdG8gcGluIGFuZCBtYXAgcmluZ2J1ZmZlciAlczogJWRcbiIsCisJCQkJcmluZy0+
bmFtZSwgcmV0KTsKKwkJZ290byBlcnJvcjsKKwl9CisKIAlpZiAoSTkxNV9ORUVEX0dGWF9IV1Mo
ZGV2KSkgewogCQlyZXQgPSBpbml0X3N0YXR1c19wYWdlKHJpbmcpOwogCQlpZiAocmV0KQpAQCAt
MjE4MiwxNCArMjE4OCw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJZ290byBlcnJvcjsKIAl9CiAKLQlyZXQgPSBpbnRlbF9w
aW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihkZXYsIHJpbmdidWYpOwotCWlmIChyZXQpIHsKLQkJ
RFJNX0VSUk9SKCJGYWlsZWQgdG8gcGluIGFuZCBtYXAgcmluZ2J1ZmZlciAlczogJWRcbiIsCi0J
CQkJcmluZy0+bmFtZSwgcmV0KTsKLQkJaW50ZWxfZGVzdHJveV9yaW5nYnVmZmVyX29iaihyaW5n
YnVmKTsKLQkJZ290byBlcnJvcjsKLQl9Ci0KIAlyZXQgPSBpOTE1X2NtZF9wYXJzZXJfaW5pdF9y
aW5nKHJpbmcpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyb3I7CkBAIC0yMjAzLDE5ICsyMjAxLDE4
IEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2LAogCiB2b2lkIGludGVsX2NsZWFudXBfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2lu
ZV9jcyAqcmluZykKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXY7CisJc3Ry
dWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7CiAKIAlpZiAoIWludGVsX3JpbmdfaW5pdGlh
bGl6ZWQocmluZykpCiAJCXJldHVybjsKIAotCWRldl9wcml2ID0gdG9faTkxNShyaW5nLT5kZXYp
OwotCi0JaWYgKHJpbmctPmJ1ZmZlcikgeworCXJpbmdidWYgPSByaW5nLT5idWZmZXI7CisJaWYg
KHJpbmdidWYpIHsKIAkJaW50ZWxfc3RvcF9yaW5nX2J1ZmZlcihyaW5nKTsKLQkJV0FSTl9PTigh
SVNfR0VOMihyaW5nLT5kZXYpICYmIChJOTE1X1JFQURfTU9ERShyaW5nKSAmIE1PREVfSURMRSkg
PT0gMCk7CiAKLQkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoocmluZy0+YnVmZmVyKTsKLQkJ
aW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmctPmJ1ZmZlcik7CisJCWlmIChyaW5nYnVmLT52aXJ0
dWFsX3N0YXJ0KQorCQkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7CisJCWlu
dGVsX3JpbmdidWZmZXJfZnJlZShyaW5nYnVmKTsKIAkJcmluZy0+YnVmZmVyID0gTlVMTDsKIAl9
CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v
cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm
eAo=