From: Harry Wentland Subject: [PATCH 21/28] drm/amd/display: Cleanup some fail labels in dcn10_resource Date: Thu, 19 Oct 2017 13:46:40 -0400 Message-ID: <20171019174647.21260-22-harry.wentland@amd.com> References: <20171019174647.21260-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: <20171019174647.21260-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 U2lnbmVkLW9mZi1ieTogSGFycnkgV2VudGxhbmQgPGhhcnJ5LndlbnRsYW5kQGFtZC5jb20+CkFj a2VkLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogLi4u L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfcmVzb3VyY2UuYyAgfCAzNyArKysr KysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMjQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjbjEwL2RjbjEwX3Jlc291cmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv ZGNuMTAvZGNuMTBfcmVzb3VyY2UuYwppbmRleCA3NzZjYWY4MDRiOTUuLjlkODVkMjY1YzJjNyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX3Jl c291cmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEw X3Jlc291cmNlLmMKQEAgLTEyNzUsNyArMTI3NSw3IEBAIHN0YXRpYyBib29sIGNvbnN0cnVjdCgK IAkJaWYgKHBvb2wtPmJhc2UuY2xvY2tfc291cmNlc1tpXSA9PSBOVUxMKSB7CiAJCQlkbV9lcnJv cigiREM6IGZhaWxlZCB0byBjcmVhdGUgY2xvY2sgc291cmNlcyFcbiIpOwogCQkJQlJFQUtfVE9f REVCVUdHRVIoKTsKLQkJCWdvdG8gY2xvY2tfc291cmNlX2NyZWF0ZV9mYWlsOworCQkJZ290byBm YWlsOwogCQl9CiAJfQogCkBAIC0xMjg0LDcgKzEyODQsNyBAQCBzdGF0aWMgYm9vbCBjb25zdHJ1 Y3QoCiAJCWlmIChwb29sLT5iYXNlLmRpc3BsYXlfY2xvY2sgPT0gTlVMTCkgewogCQkJZG1fZXJy b3IoIkRDOiBmYWlsZWQgdG8gY3JlYXRlIGRpc3BsYXkgY2xvY2shXG4iKTsKIAkJCUJSRUFLX1RP X0RFQlVHR0VSKCk7Ci0JCQlnb3RvIGRpc3BfY2xrX2NyZWF0ZV9mYWlsOworCQkJZ290byBmYWls OwogCQl9CiAJfQogCkBAIC0xMjk1LDcgKzEyOTUsNyBAQCBzdGF0aWMgYm9vbCBjb25zdHJ1Y3Qo CiAJaWYgKHBvb2wtPmJhc2UuZG1jdSA9PSBOVUxMKSB7CiAJCWRtX2Vycm9yKCJEQzogZmFpbGVk IHRvIGNyZWF0ZSBkbWN1IVxuIik7CiAJCUJSRUFLX1RPX0RFQlVHR0VSKCk7Ci0JCWdvdG8gcmVz X2NyZWF0ZV9mYWlsOworCQlnb3RvIGZhaWw7CiAJfQogCiAJcG9vbC0+YmFzZS5hYm0gPSBkY2Vf YWJtX2NyZWF0ZShjdHgsCkBAIC0xMzA1LDcgKzEzMDUsNyBAQCBzdGF0aWMgYm9vbCBjb25zdHJ1 Y3QoCiAJaWYgKHBvb2wtPmJhc2UuYWJtID09IE5VTEwpIHsKIAkJZG1fZXJyb3IoIkRDOiBmYWls ZWQgdG8gY3JlYXRlIGFibSFcbiIpOwogCQlCUkVBS19UT19ERUJVR0dFUigpOwotCQlnb3RvIHJl c19jcmVhdGVfZmFpbDsKKwkJZ290byBmYWlsOwogCX0KIAogCWRtbF9pbml0X2luc3RhbmNlKCZk Yy0+ZG1sLCBETUxfUFJPSkVDVF9SQVZFTjEpOwpAQCAtMTM0NSwxMyArMTM0NSwxMSBAQCBzdGF0 aWMgYm9vbCBjb25zdHJ1Y3QoCiAJfQogCiAJewotCSNpZiBkZWZpbmVkKENPTkZJR19EUk1fQU1E X0RDX0RDTjFfMCkKIAkJc3RydWN0IGlycV9zZXJ2aWNlX2luaXRfZGF0YSBpbml0X2RhdGE7CiAJ CWluaXRfZGF0YS5jdHggPSBkYy0+Y3R4OwogCQlwb29sLT5iYXNlLmlycXMgPSBkYWxfaXJxX3Nl cnZpY2VfZGNuMTBfY3JlYXRlKCZpbml0X2RhdGEpOwogCQlpZiAoIXBvb2wtPmJhc2UuaXJxcykK LQkJCWdvdG8gaXJxc19jcmVhdGVfZmFpbDsKLQkjZW5kaWYKKwkJCWdvdG8gZmFpbDsKIAl9CiAK IAkvKiBpbmRleCB0byB2YWxpZCBwaXBlIHJlc291cmNlICAqLwpAQCAtMTM2OSw3ICsxMzY3LDcg QEAgc3RhdGljIGJvb2wgY29uc3RydWN0KAogCQkJQlJFQUtfVE9fREVCVUdHRVIoKTsKIAkJCWRt X2Vycm9yKAogCQkJCSJEQzogZmFpbGVkIHRvIGNyZWF0ZSBtZW1vcnkgaW5wdXQhXG4iKTsKLQkJ CWdvdG8gbWlfY3JlYXRlX2ZhaWw7CisJCQlnb3RvIGZhaWw7CiAJCX0KIAogCQlwb29sLT5iYXNl LmlwcHNbal0gPSBkY24xMF9pcHBfY3JlYXRlKGN0eCwgaSk7CkBAIC0xMzc3LDcgKzEzNzUsNyBA QCBzdGF0aWMgYm9vbCBjb25zdHJ1Y3QoCiAJCQlCUkVBS19UT19ERUJVR0dFUigpOwogCQkJZG1f ZXJyb3IoCiAJCQkJIkRDOiBmYWlsZWQgdG8gY3JlYXRlIGlucHV0IHBpeGVsIHByb2Nlc3NvciFc biIpOwotCQkJZ290byBpcHBfY3JlYXRlX2ZhaWw7CisJCQlnb3RvIGZhaWw7CiAJCX0KIAogCQlw b29sLT5iYXNlLmRwcHNbal0gPSBkY24xMF9kcHBfY3JlYXRlKGN0eCwgaSk7CkBAIC0xMzg1LDcg KzEzODMsNyBAQCBzdGF0aWMgYm9vbCBjb25zdHJ1Y3QoCiAJCQlCUkVBS19UT19ERUJVR0dFUigp OwogCQkJZG1fZXJyb3IoCiAJCQkJIkRDOiBmYWlsZWQgdG8gY3JlYXRlIGRwcCFcbiIpOwotCQkJ Z290byBkcHBfY3JlYXRlX2ZhaWw7CisJCQlnb3RvIGZhaWw7CiAJCX0KIAogCQlwb29sLT5iYXNl Lm9wcHNbal0gPSBkY24xMF9vcHBfY3JlYXRlKGN0eCwgaSk7CkBAIC0xMzkzLDcgKzEzOTEsNyBA QCBzdGF0aWMgYm9vbCBjb25zdHJ1Y3QoCiAJCQlCUkVBS19UT19ERUJVR0dFUigpOwogCQkJZG1f ZXJyb3IoCiAJCQkJIkRDOiBmYWlsZWQgdG8gY3JlYXRlIG91dHB1dCBwaXhlbCBwcm9jZXNzb3Ih XG4iKTsKLQkJCWdvdG8gb3BwX2NyZWF0ZV9mYWlsOworCQkJZ290byBmYWlsOwogCQl9CiAKIAkJ cG9vbC0+YmFzZS50aW1pbmdfZ2VuZXJhdG9yc1tqXSA9IGRjbjEwX3RpbWluZ19nZW5lcmF0b3Jf Y3JlYXRlKApAQCAtMTQwMSw3ICsxMzk5LDcgQEAgc3RhdGljIGJvb2wgY29uc3RydWN0KAogCQlp ZiAocG9vbC0+YmFzZS50aW1pbmdfZ2VuZXJhdG9yc1tqXSA9PSBOVUxMKSB7CiAJCQlCUkVBS19U T19ERUJVR0dFUigpOwogCQkJZG1fZXJyb3IoIkRDOiBmYWlsZWQgdG8gY3JlYXRlIHRnIVxuIik7 Ci0JCQlnb3RvIG90Z19jcmVhdGVfZmFpbDsKKwkJCWdvdG8gZmFpbDsKIAkJfQogCQkvKiBjaGVj ayBuZXh0IHZhbGlkIHBpcGUgKi8KIAkJaisrOwpAQCAtMTQyMCwxMyArMTQxOCwxMyBAQCBzdGF0 aWMgYm9vbCBjb25zdHJ1Y3QoCiAJaWYgKHBvb2wtPmJhc2UubXBjID09IE5VTEwpIHsKIAkJQlJF QUtfVE9fREVCVUdHRVIoKTsKIAkJZG1fZXJyb3IoIkRDOiBmYWlsZWQgdG8gY3JlYXRlIG1wYyFc biIpOwotCQlnb3RvIG1wY19jcmVhdGVfZmFpbDsKKwkJZ290byBmYWlsOwogCX0KIAogCWlmICgh cmVzb3VyY2VfY29uc3RydWN0KG51bV92aXJ0dWFsX2xpbmtzLCBkYywgJnBvb2wtPmJhc2UsCiAJ CQkoIUlTX0ZQR0FfTUFYSU1VU19EQyhkYy0+Y3R4LT5kY2VfZW52aXJvbm1lbnQpID8KIAkJCSZy ZXNfY3JlYXRlX2Z1bmNzIDogJnJlc19jcmVhdGVfbWF4aW11c19mdW5jcykpKQotCQkJZ290byBy ZXNfY3JlYXRlX2ZhaWw7CisJCQlnb3RvIGZhaWw7CiAKIAlkY24xMF9od19zZXF1ZW5jZXJfY29u c3RydWN0KGRjKTsKIAlkYy0+Y2Fwcy5tYXhfcGxhbmVzID0gIHBvb2wtPmJhc2UucGlwZV9jb3Vu dDsKQEAgLTE0MzUsMTYgKzE0MzMsNyBAQCBzdGF0aWMgYm9vbCBjb25zdHJ1Y3QoCiAKIAlyZXR1 cm4gdHJ1ZTsKIAotZGlzcF9jbGtfY3JlYXRlX2ZhaWw6Ci1tcGNfY3JlYXRlX2ZhaWw6Ci1vdGdf Y3JlYXRlX2ZhaWw6Ci1vcHBfY3JlYXRlX2ZhaWw6Ci1kcHBfY3JlYXRlX2ZhaWw6Ci1pcHBfY3Jl YXRlX2ZhaWw6Ci1taV9jcmVhdGVfZmFpbDoKLWlycXNfY3JlYXRlX2ZhaWw6Ci1yZXNfY3JlYXRl X2ZhaWw6Ci1jbG9ja19zb3VyY2VfY3JlYXRlX2ZhaWw6CitmYWlsOgogCiAJZGVzdHJ1Y3QocG9v bCk7CiAKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 Cg==