From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: Re: [PATCH v2 3/6] drm/i915: tidy up initialisation failure paths (legacy) Date: Mon, 25 Jan 2016 12:08:11 +0000 Message-ID: <56A6102B.40401@intel.com> References: <1453504211-7982-1-git-send-email-david.s.gordon@intel.com> <1453504211-7982-4-git-send-email-david.s.gordon@intel.com> <20160125105226.GB10520@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id D4DE96E02E for ; Mon, 25 Jan 2016 04:08:22 -0800 (PST) In-Reply-To: <20160125105226.GB10520@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gMjUvMDEvMTYgMTA6NTIsIENocmlzIFdpbHNvbiB3cm90ZToKPiBPbiBGcmksIEphbiAyMiwg MjAxNiBhdCAxMToxMDowOFBNICswMDAwLCBEYXZlIEdvcmRvbiB3cm90ZToKPj4gMS4gRml4IGlu dGVsX2NsZWFudXBfcmluZ19idWZmZXIoKSB0byBoYW5kbGUgdGhlIGVycm9yIGNsZWFudXAgY2Fz ZSB3aGVyZQo+PiAgICAgdGhlIHJpbmdidWZmZXIgaGFzIGJlZW4gYWxsb2NhdGVkIGJ1dCBtYXAt YW5kLXBpbiBmYWlsZWQuICBVbnBpbiBpdCBpZmYKPj4gICAgIGl0J3MgcHJldmlvdXNseSBiZWVu IG1hcHBlZC1hbmQtcGlubmVkLgo+Pgo+PiAyLiBGaXggdGhlIGVycm9yIHBhdGggaW4gaW50ZWxf aW5pdF9yaW5nX2J1ZmZlcigpLCB3aGljaCBhbHJlYWR5IGNhbGxlZAo+PiAgICAgaW50ZWxfZGVz dHJveV9yaW5nYnVmZmVyX29iaigpLCBidXQgZmFpbGVkIHRvIGZyZWUgdGhlIGFjdHVhbCByaW5n YnVmZmVyCj4+ICAgICBzdHJ1Y3R1cmUuIENhbGxpbmcgaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKCkg aW5zdGVhZCBkb2VzIGJvdGggaW4gb25lIGdvLgo+Pgo+PiAzLiBXaXRoIHRoZSBhYm92ZSBjaGFu Z2UsIGludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmooKSBpcyBvbmx5IGNhbGxlZCBpbgo+PiAg ICAgb25lIHBsYWNlIChpbnRlbF9yaW5nYnVmZmVyX2ZyZWUoKSksIHNvIGZsYXR0ZW4gaXQgaW50 byB0aGF0IGZ1bmN0aW9uLgo+Pgo+PiA0LiBtb3ZlIGxvdy1sZXZlbCByZWdpc3RlciBhY2Nlc3Nl cyBmcm9tIGludGVsX2NsZWFudXBfcmluZ19idWZmZXIoKQo+PiAgICAgKHdoaWNoIGNhbGxzIGlu dGVsX3N0b3BfcmluZ19idWZmZXIocmluZykgd2hpY2ggY2FsbHMgc3RvcF9yaW5nKCkpCj4+ICAg ICBkb3duIGludG8gc3RvcF9yaW5nKCkgaXRzZWxmKSwgd2hpY2ggaXMgYWxyZWFkeSBkb2luZyBs b3ctbGV2ZWwKPj4gICAgIHJlZ2lzdGVyIGFjY2Vzc2VzLiBUaGVuLCBpbnRlbF9jbGVhbnVwX3Jp bmdfYnVmZmVyKCkgbm8gbG9uZ2VyCj4+ICAgICBuZWVkcyAnZGV2X3ByaXYnLgo+Pgo+PiBTaWdu ZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgo+PiAtLS0K Pj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCA0NyArKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KPj4gICAxIGZpbGUgY2hhbmdlZCwgMjIgaW5zZXJ0 aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCj4+Cj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMKPj4gaW5kZXggOTAzMGUyYi4uMjlkZTY0ZSAxMDA2NDQKPj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwo+PiBAQCAtNTUxLDYgKzU1MSw4IEBAIHN0YXRp YyBib29sIHN0b3BfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQo+PiAgIAkJSTkx NV9XUklURV9NT0RFKHJpbmcsIF9NQVNLRURfQklUX0RJU0FCTEUoU1RPUF9SSU5HKSk7Cj4+ICAg CX0KPj4KPj4gKwlXQVJOX09OKCFJU19HRU4yKHJpbmctPmRldikgJiYgKEk5MTVfUkVBRF9NT0RF KHJpbmcpICYgTU9ERV9JRExFKSA9PSAwKTsKPj4gKwo+PiAgIAlyZXR1cm4gKEk5MTVfUkVBRF9I RUFEKHJpbmcpICYgSEVBRF9BRERSKSA9PSAwOwo+PiAgIH0KPj4KPj4gQEAgLTIwNzEsMTIgKzIw NzMsNiBAQCBpbnQgaW50ZWxfcGluX2FuZF9tYXBfcmluZ2J1ZmZlcl9vYmooc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKPj4gICAJcmV0dXJuIDA7Cj4+ICAgfQo+Pgo+PiAtc3RhdGljIHZvaWQgaW50 ZWxfZGVzdHJveV9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1 ZikKPj4gLXsKPj4gLQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmcmluZ2J1Zi0+b2JqLT5i YXNlKTsKPj4gLQlyaW5nYnVmLT5vYmogPSBOVUxMOwo+PiAtfQo+PiAtCj4+ICAgc3RhdGljIGlu dCBpbnRlbF9hbGxvY19yaW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+PiAg IAkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKPj4gICB7Cj4+IEBA IC0yMTM5LDExICsyMTM1LDE0IEBAIHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICoKPj4gICB9Cj4+ Cj4+ICAgdm9pZAo+PiAtaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHN0cnVjdCBpbnRlbF9yaW5nYnVm ZmVyICpyaW5nKQo+PiAraW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHN0cnVjdCBpbnRlbF9yaW5nYnVm ZmVyICpyaW5nYnVmKQo+Cj4gcmluZ2J1Zj8KClllcywgaXQncyBhIHJpbmcqYnVmZmVyKiwgc28g J3JpbmdidWYnIGlzIGEgZ29vZCBuYW1lIGZvciBpdC4gSXQncyBOT1QgCmFuICplbmdpbmUqLCB3 aGljaCBpcyB3aGF0IHRoZSBuYW1lICdyaW5nJyBoYXMgaGlzdG9yaWNhbGx5IGJlZW4gdXNlZCAK Zm9yLiBJIGNvdW50IDI3NiBpbnN0YW5jZXMgb2YgJ3JpbmdidWYnIGluIHRoZSBkcml2ZXI7IEFG QUlDVCwgdGhleSBhbGwgCnJlZmVyIHRvIGEgJ3N0cnVjdCBpbnRlbF9yaW5nYnVmZmVyJy4gT2Yg dGhlIH4yMDAwIGluc3RhbmNlcyBvZiAncmluZycsIAp0aGV5IG5lYXJseSAoYnV0IG5vdCBxdWl0 ZSkgYWxsIHJlZmVyIHRvIGEgJ3N0cnVjdCBpbnRlbF9lbmdpbmVfY3MnIDooCgpTb21lZGF5IHdl IG1heSB3YW50IHRvIGNhbGwgcmluZ2J1ZmZlcnMgJ3JpbmcnLCBidXQgbm90IHVudGlsIHRoZSBs YXN0IAp2ZXN0aWdlIG9mIHRoZSBlYXJsaWVyIHVzYWdlIGhhcyBiZWVuIHB1cmdlZCBmcm9tIHRo ZSBjb2RlYmFzZSBhbmQgZnJvbSAKcGVvcGxlJ3MgaGVhZHMuIEZvciBub3csIHRoZSBuYW1lICdy aW5nYnVmJyB3aWxsIHJlZHVjZSBjb25mdXNpb24uCgo+PiAtCWludGVsX2Rlc3Ryb3lfcmluZ2J1 ZmZlcl9vYmoocmluZyk7Cj4+IC0JbGlzdF9kZWwoJnJpbmctPmxpbmspOwo+PiAtCWtmcmVlKHJp bmcpOwo+PiArCWlmIChyaW5nYnVmLT5vYmopIHsKPj4gKwkJZHJtX2dlbV9vYmplY3RfdW5yZWZl cmVuY2UoJnJpbmdidWYtPm9iai0+YmFzZSk7Cj4KPiBBbHJlYWR5IHRlc3RzIGZvciBOVUxMCgpC dXQgdGhlcmUncyBubyBndWFyYW50ZWUgdGhhdCByaW5nYnVmLT5vYmogPT0gTlVMTCBpbXBsaWVz IHRoYXQgCiZyaW5nYnVmLT5vYmotPmJhc2UgPT0gTlVMTC4gSXQgbWF5IGhhcHBlbiB0byBiZSBz byBhdCBwcmVzZW50LCBidXQgCnRoYXQncyBhbiBpbXBsZW1lbnRhdGlvbiBkZXRhaWwsIHNvIEkn bSBub3QgYXNzdW1pbmcgdGhhdCBpdCB3aWxsIGFsd2F5cyAKYmUgc28uCgpJIHN1c3BlY3QgYWxz byB0aGF0IHNvbWUgc3RhdGljIGFuYWx5c2lzIHRvb2xzIHdvdWxkIGNvbXBsYWluIGFib3V0IHRo aXMgCmNvbnN0cnVjdCBpZiBpdCBkaWRuJ3QgaGF2ZSB0aGUgdGVzdC1iZWZvcmUtdXNlLgoKPj4g KwkJcmluZ2J1Zi0+b2JqID0gTlVMTDsKPgo+IFJlZHVuZGFudCBhcyB3ZSBhcmUgYW9idXQgdG8g ZnJlZSBpdC4KClRydWUsIGJ1dCBpdCdzIGhhcm1sZXNzLgoKPj4gKwl9Cj4+ICsJbGlzdF9kZWwo JnJpbmdidWYtPmxpbmspOwo+PiArCWtmcmVlKHJpbmdidWYpOwo+PiAgIH0KPj4KPj4gICBzdGF0 aWMgaW50IGludGVsX2luaXRfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPj4g QEAgLTIxNzEsNiArMjE3MCwxMyBAQCBzdGF0aWMgaW50IGludGVsX2luaXRfcmluZ19idWZmZXIo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKPj4gICAJfQo+PiAgIAlyaW5nLT5idWZmZXIgPSByaW5n YnVmOwo+Pgo+PiArCXJldCA9IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKGRldiwg cmluZ2J1Zik7Cj4+ICsJaWYgKHJldCkgewo+PiArCQlEUk1fRVJST1IoIkZhaWxlZCB0byBwaW4g YW5kIG1hcCByaW5nYnVmZmVyICVzOiAlZFxuIiwKPj4gKwkJCQlyaW5nLT5uYW1lLCByZXQpOwo+ PiArCQlnb3RvIGVycm9yOwo+PiArCX0KPj4gKwo+PiAgIAlpZiAoSTkxNV9ORUVEX0dGWF9IV1Mo ZGV2KSkgewo+PiAgIAkJcmV0ID0gaW5pdF9zdGF0dXNfcGFnZShyaW5nKTsKPj4gICAJCWlmIChy ZXQpCj4+IEBAIC0yMTgyLDE0ICsyMTg4LDYgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3Jpbmdf YnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4+ICAgCQkJZ290byBlcnJvcjsKPj4gICAJ fQo+Pgo+PiAtCXJldCA9IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKGRldiwgcmlu Z2J1Zik7Cj4+IC0JaWYgKHJldCkgewo+PiAtCQlEUk1fRVJST1IoIkZhaWxlZCB0byBwaW4gYW5k IG1hcCByaW5nYnVmZmVyICVzOiAlZFxuIiwKPj4gLQkJCQlyaW5nLT5uYW1lLCByZXQpOwo+PiAt CQlpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHJpbmdidWYpOwo+PiAtCQlnb3RvIGVycm9y Owo+PiAtCX0KPj4gLQo+PiAgIAlyZXQgPSBpOTE1X2NtZF9wYXJzZXJfaW5pdF9yaW5nKHJpbmcp Owo+PiAgIAlpZiAocmV0KQo+PiAgIAkJZ290byBlcnJvcjsKPj4gQEAgLTIyMDMsMTkgKzIyMDEs MTggQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCj4+Cj4+ICAgdm9pZCBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcpCj4+ICAgewo+PiAtCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdjsKPj4gKwlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZjsKPgo+IHJpbmdi dWY/CgpTZWUgYWJvdmUuIEFsc28gdGhlIG5hbWUgJ3JpbmcnIGhlcmUgYWxyZWFkeSByZWZlcnMg dG8gYW4gZW5naW5lLgoKPj4gICAJaWYgKCFpbnRlbF9yaW5nX2luaXRpYWxpemVkKHJpbmcpKQo+ PiAgIAkJcmV0dXJuOwo+Pgo+PiAtCWRldl9wcml2ID0gdG9faTkxNShyaW5nLT5kZXYpOwo+PiAt Cj4+IC0JaWYgKHJpbmctPmJ1ZmZlcikgewo+PiArCXJpbmdidWYgPSByaW5nLT5idWZmZXI7Cj4+ ICsJaWYgKHJpbmdidWYpIHsKPj4gICAJCWludGVsX3N0b3BfcmluZ19idWZmZXIocmluZyk7Cj4+ IC0JCVdBUk5fT04oIUlTX0dFTjIocmluZy0+ZGV2KSAmJiAoSTkxNV9SRUFEX01PREUocmluZykg JiBNT0RFX0lETEUpID09IDApOwo+Pgo+PiAtCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihy aW5nLT5idWZmZXIpOwo+PiAtCQlpbnRlbF9yaW5nYnVmZmVyX2ZyZWUocmluZy0+YnVmZmVyKTsK Pj4gKwkJaWYgKHJpbmdidWYtPnZpcnR1YWxfc3RhcnQpCj4KPiBDbGVhbmVyIGNvZGUsIGFuZCBt b3JlIGlkaW9tYXRpYywgaWYgd2UgbGV0IHVucGluIGVhcmx5IHJldHVybi4KCk1heWJlLCBidXQg dGhhdCdzIG5vdCB0aGUgd2F5IGl0IHdhcyBwcmV2aW91c2x5IHdyaXR0ZW4sIHNvIEkgZGlkbid0 IApjaGFuZ2UgaXQgYXJvdW5kLgoKPj4gKwkJCWludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKHJp bmdidWYpOwo+PiArCQlpbnRlbF9yaW5nYnVmZmVyX2ZyZWUocmluZ2J1Zik7Cj4+ICAgCQlyaW5n LT5idWZmZXIgPSBOVUxMOwo+PiAgIAl9Cj4+Cj4+IC0tCj4+IDEuOS4xCj4+Cj4+IF9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4+IEludGVsLWdmeCBtYWls aW5nIGxpc3QKPj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+PiBodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cj4KCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==