From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harry Wentland Subject: [PATCH 29/34] drm/amd/display: Couple bug fixes in stats module Date: Tue, 20 Mar 2018 15:12:54 -0400 Message-ID: <20180320191259.14453-30-harry.wentland@amd.com> References: <20180320191259.14453-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: <20180320191259.14453-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 , Anthony Koo RnJvbTogQW50aG9ueSBLb28gPEFudGhvbnkuS29vQGFtZC5jb20+CgpTaWduZWQtb2ZmLWJ5OiBI YXJyeSBXZW50bGFuZCA8aGFycnkud2VudGxhbmRAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEhhcnJ5 IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29tPgpSZXZpZXdlZC1ieTogVG9ueSBDaGVu ZyA8VG9ueS5DaGVuZ0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9t b2R1bGVzL3N0YXRzL3N0YXRzLmMgfCAzOSArKysrKysrKysrKysrKysrLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9tb2R1bGVzL3N0YXRzL3N0YXRzLmMgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvbW9kdWxlcy9zdGF0cy9zdGF0cy5jCmluZGV4IDA0MWY4 N2I3M2Q1Zi4uZWQ1ZjY4MDlhNjRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvbW9kdWxlcy9zdGF0cy9zdGF0cy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9tb2R1bGVzL3N0YXRzL3N0YXRzLmMKQEAgLTE4Nyw3ICsxODcsNyBAQCB2b2lkIG1vZF9z dGF0c19kdW1wKHN0cnVjdCBtb2Rfc3RhdHMgKm1vZF9zdGF0cykKIAogCQlmb3IgKGludCBpID0g MDsgaSA8IGNvcmVfc3RhdHMtPmluZGV4ICYmIGkgPCBjb3JlX3N0YXRzLT5lbnRyaWVzOyBpKysp IHsKIAkJCWRtX2xvZ2dlcl93cml0ZShsb2dnZXIsIExPR19QUk9GSUxJTkcsCi0JCQkJCSIldSAg JXUgICV1ICAldSAgJXUgICV1ICAldSAgJXUgICV1ICAldSAgJXUgICV1ICAldSAgJXUgICV1ICAl dSAgJXUgICV1ICAldVxuIiwKKwkJCQkJIiV1ICAldSAgJXUgICV1ICAldSAgJXUgICV1ICAldSAg JXUgICV1ICAldSAgJXUgICV1ICAldSAgJXUgICV1ICAldSAgJXUgICV1IiwKIAkJCQkJdGltZVtp XS5yZW5kZXJfdGltZV9pbl91cywKIAkJCQkJdGltZVtpXS5hdmdfcmVuZGVyX3RpbWVfaW5fdXNf bGFzdF90ZW4sCiAJCQkJCXRpbWVbaV0ubWluX3dpbmRvdywKQEAgLTIyNyw3ICsyMjcsNyBAQCB2 b2lkIG1vZF9zdGF0c19yZXNldF9kYXRhKHN0cnVjdCBtb2Rfc3RhdHMgKm1vZF9zdGF0cykKIAlt ZW1zZXQoY29yZV9zdGF0cy0+dGltZSwgMCwKIAkJc2l6ZW9mKHN0cnVjdCBzdGF0c190aW1lX2Nh Y2hlKSAqIGNvcmVfc3RhdHMtPmVudHJpZXMpOwogCi0JY29yZV9zdGF0cy0+aW5kZXggPSAwOwor CWNvcmVfc3RhdHMtPmluZGV4ID0gMTsKIH0KIAogdm9pZCBtb2Rfc3RhdHNfdXBkYXRlX2ZsaXAo c3RydWN0IG1vZF9zdGF0cyAqbW9kX3N0YXRzLApAQCAtMjUwLDcgKzI1MCw3IEBAIHZvaWQgbW9k X3N0YXRzX3VwZGF0ZV9mbGlwKHN0cnVjdCBtb2Rfc3RhdHMgKm1vZF9zdGF0cywKIAogCXRpbWVb aW5kZXhdLmZsaXBfdGltZXN0YW1wX2luX25zID0gdGltZXN0YW1wX2luX25zOwogCXRpbWVbaW5k ZXhdLnJlbmRlcl90aW1lX2luX3VzID0KLQkJdGltZXN0YW1wX2luX25zIC0gdGltZVtpbmRleCAt IDFdLmZsaXBfdGltZXN0YW1wX2luX25zOworCQkodGltZXN0YW1wX2luX25zIC0gdGltZVtpbmRl eCAtIDFdLmZsaXBfdGltZXN0YW1wX2luX25zKSAvIDEwMDA7CiAKIAlpZiAoaW5kZXggPj0gMTAp IHsKIAkJZm9yICh1bnNpZ25lZCBpbnQgaSA9IDA7IGkgPCAxMDsgaSsrKQpAQCAtMjYxLDEwICsy NjEsMTIgQEAgdm9pZCBtb2Rfc3RhdHNfdXBkYXRlX2ZsaXAoc3RydWN0IG1vZF9zdGF0cyAqbW9k X3N0YXRzLAogCiAJaWYgKHRpbWVbaW5kZXhdLm51bV92c3luY19iZXR3ZWVuX2ZsaXBzID4gMCkK IAkJdGltZVtpbmRleF0udnN5bmNfdG9fZmxpcF90aW1lX2luX3VzID0KLQkJCXRpbWVzdGFtcF9p bl9ucyAtIHRpbWVbaW5kZXhdLnZ1cGRhdGVfdGltZXN0YW1wX2luX25zOworCQkJKHRpbWVzdGFt cF9pbl9ucyAtCisJCQkJdGltZVtpbmRleF0udnVwZGF0ZV90aW1lc3RhbXBfaW5fbnMpIC8gMTAw MDsKIAllbHNlCiAJCXRpbWVbaW5kZXhdLnZzeW5jX3RvX2ZsaXBfdGltZV9pbl91cyA9Ci0JCQl0 aW1lc3RhbXBfaW5fbnMgLSB0aW1lW2luZGV4IC0gMV0udnVwZGF0ZV90aW1lc3RhbXBfaW5fbnM7 CisJCQkodGltZXN0YW1wX2luX25zIC0KKwkJCQl0aW1lW2luZGV4IC0gMV0udnVwZGF0ZV90aW1l c3RhbXBfaW5fbnMpIC8gMTAwMDsKIAogCWNvcmVfc3RhdHMtPmluZGV4Kys7CiB9CkBAIC0yNzUs NiArMjc3LDggQEAgdm9pZCBtb2Rfc3RhdHNfdXBkYXRlX3Z1cGRhdGUoc3RydWN0IG1vZF9zdGF0 cyAqbW9kX3N0YXRzLAogCXN0cnVjdCBjb3JlX3N0YXRzICpjb3JlX3N0YXRzID0gTlVMTDsKIAlz dHJ1Y3Qgc3RhdHNfdGltZV9jYWNoZSAqdGltZSA9IE5VTEw7CiAJdW5zaWduZWQgaW50IGluZGV4 ID0gMDsKKwl1bnNpZ25lZCBpbnQgbnVtX3ZzeW5jcyA9IDA7CisJdW5zaWduZWQgaW50IHByZXZf dnN5bmNfaW5fbnMgPSAwOwogCiAJaWYgKG1vZF9zdGF0cyA9PSBOVUxMKQogCQlyZXR1cm47CkBA IC0yODYsMTQgKzI5MCwyNyBAQCB2b2lkIG1vZF9zdGF0c191cGRhdGVfdnVwZGF0ZShzdHJ1Y3Qg bW9kX3N0YXRzICptb2Rfc3RhdHMsCiAKIAl0aW1lID0gY29yZV9zdGF0cy0+dGltZTsKIAlpbmRl eCA9IGNvcmVfc3RhdHMtPmluZGV4OworCW51bV92c3luY3MgPSB0aW1lW2luZGV4XS5udW1fdnN5 bmNfYmV0d2Vlbl9mbGlwczsKKworCWlmIChudW1fdnN5bmNzIDwgTU9EX1NUQVRTX05VTV9WU1lO Q1MpIHsKKwkJaWYgKG51bV92c3luY3MgPT0gMCkgeworCQkJcHJldl92c3luY19pbl9ucyA9CisJ CQkJdGltZVtpbmRleCAtIDFdLnZ1cGRhdGVfdGltZXN0YW1wX2luX25zOworCisJCQl0aW1lW2lu ZGV4XS5mbGlwX3RvX3ZzeW5jX3RpbWVfaW5fdXMgPQorCQkJCSh0aW1lc3RhbXBfaW5fbnMgLQor CQkJCQl0aW1lW2luZGV4IC0gMV0uZmxpcF90aW1lc3RhbXBfaW5fbnMpIC8KKwkJCQkJMTAwMDsK KwkJfSBlbHNlIHsKKwkJCXByZXZfdnN5bmNfaW5fbnMgPQorCQkJCXRpbWVbaW5kZXhdLnZ1cGRh dGVfdGltZXN0YW1wX2luX25zOworCQl9CiAKLQl0aW1lW2luZGV4XS52dXBkYXRlX3RpbWVzdGFt cF9pbl9ucyA9IHRpbWVzdGFtcF9pbl9uczsKLQlpZiAodGltZVtpbmRleF0ubnVtX3ZzeW5jX2Jl dHdlZW5fZmxpcHMgPCBNT0RfU1RBVFNfTlVNX1ZTWU5DUykKLQkJdGltZVtpbmRleF0udl9zeW5j X3RpbWVfaW5fdXNbdGltZVtpbmRleF0ubnVtX3ZzeW5jX2JldHdlZW5fZmxpcHNdID0KLQkJCXRp bWVzdGFtcF9pbl9ucyAtIHRpbWVbaW5kZXggLSAxXS52dXBkYXRlX3RpbWVzdGFtcF9pbl9uczsK LQl0aW1lW2luZGV4XS5mbGlwX3RvX3ZzeW5jX3RpbWVfaW5fdXMgPQotCQl0aW1lc3RhbXBfaW5f bnMgLSB0aW1lW2luZGV4IC0gMV0uZmxpcF90aW1lc3RhbXBfaW5fbnM7CisJCXRpbWVbaW5kZXhd LnZfc3luY190aW1lX2luX3VzW251bV92c3luY3NdID0KKwkJCSh0aW1lc3RhbXBfaW5fbnMgLSBw cmV2X3ZzeW5jX2luX25zKSAvIDEwMDA7CisJfQogCisJdGltZVtpbmRleF0udnVwZGF0ZV90aW1l c3RhbXBfaW5fbnMgPSB0aW1lc3RhbXBfaW5fbnM7CiAJdGltZVtpbmRleF0ubnVtX3ZzeW5jX2Jl dHdlZW5fZmxpcHMrKzsKIH0KIAotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2FtZC1nZngK