From: Sasha Levin Subject: [PATCH AUTOSEL 5.3 31/87] drm/amd/display: Fix frames_to_insert math Date: Tue, 24 Sep 2019 12:40:47 -0400 Message-ID: <20190924164144.25591-31-sashal@kernel.org> References: <20190924164144.25591-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190924164144.25591-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@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: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , Aric Cyr , Leo Li , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Alex Deucher , Bayan Zabihiyan RnJvbTogQmF5YW4gWmFiaWhpeWFuIDxiYXlhbi56YWJpaGl5YW5AYW1kLmNvbT4KClsgVXBzdHJl YW0gY29tbWl0IGE0NjNiMjYzMDMyZjdjOThjNTkxMjIwN2RiNDNiZTFhYTM0YTY0MzggXQoKW1do eV0KVGhlIG1hdGggb24gZGVjaWRpbmcgb24gaG93IG1hbnkKImZyYW1lcyB0byBpbnNlcnQiIHNv bWV0aW1lcyBzZW50IHVzIG92ZXIgdGhlIG1heCByZWZyZXNoIHJhdGUuCkFsc28gaW50ZWdlciBv dmVyZmxvdyBjYW4gb2NjdXIgaWYgd2UgaGF2ZSBoaWdoIHJlZnJlc2ggcmF0ZXMuCgpbSG93XQpJ bnN0ZWFkIG9mIGNsaXBwaW5nIHRoZSAgZnJhbWUgZHVyYXRpb24gc3VjaCB0aGF0IGl0IGRvZXNu 4oCZdCBnbyBiZWxvdyB0aGUgbWluLApqdXN0IHJlbW92ZSBhIGZyYW1lIGZyb20gdGhlIG51bWJl ciBvZiBmcmFtZXMgdG8gaW5zZXJ0LiArClVzZSB1bnNpZ25lZCBsb25nIGxvbmcgZm9yIGludGVy bWVkaWF0ZSBjYWxjdWxhdGlvbnMgdG8gcHJldmVudAppbnRlZ2VyIG92ZXJmbG93LgoKU2lnbmVk LW9mZi1ieTogQmF5YW4gWmFiaWhpeWFuIDxiYXlhbi56YWJpaGl5YW5AYW1kLmNvbT4KUmV2aWV3 ZWQtYnk6IEFyaWMgQ3lyIDxBcmljLkN5ckBhbWQuY29tPgpBY2tlZC1ieTogTGVvIExpIDxzdW5w ZW5nLmxpQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRl dWNoZXJAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwu b3JnPgotLS0KIC4uLi9hbWQvZGlzcGxheS9tb2R1bGVzL2ZyZWVzeW5jL2ZyZWVzeW5jLmMgICB8 IDI3ICsrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCsp LCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvbW9kdWxlcy9mcmVlc3luYy9mcmVlc3luYy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L21vZHVsZXMvZnJlZXN5bmMvZnJlZXN5bmMuYwppbmRleCA3YzIwMTcxYTNiNmRhLi5hNTM2 NjZmZjZjZjg5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvbW9kdWxl cy9mcmVlc3luYy9mcmVlc3luYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9t b2R1bGVzL2ZyZWVzeW5jL2ZyZWVzeW5jLmMKQEAgLTQzNSw2ICs0MzUsMTIgQEAgc3RhdGljIHZv aWQgYXBwbHlfYmVsb3dfdGhlX3JhbmdlKHN0cnVjdCBjb3JlX2ZyZWVzeW5jICpjb3JlX2ZyZWVz eW5jLAogCQkvKiBFaXRoZXIgd2UndmUgY2FsY3VsYXRlZCB0aGUgbnVtYmVyIG9mIGZyYW1lcyB0 byBpbnNlcnQsCiAJCSAqIG9yIHdlIG5lZWQgdG8gaW5zZXJ0IG1pbiBkdXJhdGlvbiBmcmFtZXMK IAkJICovCisJCWlmIChsYXN0X3JlbmRlcl90aW1lX2luX3VzIC8gZnJhbWVzX3RvX2luc2VydCA8 CisJCQkJaW5fb3V0X3Zyci0+bWluX2R1cmF0aW9uX2luX3VzKXsKKwkJCWZyYW1lc190b19pbnNl cnQgLT0gKGZyYW1lc190b19pbnNlcnQgPiAxKSA/CisJCQkJCTEgOiAwOworCQl9CisKIAkJaWYg KGZyYW1lc190b19pbnNlcnQgPiAwKQogCQkJaW5zZXJ0ZWRfZnJhbWVfZHVyYXRpb25faW5fdXMg PSBsYXN0X3JlbmRlcl90aW1lX2luX3VzIC8KIAkJCQkJCQlmcmFtZXNfdG9faW5zZXJ0OwpAQCAt ODg3LDggKzg5Myw4IEBAIHZvaWQgbW9kX2ZyZWVzeW5jX2J1aWxkX3Zycl9wYXJhbXMoc3RydWN0 IG1vZF9mcmVlc3luYyAqbW9kX2ZyZWVzeW5jLAogCXN0cnVjdCBjb3JlX2ZyZWVzeW5jICpjb3Jl X2ZyZWVzeW5jID0gTlVMTDsKIAl1bnNpZ25lZCBsb25nIGxvbmcgbm9taW5hbF9maWVsZF9yYXRl X2luX3VoeiA9IDA7CiAJdW5zaWduZWQgaW50IHJlZnJlc2hfcmFuZ2UgPSAwOwotCXVuc2lnbmVk IGludCBtaW5fcmVmcmVzaF9pbl91aHogPSAwOwotCXVuc2lnbmVkIGludCBtYXhfcmVmcmVzaF9p bl91aHogPSAwOworCXVuc2lnbmVkIGxvbmcgbG9uZyBtaW5fcmVmcmVzaF9pbl91aHogPSAwOwor CXVuc2lnbmVkIGxvbmcgbG9uZyBtYXhfcmVmcmVzaF9pbl91aHogPSAwOwogCiAJaWYgKG1vZF9m cmVlc3luYyA9PSBOVUxMKQogCQlyZXR1cm47CkBAIC05MTUsNyArOTIxLDcgQEAgdm9pZCBtb2Rf ZnJlZXN5bmNfYnVpbGRfdnJyX3BhcmFtcyhzdHJ1Y3QgbW9kX2ZyZWVzeW5jICptb2RfZnJlZXN5 bmMsCiAJCW1pbl9yZWZyZXNoX2luX3VoeiA9IG5vbWluYWxfZmllbGRfcmF0ZV9pbl91aHo7CiAK IAlpZiAoIXZycl9zZXR0aW5nc19yZXF1aXJlX3VwZGF0ZShjb3JlX2ZyZWVzeW5jLAotCQkJaW5f Y29uZmlnLCBtaW5fcmVmcmVzaF9pbl91aHosIG1heF9yZWZyZXNoX2luX3VoeiwKKwkJCWluX2Nv bmZpZywgKHVuc2lnbmVkIGludCltaW5fcmVmcmVzaF9pbl91aHosICh1bnNpZ25lZCBpbnQpbWF4 X3JlZnJlc2hfaW5fdWh6LAogCQkJaW5fb3V0X3ZycikpCiAJCXJldHVybjsKIApAQCAtOTMxLDE1 ICs5MzcsMTUgQEAgdm9pZCBtb2RfZnJlZXN5bmNfYnVpbGRfdnJyX3BhcmFtcyhzdHJ1Y3QgbW9k X2ZyZWVzeW5jICptb2RfZnJlZXN5bmMsCiAJCXJldHVybjsKIAogCX0gZWxzZSB7Ci0JCWluX291 dF92cnItPm1pbl9yZWZyZXNoX2luX3VoeiA9IG1pbl9yZWZyZXNoX2luX3VoejsKKwkJaW5fb3V0 X3Zyci0+bWluX3JlZnJlc2hfaW5fdWh6ID0gKHVuc2lnbmVkIGludCltaW5fcmVmcmVzaF9pbl91 aHo7CiAJCWluX291dF92cnItPm1heF9kdXJhdGlvbl9pbl91cyA9CiAJCQkJY2FsY19kdXJhdGlv bl9pbl91c19mcm9tX3JlZnJlc2hfaW5fdWh6KAotCQkJCQkJbWluX3JlZnJlc2hfaW5fdWh6KTsK KwkJCQkJCSh1bnNpZ25lZCBpbnQpbWluX3JlZnJlc2hfaW5fdWh6KTsKIAotCQlpbl9vdXRfdnJy LT5tYXhfcmVmcmVzaF9pbl91aHogPSBtYXhfcmVmcmVzaF9pbl91aHo7CisJCWluX291dF92cnIt Pm1heF9yZWZyZXNoX2luX3VoeiA9ICh1bnNpZ25lZCBpbnQpbWF4X3JlZnJlc2hfaW5fdWh6Owog CQlpbl9vdXRfdnJyLT5taW5fZHVyYXRpb25faW5fdXMgPQogCQkJCWNhbGNfZHVyYXRpb25faW5f dXNfZnJvbV9yZWZyZXNoX2luX3VoeigKLQkJCQkJCW1heF9yZWZyZXNoX2luX3Voeik7CisJCQkJ CQkodW5zaWduZWQgaW50KW1heF9yZWZyZXNoX2luX3Voeik7CiAKIAkJcmVmcmVzaF9yYW5nZSA9 IGluX291dF92cnItPm1heF9yZWZyZXNoX2luX3VoeiAtCiAJCQkJaW5fb3V0X3Zyci0+bWluX3Jl ZnJlc2hfaW5fdWh6OwpAQCAtOTUwLDE3ICs5NTYsMTggQEAgdm9pZCBtb2RfZnJlZXN5bmNfYnVp bGRfdnJyX3BhcmFtcyhzdHJ1Y3QgbW9kX2ZyZWVzeW5jICptb2RfZnJlZXN5bmMsCiAJaW5fb3V0 X3Zyci0+Zml4ZWQucmFtcGluZ19hY3RpdmUgPSBpbl9jb25maWctPnJhbXBpbmc7CiAKIAlpbl9v dXRfdnJyLT5idHIuYnRyX2VuYWJsZWQgPSBpbl9jb25maWctPmJ0cjsKKwogCWlmIChpbl9vdXRf dnJyLT5tYXhfcmVmcmVzaF9pbl91aHogPAogCQkJMiAqIGluX291dF92cnItPm1pbl9yZWZyZXNo X2luX3VoeikKIAkJaW5fb3V0X3Zyci0+YnRyLmJ0cl9lbmFibGVkID0gZmFsc2U7CisKIAlpbl9v dXRfdnJyLT5idHIuYnRyX2FjdGl2ZSA9IGZhbHNlOwogCWluX291dF92cnItPmJ0ci5pbnNlcnRl ZF9kdXJhdGlvbl9pbl91cyA9IDA7CiAJaW5fb3V0X3Zyci0+YnRyLmZyYW1lc190b19pbnNlcnQg PSAwOwogCWluX291dF92cnItPmJ0ci5mcmFtZV9jb3VudGVyID0gMDsKIAlpbl9vdXRfdnJyLT5i dHIubWlkX3BvaW50X2luX3VzID0KLQkJCWluX291dF92cnItPm1pbl9kdXJhdGlvbl9pbl91cyAr Ci0JCQkJKGluX291dF92cnItPm1heF9kdXJhdGlvbl9pbl91cyAtCi0JCQkJaW5fb3V0X3Zyci0+ bWluX2R1cmF0aW9uX2luX3VzKSAvIDI7CisJCQkJKGluX291dF92cnItPm1pbl9kdXJhdGlvbl9p bl91cyArCisJCQkJIGluX291dF92cnItPm1heF9kdXJhdGlvbl9pbl91cykgLyAyOwogCiAJaWYg KGluX291dF92cnItPnN0YXRlID09IFZSUl9TVEFURV9VTlNVUFBPUlRFRCkgewogCQlpbl9vdXRf dnJyLT5hZGp1c3Qudl90b3RhbF9taW4gPSBzdHJlYW0tPnRpbWluZy52X3RvdGFsOwotLSAKMi4y MC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQt Z2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZng=