From: Harry Wentland Subject: [PATCH 26/29] drm/amd/display: Use single fail label in init_drm_dev Date: Thu, 26 Oct 2017 14:35:22 -0400 Message-ID: <20171026183525.7532-27-harry.wentland@amd.com> References: <20171026183525.7532-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171026183525.7532-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Harry Wentland Tm8gbmVlZCBmb3IgbXVsdGlwbGUgbGFiZWxzIGFzIGtmcmVlIHdpbGwgYWx3YXlzIGRvIGEgTlVM TCBjaGVjawpiZWZvcmUgZnJlZWluZyB0aGUgbWVtb3J5LgoKU2lnbmVkLW9mZi1ieTogSGFycnkg V2VudGxhbmQgPGhhcnJ5LndlbnRsYW5kQGFtZC5jb20+ClJldmlld2VkLWJ5OiBCaGF3YW5wcmVl dCBMYWtoYSA8Qmhhd2FucHJlZXQuTGFraGFAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IFRvbnkgQ2hl bmcgPFRvbnkuQ2hlbmdAYW1kLmNvbT4KQWNrZWQtYnk6IEhhcnJ5IFdlbnRsYW5kIDxoYXJyeS53 ZW50bGFuZEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVf ZG0vYW1kZ3B1X2RtLmMgfCAyNCArKysrKysrKysrKy0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDExIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCmluZGV4IDU1ZmIwYjI4MmY0 NC4uNmZjMDQzOTU3YmJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv YW1kZ3B1X2RtL2FtZGdwdV9kbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9h bWRncHVfZG0vYW1kZ3B1X2RtLmMKQEAgLTEzMzgsNyArMTMzOCw3IEBAIHN0YXRpYyBpbnQgYW1k Z3B1X2RtX2luaXRpYWxpemVfZHJtX2RldmljZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK IAogCQlpZiAoIXBsYW5lKSB7CiAJCQlEUk1fRVJST1IoIktNUzogRmFpbGVkIHRvIGFsbG9jYXRl IHBsYW5lXG4iKTsKLQkJCWdvdG8gZmFpbF9mcmVlX3BsYW5lczsKKwkJCWdvdG8gZmFpbDsKIAkJ fQogCQlwbGFuZS0+YmFzZS50eXBlID0gbW9kZV9pbmZvLT5wbGFuZV90eXBlW2ldOwogCkBAIC0x MzU0LDE0ICsxMzU0LDE0IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2RtX2luaXRpYWxpemVfZHJtX2Rl dmljZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAogCQlpZiAoYW1kZ3B1X2RtX3BsYW5l X2luaXQoZG0sIG1vZGVfaW5mby0+cGxhbmVzW2ldLCBwb3NzaWJsZV9jcnRjcykpIHsKIAkJCURS TV9FUlJPUigiS01TOiBGYWlsZWQgdG8gaW5pdGlhbGl6ZSBwbGFuZVxuIik7Ci0JCQlnb3RvIGZh aWxfZnJlZV9wbGFuZXM7CisJCQlnb3RvIGZhaWw7CiAJCX0KIAl9CiAKIAlmb3IgKGkgPSAwOyBp IDwgZG0tPmRjLT5jYXBzLm1heF9zdHJlYW1zOyBpKyspCiAJCWlmIChhbWRncHVfZG1fY3J0Y19p bml0KGRtLCAmbW9kZV9pbmZvLT5wbGFuZXNbaV0tPmJhc2UsIGkpKSB7CiAJCQlEUk1fRVJST1Io IktNUzogRmFpbGVkIHRvIGluaXRpYWxpemUgY3J0Y1xuIik7Ci0JCQlnb3RvIGZhaWxfZnJlZV9w bGFuZXM7CisJCQlnb3RvIGZhaWw7CiAJCX0KIAogCWRtLT5kaXNwbGF5X2luZGV4ZXNfbnVtID0g ZG0tPmRjLT5jYXBzLm1heF9zdHJlYW1zOwpAQCAtMTM3OCwyMCArMTM3OCwyMCBAQCBzdGF0aWMg aW50IGFtZGdwdV9kbV9pbml0aWFsaXplX2RybV9kZXZpY2Uoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpCiAKIAkJYWNvbm5lY3RvciA9IGt6YWxsb2Moc2l6ZW9mKCphY29ubmVjdG9yKSwgR0ZQ X0tFUk5FTCk7CiAJCWlmICghYWNvbm5lY3RvcikKLQkJCWdvdG8gZmFpbF9mcmVlX3BsYW5lczsK KwkJCWdvdG8gZmFpbDsKIAogCQlhZW5jb2RlciA9IGt6YWxsb2Moc2l6ZW9mKCphZW5jb2Rlciks IEdGUF9LRVJORUwpOwogCQlpZiAoIWFlbmNvZGVyKQotCQkJZ290byBmYWlsX2ZyZWVfY29ubmVj dG9yOworCQkJZ290byBmYWlsOwogCiAJCWlmIChhbWRncHVfZG1fZW5jb2Rlcl9pbml0KGRtLT5k ZGV2LCBhZW5jb2RlciwgaSkpIHsKIAkJCURSTV9FUlJPUigiS01TOiBGYWlsZWQgdG8gaW5pdGlh bGl6ZSBlbmNvZGVyXG4iKTsKLQkJCWdvdG8gZmFpbF9mcmVlX2VuY29kZXI7CisJCQlnb3RvIGZh aWw7CiAJCX0KIAogCQlpZiAoYW1kZ3B1X2RtX2Nvbm5lY3Rvcl9pbml0KGRtLCBhY29ubmVjdG9y LCBpLCBhZW5jb2RlcikpIHsKIAkJCURSTV9FUlJPUigiS01TOiBGYWlsZWQgdG8gaW5pdGlhbGl6 ZSBjb25uZWN0b3JcbiIpOwotCQkJZ290byBmYWlsX2ZyZWVfZW5jb2RlcjsKKwkJCWdvdG8gZmFp bDsKIAkJfQogCiAJCWlmIChkY19saW5rX2RldGVjdChkY19nZXRfbGlua19hdF9pbmRleChkbS0+ ZGMsIGkpLApAQCAtMTQxNiwxNCArMTQxNiwxNCBAQCBzdGF0aWMgaW50IGFtZGdwdV9kbV9pbml0 aWFsaXplX2RybV9kZXZpY2Uoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJY2FzZSBDSElQ X1ZFR0ExMDoKIAkJaWYgKGRjZTExMF9yZWdpc3Rlcl9pcnFfaGFuZGxlcnMoZG0tPmFkZXYpKSB7 CiAJCQlEUk1fRVJST1IoIkRNOiBGYWlsZWQgdG8gaW5pdGlhbGl6ZSBJUlFcbiIpOwotCQkJZ290 byBmYWlsX2ZyZWVfZW5jb2RlcjsKKwkJCWdvdG8gZmFpbDsKIAkJfQogCQlicmVhazsKICNpZiBk ZWZpbmVkKENPTkZJR19EUk1fQU1EX0RDX0RDTjFfMCkKIAljYXNlIENISVBfUkFWRU46CiAJCWlm IChkY24xMF9yZWdpc3Rlcl9pcnFfaGFuZGxlcnMoZG0tPmFkZXYpKSB7CiAJCQlEUk1fRVJST1Io IkRNOiBGYWlsZWQgdG8gaW5pdGlhbGl6ZSBJUlFcbiIpOwotCQkJZ290byBmYWlsX2ZyZWVfZW5j b2RlcjsKKwkJCWdvdG8gZmFpbDsKIAkJfQogCQkvKgogCQkgKiBUZW1wb3JhcnkgZGlzYWJsZSB1 bnRpbCBwcGxpYi9zbXUgaW50ZXJhY3Rpb24gaXMgaW1wbGVtZW50ZWQKQEAgLTE0MzMsMTcgKzE0 MzMsMTUgQEAgc3RhdGljIGludCBhbWRncHVfZG1faW5pdGlhbGl6ZV9kcm1fZGV2aWNlKHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2KQogI2VuZGlmCiAJZGVmYXVsdDoKIAkJRFJNX0VSUk9SKCJV c3VwcG9ydGVkIEFTSUMgdHlwZTogMHglWFxuIiwgYWRldi0+YXNpY190eXBlKTsKLQkJZ290byBm YWlsX2ZyZWVfZW5jb2RlcjsKKwkJZ290byBmYWlsOwogCX0KIAogCWRybV9tb2RlX2NvbmZpZ19y ZXNldChkbS0+ZGRldik7CiAKIAlyZXR1cm4gMDsKLWZhaWxfZnJlZV9lbmNvZGVyOgorZmFpbDoK IAlrZnJlZShhZW5jb2Rlcik7Ci1mYWlsX2ZyZWVfY29ubmVjdG9yOgogCWtmcmVlKGFjb25uZWN0 b3IpOwotZmFpbF9mcmVlX3BsYW5lczoKIAlmb3IgKGkgPSAwOyBpIDwgZG0tPmRjLT5jYXBzLm1h eF9wbGFuZXM7IGkrKykKIAkJa2ZyZWUobW9kZV9pbmZvLT5wbGFuZXNbaV0pOwogCXJldHVybiAt MTsKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==