From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Hoath Subject: Re: [PATCH 3/4] drm/i915: tidy up initialisation failure paths (legacy) Date: Thu, 17 Dec 2015 11:36:00 +0000 Message-ID: <56729E20.1010807@intel.com> References: <1450291011-31486-1-git-send-email-david.s.gordon@intel.com> <1450291011-31486-4-git-send-email-david.s.gordon@intel.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 3B42A6E0E6 for ; Thu, 17 Dec 2015 03:36:02 -0800 (PST) In-Reply-To: <1450291011-31486-4-git-send-email-david.s.gordon@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: "Gordon, David S" , "intel-gfx@lists.freedesktop.org" List-Id: intel-gfx@lists.freedesktop.org T24gMTYvMTIvMjAxNSAxODozNiwgR29yZG9uLCBEYXZpZCBTIHdyb3RlOgo+IDEuIEZpeCBpbnRl bF9jbGVhbnVwX3JpbmdfYnVmZmVyKCkgdG8gaGFuZGxlIHRoZSBlcnJvciBjbGVhbnVwCj4gICAg IGNhc2Ugd2hlcmUgdGhlIHJpbmdidWZmZXIgaGFzIGJlZW4gYWxsb2NhdGVkIGJ1dCBtYXAtYW5k LXBpbgo+ICAgICBmYWlsZWQuIFVucGluIGl0IGlmZiBpdCdzIHByZXZpb3VzbHkgYmVlbiBtYXBw ZWQtYW5kLXBpbm5lZC4KPgo+IDIuIEZpeCB0aGUgZXJyb3IgcGF0aCBpbiBpbnRlbF9pbml0X3Jp bmdfYnVmZmVyKCksIHdoaWNoIGFscmVhZHkKPiAgICAgY2FsbGVkIGludGVsX2Rlc3Ryb3lfcmlu Z2J1ZmZlcl9vYmooKSwgYnV0IGZhaWxlZCB0byBmcmVlIHRoZQo+ICAgICBhY3R1YWwgcmluZ2J1 ZmZlciBzdHJ1Y3R1cmUuIENhbGxpbmcgaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKCkKPiAgICAgaW5z dGVhZCBkb2VzIGJvdGggaW4gb25lIGdvLgo+Cj4gMy4gV2l0aCB0aGUgYWJvdmUgY2hhbmdlLCBp bnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKCkgaXMgb25seQo+ICAgICBjYWxsZWQgaW4gb25l IHBsYWNlIChpbnRlbF9yaW5nYnVmZmVyX2ZyZWUoKSksIHNvIGZsYXR0ZW4gaXQKPiAgICAgaW50 byB0aGF0IGZ1bmN0aW9uLgo+Cj4gNC4gbW92ZSBsb3ctbGV2ZWwgcmVnaXN0ZXIgYWNjZXNzZXMg ZnJvbSBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKCkKPiAgICAgKHdoaWNoIGNhbGxzIGludGVs X3N0b3BfcmluZ19idWZmZXIocmluZykgd2hpY2ggY2FsbHMgc3RvcF9yaW5nKCkpCj4gICAgIGRv d24gaW50byBzdG9wX3JpbmcoKSBpdHNlbGYpLCB3aGljaCBpcyBhbHJlYWR5IGRvaW5nIGxvdy1s ZXZlbAo+ICAgICByZWdpc3RlciBhY2Nlc3Nlcy4gVGhlbiwgaW50ZWxfY2xlYW51cF9yaW5nX2J1 ZmZlcigpIG5vIGxvbmdlcgo+ICAgICBuZWVkcyAnZGV2X3ByaXYnLgo+ClJldmlld2VkLWJ5OiBO aWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+Cgo+IFNpZ25lZC1vZmYtYnk6IERh dmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Cj4gLS0tCj4gICBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCA0NyArKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0KPiAgIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAyNSBkZWxl dGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKPiBpbmRl eCBlZWZjZTlhLi4yODUzNzU0IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYwo+IEBAIC01NDksNiArNTQ5LDggQEAgc3RhdGljIGJvb2wgc3RvcF9yaW5nKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCj4gICAJCUk5MTVfV1JJVEVfTU9ERShyaW5nLCBfTUFT S0VEX0JJVF9ESVNBQkxFKFNUT1BfUklORykpOwo+ICAgCX0KPgo+ICsJV0FSTl9PTighSVNfR0VO MihyaW5nLT5kZXYpICYmIChJOTE1X1JFQURfTU9ERShyaW5nKSAmIE1PREVfSURMRSkgPT0gMCk7 Cj4gKwo+ICAgCXJldHVybiAoSTkxNV9SRUFEX0hFQUQocmluZykgJiBIRUFEX0FERFIpID09IDA7 Cj4gICB9Cj4KPiBAQCAtMjA1NywxMiArMjA1OSw2IEBAIGludCBpbnRlbF9waW5fYW5kX21hcF9y aW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAgCXJldHVybiAwOwo+ICAg fQo+Cj4gLXN0YXRpYyB2b2lkIGludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmooc3RydWN0IGlu dGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCj4gLXsKPiAtCWRybV9nZW1fb2JqZWN0X3VucmVmZXJl bmNlKCZyaW5nYnVmLT5vYmotPmJhc2UpOwo+IC0JcmluZ2J1Zi0+b2JqID0gTlVMTDsKPiAtfQo+ IC0KPiAgIHN0YXRpYyBpbnQgaW50ZWxfYWxsb2NfcmluZ2J1ZmZlcl9vYmooc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKPiAgIAkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1 ZikKPiAgIHsKPiBAQCAtMjEyNSwxMSArMjEyMSwxNCBAQCBpbnRlbF9lbmdpbmVfY3JlYXRlX3Jp bmdidWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBpbnQgc2l6ZSkKPiAgIH0K Pgo+ICAgdm9pZAo+IC1pbnRlbF9yaW5nYnVmZmVyX2ZyZWUoc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmcpCj4gK2ludGVsX3JpbmdidWZmZXJfZnJlZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl ciAqcmluZ2J1ZikKPiAgIHsKPiAtCWludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmoocmluZyk7 Cj4gLQlsaXN0X2RlbCgmcmluZy0+bGluayk7Cj4gLQlrZnJlZShyaW5nKTsKPiArCWlmIChyaW5n YnVmLT5vYmopIHsKPiArCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmcmluZ2J1Zi0+b2Jq LT5iYXNlKTsKPiArCQlyaW5nYnVmLT5vYmogPSBOVUxMOwo+ICsJfQo+ICsJbGlzdF9kZWwoJnJp bmdidWYtPmxpbmspOwo+ICsJa2ZyZWUocmluZ2J1Zik7Cj4gICB9Cj4KPiAgIHN0YXRpYyBpbnQg aW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+IEBAIC0yMTU3 LDYgKzIxNTYsMTMgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCj4gICAJfQo+ICAgCXJpbmctPmJ1ZmZlciA9IHJpbmdidWY7Cj4KPiAr CXJldCA9IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKGRldiwgcmluZ2J1Zik7Cj4g KwlpZiAocmV0KSB7Cj4gKwkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gcGluIGFuZCBtYXAgcmluZ2J1 ZmZlciAlczogJWRcbiIsCj4gKwkJCQlyaW5nLT5uYW1lLCByZXQpOwo+ICsJCWdvdG8gZXJyb3I7 Cj4gKwl9Cj4gKwo+ICAgCWlmIChJOTE1X05FRURfR0ZYX0hXUyhkZXYpKSB7Cj4gICAJCXJldCA9 IGluaXRfc3RhdHVzX3BhZ2UocmluZyk7Cj4gICAJCWlmIChyZXQpCj4gQEAgLTIxNjgsMTQgKzIx NzQsNiBAQCBzdGF0aWMgaW50IGludGVsX2luaXRfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKPiAgIAkJCWdvdG8gZXJyb3I7Cj4gICAJfQo+Cj4gLQlyZXQgPSBpbnRlbF9waW5f YW5kX21hcF9yaW5nYnVmZmVyX29iaihkZXYsIHJpbmdidWYpOwo+IC0JaWYgKHJldCkgewo+IC0J CURSTV9FUlJPUigiRmFpbGVkIHRvIHBpbiBhbmQgbWFwIHJpbmdidWZmZXIgJXM6ICVkXG4iLAo+ IC0JCQkJcmluZy0+bmFtZSwgcmV0KTsKPiAtCQlpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2Jq KHJpbmdidWYpOwo+IC0JCWdvdG8gZXJyb3I7Cj4gLQl9Cj4gLQo+ICAgCXJldCA9IGk5MTVfY21k X3BhcnNlcl9pbml0X3JpbmcocmluZyk7Cj4gICAJaWYgKHJldCkKPiAgIAkJZ290byBlcnJvcjsK PiBAQCAtMjE4OSwxOSArMjE4NywxOCBAQCBlcnJvcjoKPgo+ICAgdm9pZCBpbnRlbF9jbGVhbnVw X3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCj4gICB7Cj4gLQlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXY7Cj4gKwlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl ciAqcmluZ2J1ZjsKPgo+ICAgCWlmICghaW50ZWxfcmluZ19pbml0aWFsaXplZChyaW5nKSkKPiAg IAkJcmV0dXJuOwo+Cj4gLQlkZXZfcHJpdiA9IHRvX2k5MTUocmluZy0+ZGV2KTsKPiAtCj4gLQlp ZiAocmluZy0+YnVmZmVyKSB7Cj4gKwlyaW5nYnVmID0gcmluZy0+YnVmZmVyOwo+ICsJaWYgKHJp bmdidWYpIHsKPiAgIAkJaW50ZWxfc3RvcF9yaW5nX2J1ZmZlcihyaW5nKTsKPiAtCQlXQVJOX09O KCFJU19HRU4yKHJpbmctPmRldikgJiYgKEk5MTVfUkVBRF9NT0RFKHJpbmcpICYgTU9ERV9JRExF KSA9PSAwKTsKPgo+IC0JCWludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKHJpbmctPmJ1ZmZlcik7 Cj4gLQkJaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmctPmJ1ZmZlcik7Cj4gKwkJaWYgKHJpbmdi dWYtPnZpcnR1YWxfc3RhcnQpCj4gKwkJCWludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKHJpbmdi dWYpOwo+ICsJCWludGVsX3JpbmdidWZmZXJfZnJlZShyaW5nYnVmKTsKPiAgIAkJcmluZy0+YnVm ZmVyID0gTlVMTDsKPiAgIAl9Cj4KPgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK