From: Harry Wentland Subject: [PATCH 07/28] drm/amd/display: Atomic freesync ASSERT fix Date: Thu, 19 Oct 2017 13:46:26 -0400 Message-ID: <20171019174647.21260-8-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: Bhawanpreet Lakha RnJvbTogQmhhd2FucHJlZXQgTGFraGEgPEJoYXdhbnByZWV0Lkxha2hhQGFtZC5jb20+CgpDaGFu Z2VzIHRvIGF0b21pYyBzZXQgcHJvcGVydHkgZm9yIGZyZWVzeW5jLgoKTm93IEluIHNldCBwcm9w ZXJ0eSwganVzdCBzZXQgdGhlIGZyZWVzeW5jIHZhcmlhYmxlcyBhbmQgcmV0dXJuIDAuCkJhc2Vk IG9uIHRoZSB2YXJpYWJsZXMgY2FsbCBtb2RfZnJlZXN5bmNfc2V0X3VzZXJfZW5hYmxlKCkgaW5z aWRlCmNvbW1pdF90YWlsCgpTaWduZWQtb2ZmLWJ5OiBCaGF3YW5wcmVldCBMYWtoYSA8Qmhhd2Fu cHJlZXQuTGFraGFAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnkuQ2hlbmdA YW1kLmNvbT4KQWNrZWQtYnk6IEhhcnJ5IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMg fCA4NSArKysrKysrKystLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMyIGluc2VydGlv bnMoKyksIDUzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCmluZGV4IGMwZTllZWE2MThlNi4uN2YxNDA3OWUzZTY5 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdw dV9kbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1 X2RtLmMKQEAgLTE3MDMsNiArMTcwMyw3IEBAIHN0cnVjdCBkbV9jb25uZWN0b3Jfc3RhdGUgewog CXVpbnQ4X3QgdW5kZXJzY2FuX3Zib3JkZXI7CiAJdWludDhfdCB1bmRlcnNjYW5faGJvcmRlcjsK IAlib29sIHVuZGVyc2Nhbl9lbmFibGU7CisJc3RydWN0IG1vZF9mcmVlc3luY191c2VyX2VuYWJs ZSB1c2VyX2VuYWJsZTsKIH07CiAKICNkZWZpbmUgdG9fZG1fY29ubmVjdG9yX3N0YXRlKHgpXApA QCAtMjUzMSw1NSArMjUzMiw2IEBAIGFtZGdwdV9mcmVlc3luY191cGRhdGVfcHJvcGVydHlfYXRv bWljKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAKIH0KIAotc3RhdGljIGludAot YW1kZ3B1X2ZyZWVzeW5jX3NldF9wcm9wZXJ0eV9hdG9taWMoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvciwKLQkJCQkgICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5lY3Rv cl9zdGF0ZSwKLQkJCQkgICAgc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydHksIHVpbnQ2NF90 IHZhbCkKLXsKLQlzdHJ1Y3QgbW9kX2ZyZWVzeW5jX3VzZXJfZW5hYmxlIHVzZXJfZW5hYmxlOwot CXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7Ci0Jc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXY7Ci0J c3RydWN0IGFtZGdwdV9jcnRjICphY3J0YzsKLQlpbnQgcmV0OwotCXVpbnQ2NF90IHZhbF9jYXBh YmxlOwotCXN0cnVjdCBkbV9jcnRjX3N0YXRlICphY3J0Y19zdGF0ZTsKLQotCWRldiAgPSBjb25u ZWN0b3ItPmRldjsKLQlhZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlyZXQgID0gLUVJTlZBTDsK LQotCWlmIChhZGV2LT5kbS5mcmVlc3luY19tb2R1bGUgJiYgY29ubmVjdG9yX3N0YXRlLT5jcnRj KSB7Ci0JCXJldCA9IGRybV9vYmplY3RfcHJvcGVydHlfZ2V0X3ZhbHVlKAotCQkJCSZjb25uZWN0 b3ItPmJhc2UsCi0JCQkJYWRldi0+bW9kZV9pbmZvLmZyZWVzeW5jX2NhcGFibGVfcHJvcGVydHks Ci0JCQkJJnZhbF9jYXBhYmxlKTsKLQkJLyogaWYgdXNlciBmcmVlIHN5bmMgdmFsIHByb3BlcnR5 IGlzIGVuYWJsZSwgYnV0IHRoZSBjYXBhYmxlCi0JCSAqIHByb3AgaXMgbm90LCB0aGVuIGZhaWwg dGhlIGNhbGwKLQkJICovCi0JCWlmIChyZXQgIT0gMCB8fCAodmFsX2NhcGFibGUgPT0gMCAmJiB2 YWwgIT0gMCkpIHsKLQkJCXJldCAgPSAtRUlOVkFMOwotCQkJZ290byByZWxlYXNlOwotCQl9Ci0K LQkJdXNlcl9lbmFibGUuZW5hYmxlX2Zvcl9nYW1pbmcgPSB2YWwgPyB0cnVlIDogZmFsc2U7Ci0J CXVzZXJfZW5hYmxlLmVuYWJsZV9mb3Jfc3RhdGljID0gdXNlcl9lbmFibGUuZW5hYmxlX2Zvcl9n YW1pbmc7Ci0JCXVzZXJfZW5hYmxlLmVuYWJsZV9mb3JfdmlkZW8gID0gdXNlcl9lbmFibGUuZW5h YmxlX2Zvcl9nYW1pbmc7Ci0JCXJldCAgPSAtRUlOVkFMOwotCQlhY3J0YyA9IHRvX2FtZGdwdV9j cnRjKGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7Ci0JCWFjcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19z dGF0ZShjb25uZWN0b3Jfc3RhdGUtPmNydGMtPnN0YXRlKTsKLQotCi0JCWlmIChjb25uZWN0b3Jf c3RhdGUtPmNvbm5lY3RvciA9PSBjb25uZWN0b3IgJiYgYWNydGNfc3RhdGUtPnN0cmVhbSkgewot CQkJbW9kX2ZyZWVzeW5jX3NldF91c2VyX2VuYWJsZShhZGV2LT5kbS5mcmVlc3luY19tb2R1bGUs Ci0JCQkJCQkgICAgICZhY3J0Y19zdGF0ZS0+c3RyZWFtLCAxLAotCQkJCQkJICAgICAmdXNlcl9l bmFibGUpOwotCQkJcmV0ID0gMDsKLQkJfQotCX0KLXJlbGVhc2U6Ci0JcmV0dXJuIHJldDsKLX0K LQogaW50IGFtZGdwdV9kbV9jb25uZWN0b3JfYXRvbWljX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJCQkgICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3Rh dGUgKmNvbm5lY3Rvcl9zdGF0ZSwKIAkJCQkJICAgIHN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3Bl cnR5LApAQCAtMjYyOCwxMCArMjU4MCwxMCBAQCBpbnQgYW1kZ3B1X2RtX2Nvbm5lY3Rvcl9hdG9t aWNfc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCWRtX25l d19zdGF0ZS0+dW5kZXJzY2FuX2VuYWJsZSA9IHZhbDsKIAkJcmV0ID0gMDsKIAl9IGVsc2UgaWYg KHByb3BlcnR5ID09IGFkZXYtPm1vZGVfaW5mby5mcmVlc3luY19wcm9wZXJ0eSkgewotCQlyZXQg PSBhbWRncHVfZnJlZXN5bmNfc2V0X3Byb3BlcnR5X2F0b21pYyhjb25uZWN0b3IsCi0JCQkJCQkJ ICBjb25uZWN0b3Jfc3RhdGUsCi0JCQkJCQkJICBwcm9wZXJ0eSwgdmFsKTsKLQkJcmV0dXJuIHJl dDsKKwkJZG1fbmV3X3N0YXRlLT51c2VyX2VuYWJsZS5lbmFibGVfZm9yX2dhbWluZyA9IHZhbDsK KwkJZG1fbmV3X3N0YXRlLT51c2VyX2VuYWJsZS5lbmFibGVfZm9yX3N0YXRpYyA9IHZhbDsKKwkJ ZG1fbmV3X3N0YXRlLT51c2VyX2VuYWJsZS5lbmFibGVfZm9yX3ZpZGVvID0gdmFsOworCQlyZXQg PSAwOwogCX0gZWxzZSBpZiAocHJvcGVydHkgPT0gYWRldi0+bW9kZV9pbmZvLmZyZWVzeW5jX2Nh cGFibGVfcHJvcGVydHkpIHsKIAkJcmV0ID0gLUVJTlZBTDsKIAkJcmV0dXJuIHJldDsKQEAgLTQy MjEsNiArNDE3MywzMyBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWls KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJCW1vZF9mcmVlc3luY19hZGRfc3Ry ZWFtKGFkZXYtPmRtLmZyZWVzeW5jX21vZHVsZSwKIAkJCQkJCW5ld19zdHJlYW0sICZhY29ubmVj dG9yLT5jYXBzKTsKIAkJfQorCisJCWxpc3RfZm9yX2VhY2hfZW50cnkoY3J0YywgJmRldi0+bW9k ZV9jb25maWcuY3J0Y19saXN0LCBoZWFkKSB7CisKKwkJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNy dGMgPSB0b19hbWRncHVfY3J0YyhjcnRjKTsKKwkJCXN0cnVjdCBhbWRncHVfZG1fY29ubmVjdG9y ICphY29ubmVjdG9yID0gTlVMTDsKKwkJCXN0cnVjdCBkbV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5f c3RhdGUgPSBOVUxMOworCQkJc3RydWN0IGRtX2NydGNfc3RhdGUgKmFjcnRjX3N0YXRlID0gTlVM TDsKKworCQkJYWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKGFjcnRjLT5iYXNlLnN0YXRl KTsKKworCisJCQlhY29ubmVjdG9yID0KKwkJCQlhbWRncHVfZG1fZmluZF9maXJzdF9jcnRjX21h dGNoaW5nX2Nvbm5lY3RvcigKKwkJCQkJc3RhdGUsCisJCQkJCWNydGMsCisJCQkJCWZhbHNlKTsK KwkJCWlmIChhY29ubmVjdG9yKSB7CisJCQkJY29ubl9zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rvcl9z dGF0ZShhY29ubmVjdG9yLT5iYXNlLnN0YXRlKTsKKworCQkJCWlmIChuZXdfc3RyZWFtKSB7CisJ CQkJCW1vZF9mcmVlc3luY19zZXRfdXNlcl9lbmFibGUoYWRldi0+ZG0uZnJlZXN5bmNfbW9kdWxl LAorCQkJCQkJCQkgICAgICZhY3J0Y19zdGF0ZS0+c3RyZWFtLAorCQkJCQkJCQkgICAgIDEsCisJ CQkJCQkJCSAgICAgJmNvbm5fc3RhdGUtPnVzZXJfZW5hYmxlKTsKKwkJCQl9CisJCQl9CisJCX0K IAl9CiAKIAlpZiAoZG1fc3RhdGUtPmNvbnRleHQpCi0tIAoyLjE0LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFt ZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=