From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>
Subject: Re: [PATCH] drm/i915: Fix plane init failure paths
Date: Fri, 1 Apr 2016 23:31:13 +0300
Message-ID: <20160401203113.GF4329@intel.com>
References: <1458571402-32749-1-git-send-email-matthew.auld@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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id D507C6ED88
 for <intel-gfx@lists.freedesktop.org>; Fri,  1 Apr 2016 20:31:16 +0000 (UTC)
Content-Disposition: inline
In-Reply-To: <1458571402-32749-1-git-send-email-matthew.auld@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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: Matthew Auld <matthew.auld@intel.com>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

T24gTW9uLCBNYXIgMjEsIDIwMTYgYXQgMDI6NDM6MjJQTSArMDAwMCwgTWF0dGhldyBBdWxkIHdy
b3RlOgo+IEZyb206IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j
b20+Cj4gCj4gRGVhbCB3aXRoIGVycm9ycyBmcm9tIGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdCgp
IGluIHByaW1hcnkgYW5kIGN1cnNvcgo+IHBsYW5lIGluaXQgcGF0aHMgKHNwcml0ZXMgd2VyZSBh
bHJlYWR5IGNvdmVyZWQpLiBBbHNvIG1ha2UgdGhlIGNvZGUKPiBuZWF0ZXIgYnkgdXNpbmcgZ290
byBmb3IgZXJyb3IgaGFuZGxpbmcuCj4gCj4gdjI6IFJlYmFzZWQgZHVlIHRvIGRybV91bml2ZXJz
YWxfcGxhbmVfaW5pdCgpICduYW1lJyBwYXJhbWV0ZXIKPiB2MzogQW5vdGhlciByZWJhc2UgZHVl
IHRvIHMvIiIvTlVMTC8KPiB2NDogUmViYXNlZCBvbiBkcm0tbmlnaHRseSAoTWF0dGhldyBBdWxk
KQo+IHY1OiBGaXggZW1haWwgYWRkcmVzcyAoTWF0dGhldyBBdWxkKQo+IAo+IFNpZ25lZC1vZmYt
Ynk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gUmV2
aWV3ZWQtYnk6IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KClB1c2hlZCB0
byBkaW5xLiBUaGFua3MgZm9yIHRoZSByZXZpZXcuCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA2NCArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t
LS0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgMzQgKysrKysr
KysrKystLS0tLS0tLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDYwIGluc2VydGlvbnMoKyksIDM4IGRl
bGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCA3
NGIwMTY1Li5mM2Y2ZmQxIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+
IEBAIC0xMzk2MSwyMCArMTM5NjEsMTkgQEAgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBp
bnRlbF9wbGFuZV9mdW5jcyA9IHsKPiAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX3By
aW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAkJCQkJCSAgICBp
bnQgcGlwZSkKPiAgewo+IC0Jc3RydWN0IGludGVsX3BsYW5lICpwcmltYXJ5Owo+IC0Jc3RydWN0
IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZTsKPiArCXN0cnVjdCBpbnRlbF9wbGFuZSAqcHJpbWFy
eSA9IE5VTEw7Cj4gKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlID0gTlVMTDsKPiAg
CWNvbnN0IHVpbnQzMl90ICppbnRlbF9wcmltYXJ5X2Zvcm1hdHM7Cj4gIAl1bnNpZ25lZCBpbnQg
bnVtX2Zvcm1hdHM7Cj4gKwlpbnQgcmV0Owo+ICAKPiAgCXByaW1hcnkgPSBremFsbG9jKHNpemVv
ZigqcHJpbWFyeSksIEdGUF9LRVJORUwpOwo+IC0JaWYgKHByaW1hcnkgPT0gTlVMTCkKPiAtCQly
ZXR1cm4gTlVMTDsKPiArCWlmICghcHJpbWFyeSkKPiArCQlnb3RvIGZhaWw7Cj4gIAo+ICAJc3Rh
dGUgPSBpbnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUoJnByaW1hcnktPmJhc2UpOwo+IC0JaWYgKCFz
dGF0ZSkgewo+IC0JCWtmcmVlKHByaW1hcnkpOwo+IC0JCXJldHVybiBOVUxMOwo+IC0JfQo+ICsJ
aWYgKCFzdGF0ZSkKPiArCQlnb3RvIGZhaWw7Cj4gIAlwcmltYXJ5LT5iYXNlLnN0YXRlID0gJnN0
YXRlLT5iYXNlOwo+ICAKPiAgCXByaW1hcnktPmNhbl9zY2FsZSA9IGZhbHNlOwo+IEBAIC0xNDAx
NiwxMCArMTQwMTUsMTIgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX3ByaW1hcnlf
cGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAkJcHJpbWFyeS0+ZGlzYWJs
ZV9wbGFuZSA9IGk5eHhfZGlzYWJsZV9wcmltYXJ5X3BsYW5lOwo+ICAJfQo+ICAKPiAtCWRybV91
bml2ZXJzYWxfcGxhbmVfaW5pdChkZXYsICZwcmltYXJ5LT5iYXNlLCAwLAo+IC0JCQkJICZpbnRl
bF9wbGFuZV9mdW5jcywKPiAtCQkJCSBpbnRlbF9wcmltYXJ5X2Zvcm1hdHMsIG51bV9mb3JtYXRz
LAo+IC0JCQkJIERSTV9QTEFORV9UWVBFX1BSSU1BUlksIE5VTEwpOwo+ICsJcmV0ID0gZHJtX3Vu
aXZlcnNhbF9wbGFuZV9pbml0KGRldiwgJnByaW1hcnktPmJhc2UsIDAsCj4gKwkJCQkgICAgICAg
JmludGVsX3BsYW5lX2Z1bmNzLAo+ICsJCQkJICAgICAgIGludGVsX3ByaW1hcnlfZm9ybWF0cywg
bnVtX2Zvcm1hdHMsCj4gKwkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSwgTlVMTCk7
Cj4gKwlpZiAocmV0KQo+ICsJCWdvdG8gZmFpbDsKPiAgCj4gIAlpZiAoSU5URUxfSU5GTyhkZXYp
LT5nZW4gPj0gNCkKPiAgCQlpbnRlbF9jcmVhdGVfcm90YXRpb25fcHJvcGVydHkoZGV2LCBwcmlt
YXJ5KTsKPiBAQCAtMTQwMjcsNiArMTQwMjgsMTIgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUg
KmludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAlk
cm1fcGxhbmVfaGVscGVyX2FkZCgmcHJpbWFyeS0+YmFzZSwgJmludGVsX3BsYW5lX2hlbHBlcl9m
dW5jcyk7Cj4gIAo+ICAJcmV0dXJuICZwcmltYXJ5LT5iYXNlOwo+ICsKPiArZmFpbDoKPiArCWtm
cmVlKHN0YXRlKTsKPiArCWtmcmVlKHByaW1hcnkpOwo+ICsKPiArCXJldHVybiBOVUxMOwo+ICB9
Cj4gIAo+ICB2b2lkIGludGVsX2NyZWF0ZV9yb3RhdGlvbl9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Rl
dmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lKQo+IEBAIC0xNDE0MywxOCArMTQx
NTAsMTcgQEAgaW50ZWxfdXBkYXRlX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu
ZSwKPiAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX2N1cnNvcl9wbGFuZV9jcmVhdGUo
c3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCQkJCQkJICAgaW50IHBpcGUpCj4gIHsKPiAtCXN0
cnVjdCBpbnRlbF9wbGFuZSAqY3Vyc29yOwo+IC0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpz
dGF0ZTsKPiArCXN0cnVjdCBpbnRlbF9wbGFuZSAqY3Vyc29yID0gTlVMTDsKPiArCXN0cnVjdCBp
bnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUgPSBOVUxMOwo+ICsJaW50IHJldDsKPiAgCj4gIAljdXJz
b3IgPSBremFsbG9jKHNpemVvZigqY3Vyc29yKSwgR0ZQX0tFUk5FTCk7Cj4gLQlpZiAoY3Vyc29y
ID09IE5VTEwpCj4gLQkJcmV0dXJuIE5VTEw7Cj4gKwlpZiAoIWN1cnNvcikKPiArCQlnb3RvIGZh
aWw7Cj4gIAo+ICAJc3RhdGUgPSBpbnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUoJmN1cnNvci0+YmFz
ZSk7Cj4gLQlpZiAoIXN0YXRlKSB7Cj4gLQkJa2ZyZWUoY3Vyc29yKTsKPiAtCQlyZXR1cm4gTlVM
TDsKPiAtCX0KPiArCWlmICghc3RhdGUpCj4gKwkJZ290byBmYWlsOwo+ICAJY3Vyc29yLT5iYXNl
LnN0YXRlID0gJnN0YXRlLT5iYXNlOwo+ICAKPiAgCWN1cnNvci0+Y2FuX3NjYWxlID0gZmFsc2U7
Cj4gQEAgLTE0MTY2LDExICsxNDE3MiwxMyBAQCBzdGF0aWMgc3RydWN0IGRybV9wbGFuZSAqaW50
ZWxfY3Vyc29yX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAJY3Vyc29y
LT51cGRhdGVfcGxhbmUgPSBpbnRlbF91cGRhdGVfY3Vyc29yX3BsYW5lOwo+ICAJY3Vyc29yLT5k
aXNhYmxlX3BsYW5lID0gaW50ZWxfZGlzYWJsZV9jdXJzb3JfcGxhbmU7Cj4gIAo+IC0JZHJtX3Vu
aXZlcnNhbF9wbGFuZV9pbml0KGRldiwgJmN1cnNvci0+YmFzZSwgMCwKPiAtCQkJCSAmaW50ZWxf
cGxhbmVfZnVuY3MsCj4gLQkJCQkgaW50ZWxfY3Vyc29yX2Zvcm1hdHMsCj4gLQkJCQkgQVJSQVlf
U0laRShpbnRlbF9jdXJzb3JfZm9ybWF0cyksCj4gLQkJCQkgRFJNX1BMQU5FX1RZUEVfQ1VSU09S
LCBOVUxMKTsKPiArCXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdChkZXYsICZjdXJzb3It
PmJhc2UsIDAsCj4gKwkJCQkgICAgICAgJmludGVsX3BsYW5lX2Z1bmNzLAo+ICsJCQkJICAgICAg
IGludGVsX2N1cnNvcl9mb3JtYXRzLAo+ICsJCQkJICAgICAgIEFSUkFZX1NJWkUoaW50ZWxfY3Vy
c29yX2Zvcm1hdHMpLAo+ICsJCQkJICAgICAgIERSTV9QTEFORV9UWVBFX0NVUlNPUiwgTlVMTCk7
Cj4gKwlpZiAocmV0KQo+ICsJCWdvdG8gZmFpbDsKPiAgCj4gIAlpZiAoSU5URUxfSU5GTyhkZXYp
LT5nZW4gPj0gNCkgewo+ICAJCWlmICghZGV2LT5tb2RlX2NvbmZpZy5yb3RhdGlvbl9wcm9wZXJ0
eSkKPiBAQCAtMTQxOTAsNiArMTQxOTgsMTIgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmlu
dGVsX2N1cnNvcl9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCWRybV9w
bGFuZV9oZWxwZXJfYWRkKCZjdXJzb3ItPmJhc2UsICZpbnRlbF9wbGFuZV9oZWxwZXJfZnVuY3Mp
Owo+ICAKPiAgCXJldHVybiAmY3Vyc29yLT5iYXNlOwo+ICsKPiArZmFpbDoKPiArCWtmcmVlKHN0
YXRlKTsKPiArCWtmcmVlKGN1cnNvcik7Cj4gKwo+ICsJcmV0dXJuIE5VTEw7Cj4gIH0KPiAgCj4g
IHN0YXRpYyB2b2lkIHNrbF9pbml0X3NjYWxlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3Ry
dWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl
LmMKPiBpbmRleCA4ODIxNTMzLi4wZjNlMjMwIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3Nwcml0ZS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
c3ByaXRlLmMKPiBAQCAtMTAyNSw4ICsxMDI1LDggQEAgc3RhdGljIHVpbnQzMl90IHNrbF9wbGFu
ZV9mb3JtYXRzW10gPSB7Cj4gIGludAo+ICBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2
aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCj4gIHsKPiAtCXN0cnVjdCBpbnRl
bF9wbGFuZSAqaW50ZWxfcGxhbmU7Cj4gLQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRl
Owo+ICsJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IE5VTEw7Cj4gKwlzdHJ1Y3Qg
aW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlID0gTlVMTDsKPiAgCXVuc2lnbmVkIGxvbmcgcG9zc2li
bGVfY3J0Y3M7Cj4gIAljb25zdCB1aW50MzJfdCAqcGxhbmVfZm9ybWF0czsKPiAgCWludCBudW1f
cGxhbmVfZm9ybWF0czsKPiBAQCAtMTAzNiwxMyArMTAzNiwxNSBAQCBpbnRlbF9wbGFuZV9pbml0
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCj4gIAkJ
cmV0dXJuIC1FTk9ERVY7Cj4gIAo+ICAJaW50ZWxfcGxhbmUgPSBremFsbG9jKHNpemVvZigqaW50
ZWxfcGxhbmUpLCBHRlBfS0VSTkVMKTsKPiAtCWlmICghaW50ZWxfcGxhbmUpCj4gLQkJcmV0dXJu
IC1FTk9NRU07Cj4gKwlpZiAoIWludGVsX3BsYW5lKSB7Cj4gKwkJcmV0ID0gLUVOT01FTTsKPiAr
CQlnb3RvIGZhaWw7Cj4gKwl9Cj4gIAo+ICAJc3RhdGUgPSBpbnRlbF9jcmVhdGVfcGxhbmVfc3Rh
dGUoJmludGVsX3BsYW5lLT5iYXNlKTsKPiAgCWlmICghc3RhdGUpIHsKPiAtCQlrZnJlZShpbnRl
bF9wbGFuZSk7Cj4gLQkJcmV0dXJuIC1FTk9NRU07Cj4gKwkJcmV0ID0gLUVOT01FTTsKPiArCQln
b3RvIGZhaWw7Cj4gIAl9Cj4gIAlpbnRlbF9wbGFuZS0+YmFzZS5zdGF0ZSA9ICZzdGF0ZS0+YmFz
ZTsKPiAgCj4gQEAgLTEwOTcsMjggKzEwOTksMzQgQEAgaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3Qg
ZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQo+ICAJCW51bV9wbGFu
ZV9mb3JtYXRzID0gQVJSQVlfU0laRShza2xfcGxhbmVfZm9ybWF0cyk7Cj4gIAkJYnJlYWs7Cj4g
IAlkZWZhdWx0Ogo+IC0JCWtmcmVlKGludGVsX3BsYW5lKTsKPiAtCQlyZXR1cm4gLUVOT0RFVjsK
PiArCQlNSVNTSU5HX0NBU0UoSU5URUxfSU5GTyhkZXYpLT5nZW4pOwo+ICsJCXJldCA9IC1FTk9E
RVY7Cj4gKwkJZ290byBmYWlsOwo+ICAJfQo+ICAKPiAgCWludGVsX3BsYW5lLT5waXBlID0gcGlw
ZTsKPiAgCWludGVsX3BsYW5lLT5wbGFuZSA9IHBsYW5lOwo+ICAJaW50ZWxfcGxhbmUtPmZyb250
YnVmZmVyX2JpdCA9IElOVEVMX0ZST05UQlVGRkVSX1NQUklURShwaXBlLCBwbGFuZSk7Cj4gIAlp
bnRlbF9wbGFuZS0+Y2hlY2tfcGxhbmUgPSBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmU7Cj4gKwo+
ICAJcG9zc2libGVfY3J0Y3MgPSAoMSA8PCBwaXBlKTsKPiArCj4gIAlyZXQgPSBkcm1fdW5pdmVy
c2FsX3BsYW5lX2luaXQoZGV2LCAmaW50ZWxfcGxhbmUtPmJhc2UsIHBvc3NpYmxlX2NydGNzLAo+
ICAJCQkJICAgICAgICZpbnRlbF9wbGFuZV9mdW5jcywKPiAgCQkJCSAgICAgICBwbGFuZV9mb3Jt
YXRzLCBudW1fcGxhbmVfZm9ybWF0cywKPiAgCQkJCSAgICAgICBEUk1fUExBTkVfVFlQRV9PVkVS
TEFZLCBOVUxMKTsKPiAtCWlmIChyZXQpIHsKPiAtCQlrZnJlZShpbnRlbF9wbGFuZSk7Cj4gLQkJ
Z290byBvdXQ7Cj4gLQl9Cj4gKwlpZiAocmV0KQo+ICsJCWdvdG8gZmFpbDsKPiAgCj4gIAlpbnRl
bF9jcmVhdGVfcm90YXRpb25fcHJvcGVydHkoZGV2LCBpbnRlbF9wbGFuZSk7Cj4gIAo+ICAJZHJt
X3BsYW5lX2hlbHBlcl9hZGQoJmludGVsX3BsYW5lLT5iYXNlLCAmaW50ZWxfcGxhbmVfaGVscGVy
X2Z1bmNzKTsKPiAgCj4gLW91dDoKPiArCXJldHVybiAwOwo+ICsKPiArZmFpbDoKPiArCWtmcmVl
KHN0YXRlKTsKPiArCWtmcmVlKGludGVsX3BsYW5lKTsKPiArCj4gIAlyZXR1cm4gcmV0Owo+ICB9
Cj4gLS0gCj4gMi40LjMKCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp
c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=