From: Harry Wentland Subject: [PATCH 09/11] drm/amd/display: clean up redundant logic Date: Tue, 24 Jan 2017 09:25:25 -0500 Message-ID: <20170124142527.8025-10-harry.wentland@amd.com> References: <20170124142527.8025-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: <20170124142527.8025-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: Tony Cheng RnJvbTogVG9ueSBDaGVuZyA8dG9ueS5jaGVuZ0BhbWQuY29tPgoKQ2hhbmdlLUlkOiBJZTk5NWU1 YmQ2MzQ1MWMxODkxZDNiNzZmZTA4ZjIyYTJjOWI2MmVlYQpTaWduZWQtb2ZmLWJ5OiBUb255IENo ZW5nIDx0b255LmNoZW5nQGFtZC5jb20+ClJldmlld2VkLWJ5OiBZb25ncWlhbmcgU3VuIDx5b25n cWlhbmcuc3VuQGFtZC5jb20+CkFja2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8SGFycnkuV2VudGxh bmRAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19z dXJmYWNlLmMgfCAyMyArKysrKysrKy0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjLmggICAgICAgICAgICAgIHwgIDEgLQogMiBmaWxlcyBjaGFuZ2VkLCA4 IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N1cmZhY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9jb3JlL2RjX3N1cmZhY2UuYwppbmRleCBkNjA3OTcyYjgzMGIuLjIxZmVk ZDQ0N2JkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUv ZGNfc3VyZmFjZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2Rj X3N1cmZhY2UuYwpAQCAtMTIxLDI2ICsxMjEsMjAgQEAgY29uc3Qgc3RydWN0IGRjX3N1cmZhY2Vf c3RhdHVzICpkY19zdXJmYWNlX2dldF9zdGF0dXMoCiAJCWNvbnN0IHN0cnVjdCBkY19zdXJmYWNl ICpkY19zdXJmYWNlKQogewogCXN0cnVjdCBkY19zdXJmYWNlX3N0YXR1cyAqc3VyZmFjZV9zdGF0 dXM7Ci0Jc3RydWN0IGNvcmVfc3VyZmFjZSAqY29yZV9zdXJmYWNlOworCXN0cnVjdCBjb3JlX3N1 cmZhY2UgKmNvcmVfc3VyZmFjZSA9IERDX1NVUkZBQ0VfVE9fQ09SRShkY19zdXJmYWNlKTs7CiAJ c3RydWN0IGNvcmVfZGMgKmNvcmVfZGM7CiAJaW50IGk7CiAKLQlpZiAoZGNfc3VyZmFjZSA9PSBO VUxMKQotCQlyZXR1cm4gTlVMTDsKLQotCWNvcmVfc3VyZmFjZSA9IERDX1NVUkZBQ0VfVE9fQ09S RShkY19zdXJmYWNlKTsKLQotCWlmIChjb3JlX3N1cmZhY2UgPT0gTlVMTCB8fCBjb3JlX3N1cmZh Y2UtPmN0eCA9PSBOVUxMKQotCQlyZXR1cm4gTlVMTDsKKwlpZiAoIWRjX3N1cmZhY2UgfHwKKwkJ IWNvcmVfc3VyZmFjZS0+Y3R4IHx8CisJCSFjb3JlX3N1cmZhY2UtPmN0eC0+ZGMpIHsKKwkJQVNT RVJUKDApOworCQlyZXR1cm4gTlVMTDsgLyogcmVtb3ZlIHRoaXMgaWYgYWJvdmUgYXNzZXJ0IG5l dmVyIGhpdCAqLworCX0KIAogCXN1cmZhY2Vfc3RhdHVzID0gJmNvcmVfc3VyZmFjZS0+c3RhdHVz OwotCi0JaWYgKGNvcmVfc3VyZmFjZS0+Y3R4ID09IE5VTEwgfHwgY29yZV9zdXJmYWNlLT5jdHgt PmRjID09IE5VTEwpCi0JCXJldHVybiBOVUxMOwotCiAJY29yZV9kYyA9IERDX1RPX0NPUkUoY29y ZV9zdXJmYWNlLT5jdHgtPmRjKTsKIAotCiAJaWYgKGNvcmVfZGMtPmN1cnJlbnRfY29udGV4dCA9 PSBOVUxMKQogCQlyZXR1cm4gTlVMTDsKIApAQCAtMTQ5LDggKzE0Myw3IEBAIGNvbnN0IHN0cnVj dCBkY19zdXJmYWNlX3N0YXR1cyAqZGNfc3VyZmFjZV9nZXRfc3RhdHVzKAogCQlzdHJ1Y3QgcGlw ZV9jdHggKnBpcGVfY3R4ID0KIAkJCQkmY29yZV9kYy0+Y3VycmVudF9jb250ZXh0LT5yZXNfY3R4 LnBpcGVfY3R4W2ldOwogCi0JCWlmIChwaXBlX2N0eC0+c3VyZmFjZSAhPQotCQkJCURDX1NVUkZB Q0VfVE9fQ09SRShkY19zdXJmYWNlKSkKKwkJaWYgKHBpcGVfY3R4LT5zdXJmYWNlICE9IGNvcmVf c3VyZmFjZSkKIAkJCWNvbnRpbnVlOwogCiAJCWNvcmVfZGMtPmh3c3MudXBkYXRlX3BlbmRpbmdf c3RhdHVzKHBpcGVfY3R4KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9kYy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmgKaW5kZXggMzMy ZWNmOGIxMTU3Li5jM2FjYThkNDRkNGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9kYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5o CkBAIC0zMzUsNyArMzM1LDYgQEAgc3RydWN0IGRjX3RyYW5zZmVyX2Z1bmMgKmRjX2NyZWF0ZV90 cmFuc2Zlcl9mdW5jKHZvaWQpOwogc3RydWN0IGRjX2ZsaXBfYWRkcnMgewogCXN0cnVjdCBkY19w bGFuZV9hZGRyZXNzIGFkZHJlc3M7CiAJYm9vbCBmbGlwX2ltbWVkaWF0ZTsKLQkvKiBUT0RPOiBE Q0MgZm9ybWF0IGluZm8gKi8KIAkvKiBUT0RPOiBhZGQgZmxpcCBkdXJhdGlvbiBmb3IgRnJlZVN5 bmMgKi8KIH07CiAKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft ZC1nZngK