From: Harry Wentland Subject: [PATCH 16/28] drm/amd/display: Cleanup code that enables freesync Date: Thu, 19 Oct 2017 13:46:35 -0400 Message-ID: <20171019174647.21260-17-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: "Leo (Sunpeng) Li" RnJvbTogIkxlbyAoU3VucGVuZykgTGkiIDxzdW5wZW5nLmxpQGFtZC5jb20+CgpUaGlzIGlzIGEg Zm9sbG93LXVwIHBhdGNoIHRvOgoKQmhhd2FucHJlZXQgTGFraGEgICAgQXRvbWljIGZyZWVzeW5j IEFTU0VSVCBmaXgKCkNoYW5nZXM6Ci0gQ29tYmluZSB0byB1c2Ugb25lIGl0ZXJhdG9yCi0gVXNl IG5ldyBEUk0gaXRlcmF0b3JzLgoKU2lnbmVkLW9mZi1ieTogTGVvIChTdW5wZW5nKSBMaSA8c3Vu cGVuZy5saUBhbWQuY29tPgpSZXZpZXdlZC1ieTogQmhhd2FucHJlZXQgTGFraGEgPEJoYXdhbnBy ZWV0Lkxha2hhQGFtZC5jb20+CkFja2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8SGFycnkuV2VudGxh bmRAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2Ft ZGdwdV9kbS5jIHwgNTUgKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx NyBpbnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYwppbmRleCBhNjQyNGViMWMxYTUuLjgx MmEwMDE2ODY5ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdw dV9kbS9hbWRncHVfZG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1 X2RtL2FtZGdwdV9kbS5jCkBAIC00MDUwLDcgKzQwNTAsNiBAQCBzdGF0aWMgdm9pZCBhbWRncHVf ZG1fYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlz dHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19z dGF0ZSwgKm5ld19jcnRjX3N0YXRlOwogCXN0cnVjdCBhbWRncHVfY3J0YyAqbmV3X2NydGNzW01B WF9TVFJFQU1TXTsKLQlzdHJ1Y3QgZGNfc3RyZWFtX3N0YXRlICpuZXdfc3RyZWFtID0gTlVMTDsK IAl1bnNpZ25lZCBsb25nIGZsYWdzOwogCWJvb2wgd2FpdF9mb3JfdmJsYW5rID0gdHJ1ZTsKIAlz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwpAQCAtNDE0NSw1NiArNDE0NCwzNiBAQCBz dGF0aWMgdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSkKIAkgKiBhcmUgcmVtb3ZlZCBmcm9tIGZyZWVzeW5jIG1vZHVsZQogCSAq LwogCWlmIChhZGV2LT5kbS5mcmVlc3luY19tb2R1bGUpIHsKLQkJZm9yIChpID0gMDsgaSA8IG5l d19jcnRjc19jb3VudDsgaSsrKSB7CisJCWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKHN0YXRl LCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkgewogCQkJc3RydWN0IGFtZGdwdV9kbV9jb25uZWN0 b3IgKmFjb25uZWN0b3IgPSBOVUxMOworCQkJc3RydWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqZG1f bmV3X2Nvbl9zdGF0ZSA9IE5VTEw7CisJCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gTlVM TDsKIAotCQkJbmV3X2NydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZSgK LQkJCQkJc3RhdGUsICZuZXdfY3J0Y3NbaV0tPmJhc2UpOwogCQkJZG1fbmV3X2NydGNfc3RhdGUg PSB0b19kbV9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsKKwkJCWFjcnRjID0gdG9fYW1kZ3B1 X2NydGMoY3J0Yyk7CiAKLQkJCW5ld19zdHJlYW0gPSBkbV9uZXdfY3J0Y19zdGF0ZS0+c3RyZWFt OwogCQkJYWNvbm5lY3RvciA9CiAJCQkJYW1kZ3B1X2RtX2ZpbmRfZmlyc3RfY3J0Y19tYXRjaGlu Z19jb25uZWN0b3IoCi0JCQkJCXN0YXRlLAotCQkJCQkmbmV3X2NydGNzW2ldLT5iYXNlKTsKKwkJ CQkJc3RhdGUsIGNydGMpOwogCQkJaWYgKCFhY29ubmVjdG9yKSB7CiAJCQkJRFJNX0RFQlVHX0RS SVZFUigiQXRvbWljIGNvbW1pdDogRmFpbGVkIHRvIGZpbmQgY29ubmVjdG9yIGZvciBhY3J0YyBp ZDolZCAiCiAJCQkJCSAic2tpcHBpbmcgZnJlZXN5bmMgaW5pdFxuIiwKLQkJCQkJIG5ld19jcnRj c1tpXS0+Y3J0Y19pZCk7CisJCQkJCSBhY3J0Yy0+Y3J0Y19pZCk7CiAJCQkJY29udGludWU7CiAJ CQl9CiAKIAkJCW1vZF9mcmVlc3luY19hZGRfc3RyZWFtKGFkZXYtPmRtLmZyZWVzeW5jX21vZHVs ZSwKLQkJCQkJCW5ld19zdHJlYW0sICZhY29ubmVjdG9yLT5jYXBzKTsKLQkJfQotCi0JCWxpc3Rf Zm9yX2VhY2hfZW50cnkoY3J0YywgJmRldi0+bW9kZV9jb25maWcuY3J0Y19saXN0LCBoZWFkKSB7 Ci0KLQkJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMgPSB0b19hbWRncHVfY3J0YyhjcnRjKTsK LQkJCXN0cnVjdCBhbWRncHVfZG1fY29ubmVjdG9yICphY29ubmVjdG9yID0gTlVMTDsKLQkJCXN0 cnVjdCBkbV9jb25uZWN0b3Jfc3RhdGUgKmRtX25ld19jb25fc3RhdGUgPSBOVUxMOwotCQkJc3Ry dWN0IGRtX2NydGNfc3RhdGUgKmFjcnRjX3N0YXRlID0gTlVMTDsKLQotCQkJbmV3X2NydGNfc3Rh dGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZSgKLQkJCQkJc3RhdGUsICZhY3J0Yy0+ YmFzZSk7Ci0JCQlhY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUobmV3X2NydGNfc3RhdGUp OwotCi0KLQkJCWFjb25uZWN0b3IgPQotCQkJCWFtZGdwdV9kbV9maW5kX2ZpcnN0X2NydGNfbWF0 Y2hpbmdfY29ubmVjdG9yKAotCQkJCQlzdGF0ZSwKLQkJCQkJY3J0Yyk7Ci0JCQlpZiAoYWNvbm5l Y3RvcikgewotCQkJCW5ld19jb25fc3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY29ubmVjdG9y X3N0YXRlKAotCQkJCQkJc3RhdGUsICZhY29ubmVjdG9yLT5iYXNlKTsKLQkJCQlkbV9uZXdfY29u X3N0YXRlID0gdG9fZG1fY29ubmVjdG9yX3N0YXRlKG5ld19jb25fc3RhdGUpOwotCi0JCQkJaWYg KG5ld19zdHJlYW0pIHsKLQkJCQkJbW9kX2ZyZWVzeW5jX3NldF91c2VyX2VuYWJsZShhZGV2LT5k bS5mcmVlc3luY19tb2R1bGUsCi0JCQkJCQkJCSAgICAgJmFjcnRjX3N0YXRlLT5zdHJlYW0sCi0J CQkJCQkJCSAgICAgMSwKLQkJCQkJCQkJICAgICAmZG1fbmV3X2Nvbl9zdGF0ZS0+dXNlcl9lbmFi bGUpOwotCQkJCX0KKwkJCQkJCWRtX25ld19jcnRjX3N0YXRlLT5zdHJlYW0sCisJCQkJCQkmYWNv bm5lY3Rvci0+Y2Fwcyk7CisJCQluZXdfY29uX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2Nv bm5lY3Rvcl9zdGF0ZSgKKwkJCQkJc3RhdGUsICZhY29ubmVjdG9yLT5iYXNlKTsKKwkJCWRtX25l d19jb25fc3RhdGUgPSB0b19kbV9jb25uZWN0b3Jfc3RhdGUobmV3X2Nvbl9zdGF0ZSk7CisKKwkJ CWlmIChkbV9uZXdfY3J0Y19zdGF0ZS0+c3RyZWFtKSB7CisJCQkJbW9kX2ZyZWVzeW5jX3NldF91 c2VyX2VuYWJsZShhZGV2LT5kbS5mcmVlc3luY19tb2R1bGUsCisJCQkJCQkJICAgICAmZG1fbmV3 X2NydGNfc3RhdGUtPnN0cmVhbSwKKwkJCQkJCQkgICAgIDEsCisJCQkJCQkJICAgICAmZG1fbmV3 X2Nvbl9zdGF0ZS0+dXNlcl9lbmFibGUpOwogCQkJfQogCQl9CiAJfQotLSAKMi4xNC4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxp bmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK