From: Mario Kleiner Subject: [PATCH 2/2] drm/radeon: Make display watermark calculations more accurate Date: Mon, 24 Apr 2017 01:33:09 +0200 Message-ID: <1492990389-10156-3-git-send-email-mario.kleiner.de@gmail.com> References: <1492990389-10156-1-git-send-email-mario.kleiner.de@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1492990389-10156-1-git-send-email-mario.kleiner.de@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Alex Deucher , amd-gfx@lists.freedesktop.org List-Id: amd-gfx.lists.freedesktop.org QXZvaWQgYmlnIHJvdW5kb2ZmIGVycm9ycyBpbiBzY2FubGluZS9oYWN0aXZlIGR1cmF0aW9ucyBm b3IKaGlnaCBwaXhlbCBjbG9ja3MsIGVzcGVjaWFsbHkgZm9yID49IDUwMCBNaHosIGFuZCB0aGVy ZWJ5CnByb2dyYW0gbW9yZSBhY2N1cmF0ZSBkaXNwbGF5IGZpZm8gd2F0ZXJtYXJrcy4KClRoaXMg aXMgYSBwb3J0IG9mIHRoZSBjb3JyZXNwb25kaW5nIGFtZGdwdSBwYXRjaC4KCkltcGxlbWVudGVk IGZvciBEQ0UgNCw2LDguClRlc3RlZCBvbiBFdmVyZ3JlZW4vRENFLTQgd2l0aCBSYWRlb24gSEQt NTc3MC4KClNpZ25lZC1vZmYtYnk6IE1hcmlvIEtsZWluZXIgPG1hcmlvLmtsZWluZXIuZGVAZ21h aWwuY29tPgpDYzogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vY2lrLmMgICAgICAgfCAxMCArKysrKy0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL2V2ZXJncmVlbi5jIHwgMTAgKysrKystLS0tLQogZHJpdmVycy9n cHUvZHJtL3JhZGVvbi9zaS5jICAgICAgICB8IDEwICsrKysrLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3JhZGVvbi9jaWsuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vY2lrLmMKaW5k ZXggNGYwMzRjYi4uY2NlYmUwZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9j aWsuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2Npay5jCkBAIC05MjYxLDE0ICs5MjYx LDE0IEBAIHN0YXRpYyB2b2lkIGRjZThfcHJvZ3JhbV93YXRlcm1hcmtzKHN0cnVjdCByYWRlb25f ZGV2aWNlICpyZGV2LAogewogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlID0gJnJhZGVv bl9jcnRjLT5iYXNlLm1vZGU7CiAJc3RydWN0IGRjZThfd21fcGFyYW1zIHdtX2xvdywgd21faGln aDsKLQl1MzIgcGl4ZWxfcGVyaW9kOworCXUzMiBhY3RpdmVfdGltZTsKIAl1MzIgbGluZV90aW1l ID0gMDsKIAl1MzIgbGF0ZW5jeV93YXRlcm1hcmtfYSA9IDAsIGxhdGVuY3lfd2F0ZXJtYXJrX2Ig PSAwOwogCXUzMiB0bXAsIHdtX21hc2s7CiAKIAlpZiAocmFkZW9uX2NydGMtPmJhc2UuZW5hYmxl ZCAmJiBudW1faGVhZHMgJiYgbW9kZSkgewotCQlwaXhlbF9wZXJpb2QgPSAxMDAwMDAwIC8gKHUz Miltb2RlLT5jbG9jazsKLQkJbGluZV90aW1lID0gbWluKCh1MzIpbW9kZS0+Y3J0Y19odG90YWwg KiBwaXhlbF9wZXJpb2QsICh1MzIpNjU1MzUpOworCQlhY3RpdmVfdGltZSA9IDEwMDAwMDBVTCAq ICh1MzIpbW9kZS0+Y3J0Y19oZGlzcGxheSAvICh1MzIpbW9kZS0+Y2xvY2s7CisJCWxpbmVfdGlt ZSA9IG1pbigodTMyKSAoMTAwMDAwMFVMICogKHUzMiltb2RlLT5jcnRjX2h0b3RhbCAvICh1MzIp bW9kZS0+Y2xvY2spLCAodTMyKTY1NTM1KTsKIAogCQkvKiB3YXRlcm1hcmsgZm9yIGhpZ2ggY2xv Y2tzICovCiAJCWlmICgocmRldi0+cG0ucG1fbWV0aG9kID09IFBNX01FVEhPRF9EUE0pICYmCkBA IC05Mjg0LDcgKzkyODQsNyBAQCBzdGF0aWMgdm9pZCBkY2U4X3Byb2dyYW1fd2F0ZXJtYXJrcyhz dHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAogCQl3bV9oaWdoLmRpc3BfY2xrID0gbW9kZS0+ Y2xvY2s7CiAJCXdtX2hpZ2guc3JjX3dpZHRoID0gbW9kZS0+Y3J0Y19oZGlzcGxheTsKLQkJd21f aGlnaC5hY3RpdmVfdGltZSA9IG1vZGUtPmNydGNfaGRpc3BsYXkgKiBwaXhlbF9wZXJpb2Q7CisJ CXdtX2hpZ2guYWN0aXZlX3RpbWUgPSBhY3RpdmVfdGltZTsKIAkJd21faGlnaC5ibGFua190aW1l ID0gbGluZV90aW1lIC0gd21faGlnaC5hY3RpdmVfdGltZTsKIAkJd21faGlnaC5pbnRlcmxhY2Vk ID0gZmFsc2U7CiAJCWlmIChtb2RlLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfSU5URVJMQUNFKQpA QCAtOTMyNCw3ICs5MzI0LDcgQEAgc3RhdGljIHZvaWQgZGNlOF9wcm9ncmFtX3dhdGVybWFya3Mo c3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAKIAkJd21fbG93LmRpc3BfY2xrID0gbW9kZS0+ Y2xvY2s7CiAJCXdtX2xvdy5zcmNfd2lkdGggPSBtb2RlLT5jcnRjX2hkaXNwbGF5OwotCQl3bV9s b3cuYWN0aXZlX3RpbWUgPSBtb2RlLT5jcnRjX2hkaXNwbGF5ICogcGl4ZWxfcGVyaW9kOworCQl3 bV9sb3cuYWN0aXZlX3RpbWUgPSBhY3RpdmVfdGltZTsKIAkJd21fbG93LmJsYW5rX3RpbWUgPSBs aW5lX3RpbWUgLSB3bV9sb3cuYWN0aXZlX3RpbWU7CiAJCXdtX2xvdy5pbnRlcmxhY2VkID0gZmFs c2U7CiAJCWlmIChtb2RlLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfSU5URVJMQUNFKQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9ldmVyZ3JlZW4uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vZXZlcmdyZWVuLmMKaW5kZXggM2M5YzEzMy4uZjEzMGVjNCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9ldmVyZ3JlZW4uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v cmFkZW9uL2V2ZXJncmVlbi5jCkBAIC0yMjU1LDcgKzIyNTUsNyBAQCBzdGF0aWMgdm9pZCBldmVy Z3JlZW5fcHJvZ3JhbV93YXRlcm1hcmtzKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAogCXN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlID0gJnJhZGVvbl9jcnRjLT5iYXNlLm1vZGU7CiAJ c3RydWN0IGV2ZXJncmVlbl93bV9wYXJhbXMgd21fbG93LCB3bV9oaWdoOwogCXUzMiBkcmFtX2No YW5uZWxzOwotCXUzMiBwaXhlbF9wZXJpb2Q7CisJdTMyIGFjdGl2ZV90aW1lOwogCXUzMiBsaW5l X3RpbWUgPSAwOwogCXUzMiBsYXRlbmN5X3dhdGVybWFya19hID0gMCwgbGF0ZW5jeV93YXRlcm1h cmtfYiA9IDA7CiAJdTMyIHByaW9yaXR5X2FfbWFyayA9IDAsIHByaW9yaXR5X2JfbWFyayA9IDA7 CkBAIC0yMjY2LDggKzIyNjYsOCBAQCBzdGF0aWMgdm9pZCBldmVyZ3JlZW5fcHJvZ3JhbV93YXRl cm1hcmtzKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAogCWZpeGVkMjBfMTIgYSwgYiwgYzsK IAogCWlmIChyYWRlb25fY3J0Yy0+YmFzZS5lbmFibGVkICYmIG51bV9oZWFkcyAmJiBtb2RlKSB7 Ci0JCXBpeGVsX3BlcmlvZCA9IDEwMDAwMDAgLyAodTMyKW1vZGUtPmNsb2NrOwotCQlsaW5lX3Rp bWUgPSBtaW4oKHUzMiltb2RlLT5jcnRjX2h0b3RhbCAqIHBpeGVsX3BlcmlvZCwgKHUzMik2NTUz NSk7CisJCWFjdGl2ZV90aW1lID0gMTAwMDAwMFVMICogKHUzMiltb2RlLT5jcnRjX2hkaXNwbGF5 IC8gKHUzMiltb2RlLT5jbG9jazsKKwkJbGluZV90aW1lID0gbWluKCh1MzIpICgxMDAwMDAwVUwg KiAodTMyKW1vZGUtPmNydGNfaHRvdGFsIC8gKHUzMiltb2RlLT5jbG9jayksICh1MzIpNjU1MzUp OwogCQlwcmlvcml0eV9hX2NudCA9IDA7CiAJCXByaW9yaXR5X2JfY250ID0gMDsKIAkJZHJhbV9j aGFubmVscyA9IGV2ZXJncmVlbl9nZXRfbnVtYmVyX29mX2RyYW1fY2hhbm5lbHMocmRldik7CkBA IC0yMjg1LDcgKzIyODUsNyBAQCBzdGF0aWMgdm9pZCBldmVyZ3JlZW5fcHJvZ3JhbV93YXRlcm1h cmtzKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAogCiAJCXdtX2hpZ2guZGlzcF9jbGsgPSBt b2RlLT5jbG9jazsKIAkJd21faGlnaC5zcmNfd2lkdGggPSBtb2RlLT5jcnRjX2hkaXNwbGF5Owot CQl3bV9oaWdoLmFjdGl2ZV90aW1lID0gbW9kZS0+Y3J0Y19oZGlzcGxheSAqIHBpeGVsX3Blcmlv ZDsKKwkJd21faGlnaC5hY3RpdmVfdGltZSA9IGFjdGl2ZV90aW1lOwogCQl3bV9oaWdoLmJsYW5r X3RpbWUgPSBsaW5lX3RpbWUgLSB3bV9oaWdoLmFjdGl2ZV90aW1lOwogCQl3bV9oaWdoLmludGVy bGFjZWQgPSBmYWxzZTsKIAkJaWYgKG1vZGUtPmZsYWdzICYgRFJNX01PREVfRkxBR19JTlRFUkxB Q0UpCkBAIC0yMzEyLDcgKzIzMTIsNyBAQCBzdGF0aWMgdm9pZCBldmVyZ3JlZW5fcHJvZ3JhbV93 YXRlcm1hcmtzKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAogCiAJCXdtX2xvdy5kaXNwX2Ns ayA9IG1vZGUtPmNsb2NrOwogCQl3bV9sb3cuc3JjX3dpZHRoID0gbW9kZS0+Y3J0Y19oZGlzcGxh eTsKLQkJd21fbG93LmFjdGl2ZV90aW1lID0gbW9kZS0+Y3J0Y19oZGlzcGxheSAqIHBpeGVsX3Bl cmlvZDsKKwkJd21fbG93LmFjdGl2ZV90aW1lID0gYWN0aXZlX3RpbWU7CiAJCXdtX2xvdy5ibGFu a190aW1lID0gbGluZV90aW1lIC0gd21fbG93LmFjdGl2ZV90aW1lOwogCQl3bV9sb3cuaW50ZXJs YWNlZCA9IGZhbHNlOwogCQlpZiAobW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0lOVEVSTEFD RSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vc2kuYyBiL2RyaXZlcnMvZ3B1 L2RybS9yYWRlb24vc2kuYwppbmRleCAzZWZkZmQwLi5jZWVlODdmIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3NpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9zaS5j CkBAIC0yMjc0LDcgKzIyNzQsNyBAQCBzdGF0aWMgdm9pZCBkY2U2X3Byb2dyYW1fd2F0ZXJtYXJr cyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq bW9kZSA9ICZyYWRlb25fY3J0Yy0+YmFzZS5tb2RlOwogCXN0cnVjdCBkY2U2X3dtX3BhcmFtcyB3 bV9sb3csIHdtX2hpZ2g7CiAJdTMyIGRyYW1fY2hhbm5lbHM7Ci0JdTMyIHBpeGVsX3BlcmlvZDsK Kwl1MzIgYWN0aXZlX3RpbWU7CiAJdTMyIGxpbmVfdGltZSA9IDA7CiAJdTMyIGxhdGVuY3lfd2F0 ZXJtYXJrX2EgPSAwLCBsYXRlbmN5X3dhdGVybWFya19iID0gMDsKIAl1MzIgcHJpb3JpdHlfYV9t YXJrID0gMCwgcHJpb3JpdHlfYl9tYXJrID0gMDsKQEAgLTIyODQsOCArMjI4NCw4IEBAIHN0YXRp YyB2b2lkIGRjZTZfcHJvZ3JhbV93YXRlcm1hcmtzKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2 LAogCWZpeGVkMjBfMTIgYSwgYiwgYzsKIAogCWlmIChyYWRlb25fY3J0Yy0+YmFzZS5lbmFibGVk ICYmIG51bV9oZWFkcyAmJiBtb2RlKSB7Ci0JCXBpeGVsX3BlcmlvZCA9IDEwMDAwMDAgLyAodTMy KW1vZGUtPmNsb2NrOwotCQlsaW5lX3RpbWUgPSBtaW4oKHUzMiltb2RlLT5jcnRjX2h0b3RhbCAq IHBpeGVsX3BlcmlvZCwgKHUzMik2NTUzNSk7CisJCWFjdGl2ZV90aW1lID0gMTAwMDAwMFVMICog KHUzMiltb2RlLT5jcnRjX2hkaXNwbGF5IC8gKHUzMiltb2RlLT5jbG9jazsKKwkJbGluZV90aW1l ID0gbWluKCh1MzIpICgxMDAwMDAwVUwgKiAodTMyKW1vZGUtPmNydGNfaHRvdGFsIC8gKHUzMilt b2RlLT5jbG9jayksICh1MzIpNjU1MzUpOwogCQlwcmlvcml0eV9hX2NudCA9IDA7CiAJCXByaW9y aXR5X2JfY250ID0gMDsKIApAQCAtMjMwNyw3ICsyMzA3LDcgQEAgc3RhdGljIHZvaWQgZGNlNl9w cm9ncmFtX3dhdGVybWFya3Moc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAKIAkJd21faGln aC5kaXNwX2NsayA9IG1vZGUtPmNsb2NrOwogCQl3bV9oaWdoLnNyY193aWR0aCA9IG1vZGUtPmNy dGNfaGRpc3BsYXk7Ci0JCXdtX2hpZ2guYWN0aXZlX3RpbWUgPSBtb2RlLT5jcnRjX2hkaXNwbGF5 ICogcGl4ZWxfcGVyaW9kOworCQl3bV9oaWdoLmFjdGl2ZV90aW1lID0gYWN0aXZlX3RpbWU7CiAJ CXdtX2hpZ2guYmxhbmtfdGltZSA9IGxpbmVfdGltZSAtIHdtX2hpZ2guYWN0aXZlX3RpbWU7CiAJ CXdtX2hpZ2guaW50ZXJsYWNlZCA9IGZhbHNlOwogCQlpZiAobW9kZS0+ZmxhZ3MgJiBEUk1fTU9E RV9GTEFHX0lOVEVSTEFDRSkKQEAgLTIzMzQsNyArMjMzNCw3IEBAIHN0YXRpYyB2b2lkIGRjZTZf cHJvZ3JhbV93YXRlcm1hcmtzKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAogCiAJCXdtX2xv dy5kaXNwX2NsayA9IG1vZGUtPmNsb2NrOwogCQl3bV9sb3cuc3JjX3dpZHRoID0gbW9kZS0+Y3J0 Y19oZGlzcGxheTsKLQkJd21fbG93LmFjdGl2ZV90aW1lID0gbW9kZS0+Y3J0Y19oZGlzcGxheSAq IHBpeGVsX3BlcmlvZDsKKwkJd21fbG93LmFjdGl2ZV90aW1lID0gYWN0aXZlX3RpbWU7CiAJCXdt X2xvdy5ibGFua190aW1lID0gbGluZV90aW1lIC0gd21fbG93LmFjdGl2ZV90aW1lOwogCQl3bV9s b3cuaW50ZXJsYWNlZCA9IGZhbHNlOwogCQlpZiAobW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFH X0lOVEVSTEFDRSkKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK