From: Harry Wentland Subject: [PATCH 02/14] drm/amd/display: minor clock source refactor Date: Fri, 23 Dec 2016 10:57:54 -0500 Message-ID: <20161223155806.12043-3-harry.wentland@amd.com> References: <20161223155806.12043-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: <20161223155806.12043-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: Dmytro Laktyushkin RnJvbTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4KClRo aXMgc2hvdWxkIG1ha2UgaXQgZWFzaWVyIHRvIHNoYXJlIGNvZGUgd2l0aCBuZXdlciBBU0lDcwoK Q2hhbmdlLUlkOiBJNjE1YzU3NzQyNTcxMjUzODM0MzliZDI3MDYwZWFiOWRiMjA1Y2M5NQpTaWdu ZWQtb2ZmLWJ5OiBEbXl0cm8gTGFrdHl1c2hraW4gPERteXRyby5MYWt0eXVzaGtpbkBhbWQuY29t PgpSZXZpZXdlZC1ieTogVG9ueSBDaGVuZyA8VG9ueS5DaGVuZ0BhbWQuY29tPgpBY2tlZC1ieTog SGFycnkgV2VudGxhbmQgPEhhcnJ5LldlbnRsYW5kQGFtZC5jb20+Ci0tLQogLi4uL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9jbG9ja19zb3VyY2UuYyAgfCA2OCArKysrKysrKysrKy0t LS0tLS0tLS0tCiAuLi4vZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2Nsb2NrX3NvdXJj ZS5oICB8ICA5ICsrLQogMiBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCAzNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNl L2RjZV9jbG9ja19zb3VyY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2Uv ZGNlX2Nsb2NrX3NvdXJjZS5jCmluZGV4IDNkMWMzMjEyMmQ2OS4uYTM4MTcyYmRjYjVlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9jbG9ja19zb3Vy Y2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9jbG9ja19z b3VyY2UuYwpAQCAtNDY1LDcgKzQ2NSw2IEBAIHN0YXRpYyB1aW50MzJfdCBkY2UxMTBfZ2V0X3Bp eF9jbGtfZGl2aWRlcnNfaGVscGVyICgKIAkJc3RydWN0IHBsbF9zZXR0aW5ncyAqcGxsX3NldHRp bmdzLAogCQlzdHJ1Y3QgcGl4ZWxfY2xrX3BhcmFtcyAqcGl4X2Nsa19wYXJhbXMpCiB7Ci0JdWlu dDMyX3QgdmFsdWUgPSAwOwogCXVpbnQzMl90IGZpZWxkID0gMDsKIAl1aW50MzJfdCBwbGxfY2Fs Y19lcnJvciA9IE1BWF9QTExfQ0FMQ19FUlJPUjsKIApAQCAtNDczLDcgKzQ3Miw2IEBAIHN0YXRp YyB1aW50MzJfdCBkY2UxMTBfZ2V0X3BpeF9jbGtfZGl2aWRlcnNfaGVscGVyICgKIAkqIEhXIERj ZTgwIHNwZWM6CiAJKiAwMCAtIFBDSUVfUkVGQ0xLLCAwMSAtIFhUQUxJTiwgICAgMDIgLSBHRU5F UklDQSwgICAgMDMgLSBHRU5FUklDQgogCSogMDQgLSBIU1lOQ0EsICAgICAgMDUgLSBHRU5MS19D TEssIDA2IC0gUENJRV9SRUZDTEssIDA3IC0gRFZPQ0xLMCAqLwotCXZhbHVlID0gUkVHX1JFQUQo UExMX0NOVEwpOwogCVJFR19HRVQoUExMX0NOVEwsIFBMTF9SRUZfRElWX1NSQywgJmZpZWxkKTsK IAlwbGxfc2V0dGluZ3MtPnVzZV9leHRlcm5hbF9jbGsgPSAoZmllbGQgPiAxKTsKIApAQCAtODA3 LDUxICs4MDUsMzAgQEAgc3RhdGljIHZvaWQgZGNlMTEyX3Byb2dyYW1fcGl4ZWxfY2xrX3Jlc3lu YygKIH0KIAogc3RhdGljIGJvb2wgZGNlMTEwX3Byb2dyYW1fcGl4X2NsaygKLQkJc3RydWN0IGNs b2NrX3NvdXJjZSAqY2xrX3NyYywKKwkJc3RydWN0IGNsb2NrX3NvdXJjZSAqY2xvY2tfc291cmNl LAogCQlzdHJ1Y3QgcGl4ZWxfY2xrX3BhcmFtcyAqcGl4X2Nsa19wYXJhbXMsCiAJCXN0cnVjdCBw bGxfc2V0dGluZ3MgKnBsbF9zZXR0aW5ncykKIHsKLQlzdHJ1Y3QgZGNlMTEwX2Nsa19zcmMgKmRj ZTExMF9jbGtfc3JjID0gVE9fRENFMTEwX0NMS19TUkMoY2xrX3NyYyk7CisJc3RydWN0IGRjZTEx MF9jbGtfc3JjICpjbGtfc3JjID0gVE9fRENFMTEwX0NMS19TUkMoY2xvY2tfc291cmNlKTsKIAlz dHJ1Y3QgYnBfcGl4ZWxfY2xvY2tfcGFyYW1ldGVycyBicF9wY19wYXJhbXMgPSB7MH07CiAKIAkv KiBGaXJzdCBkaXNhYmxlIFNTCiAJICogQVRPTUJJT1Mgd2lsbCBlbmFibGUgYnkgZGVmYXVsdCBT UyBvbiBQTEwgZm9yIERQLAogCSAqIGRvIG5vdCBkaXNhYmxlIGl0IGhlcmUKIAkgKi8KLQlpZiAo Y2xrX3NyYy0+aWQgIT0gQ0xPQ0tfU09VUkNFX0lEX0VYVEVSTkFMICYmCisJaWYgKGNsb2NrX3Nv dXJjZS0+aWQgIT0gQ0xPQ0tfU09VUkNFX0lEX0VYVEVSTkFMICYmCiAJCQkhZGNfaXNfZHBfc2ln bmFsKHBpeF9jbGtfcGFyYW1zLT5zaWduYWxfdHlwZSkgJiYKLQkJCWNsa19zcmMtPmN0eC0+ZGNl X3ZlcnNpb24gPD0gRENFX1ZFUlNJT05fMTFfMCkKLQkJZGlzYWJsZV9zcHJlYWRfc3BlY3RydW0o ZGNlMTEwX2Nsa19zcmMpOworCQkJY2xvY2tfc291cmNlLT5jdHgtPmRjZV92ZXJzaW9uIDw9IERD RV9WRVJTSU9OXzExXzApCisJCWRpc2FibGVfc3ByZWFkX3NwZWN0cnVtKGNsa19zcmMpOwogCiAJ LypBVE9NQklPUyBleHBlY3RzIHBpeGVsIHJhdGUgYWRqdXN0ZWQgYnkgZGVlcCBjb2xvciByYXRp bykqLwogCWJwX3BjX3BhcmFtcy5jb250cm9sbGVyX2lkID0gcGl4X2Nsa19wYXJhbXMtPmNvbnRy b2xsZXJfaWQ7Ci0JYnBfcGNfcGFyYW1zLnBsbF9pZCA9IGNsa19zcmMtPmlkOworCWJwX3BjX3Bh cmFtcy5wbGxfaWQgPSBjbG9ja19zb3VyY2UtPmlkOwogCWJwX3BjX3BhcmFtcy50YXJnZXRfcGl4 ZWxfY2xvY2sgPSBwbGxfc2V0dGluZ3MtPmFjdHVhbF9waXhfY2xrOwogCWJwX3BjX3BhcmFtcy5l bmNvZGVyX29iamVjdF9pZCA9IHBpeF9jbGtfcGFyYW1zLT5lbmNvZGVyX29iamVjdF9pZDsKIAli cF9wY19wYXJhbXMuc2lnbmFsX3R5cGUgPSBwaXhfY2xrX3BhcmFtcy0+c2lnbmFsX3R5cGU7CiAK LQlzd2l0Y2ggKGNsa19zcmMtPmN0eC0+ZGNlX3ZlcnNpb24pIHsKLQljYXNlIERDRV9WRVJTSU9O XzExXzI6Ci0JCWlmIChjbGtfc3JjLT5pZCAhPSBDTE9DS19TT1VSQ0VfSURfRFBfRFRPKSB7Ci0J CQlicF9wY19wYXJhbXMuZmxhZ3MuU0VUX0dFTkxPQ0tfUkVGX0RJVl9TUkMgPQotCQkJCQkJCXBs bF9zZXR0aW5ncy0+dXNlX2V4dGVybmFsX2NsazsKLQkJCWJwX3BjX3BhcmFtcy5mbGFncy5TRVRf WFRBTElOX1JFRl9TUkMgPQotCQkJCQkJCSFwbGxfc2V0dGluZ3MtPnVzZV9leHRlcm5hbF9jbGs7 Ci0JCQlpZiAocGl4X2Nsa19wYXJhbXMtPmZsYWdzLlNVUFBPUlRfWUNCQ1I0MjApIHsKLQkJCQli cF9wY19wYXJhbXMudGFyZ2V0X3BpeGVsX2Nsb2NrID0gcGxsX3NldHRpbmdzLT5hY3R1YWxfcGl4 X2NsayAvIDI7Ci0JCQkJYnBfcGNfcGFyYW1zLmZsYWdzLlNVUFBPUlRfWVVWXzQyMCA9IDE7Ci0J CQl9Ci0JCX0KLQkJaWYgKGRjZTExMF9jbGtfc3JjLT5iaW9zLT5mdW5jcy0+c2V0X3BpeGVsX2Ns b2NrKAotCQkJCWRjZTExMF9jbGtfc3JjLT5iaW9zLCAmYnBfcGNfcGFyYW1zKSAhPSBCUF9SRVNV TFRfT0spCi0JCQlyZXR1cm4gZmFsc2U7Ci0JCS8qIFJlc3luYyBkZWVwIGNvbG9yIERUTyAqLwot CQlpZiAoY2xrX3NyYy0+aWQgIT0gQ0xPQ0tfU09VUkNFX0lEX0RQX0RUTykKLQkJCWRjZTExMl9w cm9ncmFtX3BpeGVsX2Nsa19yZXN5bmMoZGNlMTEwX2Nsa19zcmMsCi0JCQkJCQlwaXhfY2xrX3Bh cmFtcy0+c2lnbmFsX3R5cGUsCi0JCQkJCQlwaXhfY2xrX3BhcmFtcy0+Y29sb3JfZGVwdGgsCi0J CQkJCQlwaXhfY2xrX3BhcmFtcy0+ZmxhZ3MuU1VQUE9SVF9ZQ0JDUjQyMCk7Ci0JCWJyZWFrOwor CXN3aXRjaCAoY2xvY2tfc291cmNlLT5jdHgtPmRjZV92ZXJzaW9uKSB7CiAJY2FzZSBEQ0VfVkVS U0lPTl84XzA6CiAJY2FzZSBEQ0VfVkVSU0lPTl8xMF8wOgogCWNhc2UgRENFX1ZFUlNJT05fMTFf MDoKQEAgLTg2NCwyOCArODQxLDQ5IEBAIHN0YXRpYyBib29sIGRjZTExMF9wcm9ncmFtX3BpeF9j bGsoCiAJCWJwX3BjX3BhcmFtcy5mbGFncy5TRVRfRVhURVJOQUxfUkVGX0RJVl9TUkMgPQogCQkJ CQkJcGxsX3NldHRpbmdzLT51c2VfZXh0ZXJuYWxfY2xrOwogCi0JCWlmIChkY2UxMTBfY2xrX3Ny Yy0+Ymlvcy0+ZnVuY3MtPnNldF9waXhlbF9jbG9jaygKLQkJCQlkY2UxMTBfY2xrX3NyYy0+Ymlv cywgJmJwX3BjX3BhcmFtcykgIT0gQlBfUkVTVUxUX09LKQorCQlpZiAoY2xrX3NyYy0+Ymlvcy0+ ZnVuY3MtPnNldF9waXhlbF9jbG9jaygKKwkJCQljbGtfc3JjLT5iaW9zLCAmYnBfcGNfcGFyYW1z KSAhPSBCUF9SRVNVTFRfT0spCiAJCQlyZXR1cm4gZmFsc2U7CiAJCS8qIEVuYWJsZSBTUwogCQkg KiBBVE9NQklPUyB3aWxsIGVuYWJsZSBieSBkZWZhdWx0IFNTIGZvciBEUCBvbiBQTEwgKCBEUCBJ RCBjbG9jayksCiAJCSAqIGJhc2VkIG9uIEhXIGRpc3BsYXkgUExMIHRlYW0sIFNTIGNvbnRyb2wg c2V0dGluZ3Mgc2hvdWxkIGJlIHByb2dyYW1tZWQKIAkJICogZHVyaW5nIFBMTCBSZXNldCwgYnV0 IHRoZXkgZG8gbm90IGhhdmUgZWZmZWN0CiAJCSAqIHVudGlsIFNTX0VOIGlzIGFzc2VydGVkLiov Ci0JCWlmIChjbGtfc3JjLT5pZCAhPSBDTE9DS19TT1VSQ0VfSURfRVhURVJOQUwKKwkJaWYgKGNs b2NrX3NvdXJjZS0+aWQgIT0gQ0xPQ0tfU09VUkNFX0lEX0VYVEVSTkFMCiAJCQkmJiBwaXhfY2xr X3BhcmFtcy0+ZmxhZ3MuRU5BQkxFX1NTICYmICFkY19pc19kcF9zaWduYWwoCiAJCQkJCQkJcGl4 X2Nsa19wYXJhbXMtPnNpZ25hbF90eXBlKSkgewogCi0JCQlpZiAoIWVuYWJsZV9zcHJlYWRfc3Bl Y3RydW0oZGNlMTEwX2Nsa19zcmMsCisJCQlpZiAoIWVuYWJsZV9zcHJlYWRfc3BlY3RydW0oY2xr X3NyYywKIAkJCQkJCQlwaXhfY2xrX3BhcmFtcy0+c2lnbmFsX3R5cGUsCiAJCQkJCQkJcGxsX3Nl dHRpbmdzKSkKIAkJCQlyZXR1cm4gZmFsc2U7CiAJCQkvKiBSZXN5bmMgZGVlcCBjb2xvciBEVE8g Ki8KLQkJCWRjZTExMF9wcm9ncmFtX3BpeGVsX2Nsa19yZXN5bmMoZGNlMTEwX2Nsa19zcmMsCisJ CQlkY2UxMTBfcHJvZ3JhbV9waXhlbF9jbGtfcmVzeW5jKGNsa19zcmMsCiAJCQkJCQlwaXhfY2xr X3BhcmFtcy0+c2lnbmFsX3R5cGUsCiAJCQkJCQlwaXhfY2xrX3BhcmFtcy0+Y29sb3JfZGVwdGgp OwogCQl9CiAJCWJyZWFrOworCWNhc2UgRENFX1ZFUlNJT05fMTFfMjoKKwkJaWYgKGNsb2NrX3Nv dXJjZS0+aWQgIT0gQ0xPQ0tfU09VUkNFX0lEX0RQX0RUTykgeworCQkJYnBfcGNfcGFyYW1zLmZs YWdzLlNFVF9HRU5MT0NLX1JFRl9ESVZfU1JDID0KKwkJCQkJCQlwbGxfc2V0dGluZ3MtPnVzZV9l eHRlcm5hbF9jbGs7CisJCQlicF9wY19wYXJhbXMuZmxhZ3MuU0VUX1hUQUxJTl9SRUZfU1JDID0K KwkJCQkJCQkhcGxsX3NldHRpbmdzLT51c2VfZXh0ZXJuYWxfY2xrOworCQkJaWYgKHBpeF9jbGtf cGFyYW1zLT5mbGFncy5TVVBQT1JUX1lDQkNSNDIwKSB7CisJCQkJYnBfcGNfcGFyYW1zLnRhcmdl dF9waXhlbF9jbG9jayA9IHBsbF9zZXR0aW5ncy0+YWN0dWFsX3BpeF9jbGsgLyAyOworCQkJCWJw X3BjX3BhcmFtcy5mbGFncy5TVVBQT1JUX1lVVl80MjAgPSAxOworCQkJfQorCQl9CisJCWlmIChj bGtfc3JjLT5iaW9zLT5mdW5jcy0+c2V0X3BpeGVsX2Nsb2NrKAorCQkJCWNsa19zcmMtPmJpb3Ms ICZicF9wY19wYXJhbXMpICE9IEJQX1JFU1VMVF9PSykKKwkJCXJldHVybiBmYWxzZTsKKwkJLyog UmVzeW5jIGRlZXAgY29sb3IgRFRPICovCisJCWlmIChjbG9ja19zb3VyY2UtPmlkICE9IENMT0NL X1NPVVJDRV9JRF9EUF9EVE8pCisJCQlkY2UxMTJfcHJvZ3JhbV9waXhlbF9jbGtfcmVzeW5jKGNs a19zcmMsCisJCQkJCQlwaXhfY2xrX3BhcmFtcy0+c2lnbmFsX3R5cGUsCisJCQkJCQlwaXhfY2xr X3BhcmFtcy0+Y29sb3JfZGVwdGgsCisJCQkJCQlwaXhfY2xrX3BhcmFtcy0+ZmxhZ3MuU1VQUE9S VF9ZQ0JDUjQyMCk7CisJCWJyZWFrOwogCWRlZmF1bHQ6CiAJCWJyZWFrOwogCX0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2Nsb2NrX3NvdXJjZS5o IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfY2xvY2tfc291cmNlLmgK aW5kZXggMDY3ZTRhYzBlNjdhLi44ZWUwMDcxMmVmOGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2Nsb2NrX3NvdXJjZS5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2Nsb2NrX3NvdXJjZS5oCkBAIC00MSw2ICs0 MSw3IEBACiAjZGVmaW5lIENTX0NPTU1PTl9SRUdfTElTVF9EQ0VfMTEyKGlkKSBcCiAJCVNSSShQ SVhDTEtfUkVTWU5DX0NOVEwsIFBIWVBMTCwgaWQpCiAKKwogI2RlZmluZSBDU19TRihyZWdfbmFt ZSwgZmllbGRfbmFtZSwgcG9zdF9maXgpXAogCS5maWVsZF9uYW1lID0gcmVnX25hbWUgIyMgX18g IyMgZmllbGRfbmFtZSAjIyBwb3N0X2ZpeAogCkBAIC00OCwxMSArNDksMTEgQEAKIAlDU19TRihQ TExfQ05UTCwgUExMX1JFRl9ESVZfU1JDLCBtYXNrX3NoKSxcCiAJQ1NfU0YoUElYQ0xLMV9SRVNZ TkNfQ05UTCwgRENDR19ERUVQX0NPTE9SX0NOVEwxLCBtYXNrX3NoKSxcCiAJQ1NfU0YoUExMX1BP U1RfRElWLCBQTExfUE9TVF9ESVZfUElYQ0xLLCBtYXNrX3NoKSxcCi0JQ1NfU0YoUExMX1JFRl9E SVYsIFBMTF9SRUZfRElWLCBtYXNrX3NoKSxcCisJQ1NfU0YoUExMX1JFRl9ESVYsIFBMTF9SRUZf RElWLCBtYXNrX3NoKQogCiAjZGVmaW5lIENTX0NPTU1PTl9NQVNLX1NIX0xJU1RfRENFXzExMiht YXNrX3NoKVwKIAlDU19TRihQSFlQTExBX1BJWENMS19SRVNZTkNfQ05UTCwgUEhZUExMQV9EQ0NH X0RFRVBfQ09MT1JfQ05UTCwgbWFza19zaCksXAotCUNTX1NGKFBIWVBMTEFfUElYQ0xLX1JFU1lO Q19DTlRMLCBQSFlQTExBX1BJWENMS19ET1VCTEVfUkFURV9FTkFCTEUsIG1hc2tfc2gpLFwKKwlD U19TRihQSFlQTExBX1BJWENMS19SRVNZTkNfQ05UTCwgUEhZUExMQV9QSVhDTEtfRE9VQkxFX1JB VEVfRU5BQkxFLCBtYXNrX3NoKQogCiAjZGVmaW5lIENTX1JFR19GSUVMRF9MSVNUKHR5cGUpIFwK IAl0eXBlIFBMTF9SRUZfRElWX1NSQzsgXApAQCAtNjEsNiArNjIsNyBAQAogCXR5cGUgUEhZUExM QV9QSVhDTEtfRE9VQkxFX1JBVEVfRU5BQkxFOyBcCiAJdHlwZSBQTExfUE9TVF9ESVZfUElYQ0xL OyBcCiAJdHlwZSBQTExfUkVGX0RJVjsgXAorCXR5cGUgRFBfRFRPMF9FTkFCTEU7CiAKIHN0cnVj dCBkY2UxMTBfY2xrX3NyY19zaGlmdCB7CiAJQ1NfUkVHX0ZJRUxEX0xJU1QodWludDhfdCkKQEAg LTc0LDYgKzc2LDkgQEAgc3RydWN0IGRjZTExMF9jbGtfc3JjX3JlZ3MgewogCXVpbnQzMl90IFJF U1lOQ19DTlRMOwogCXVpbnQzMl90IFBJWENMS19SRVNZTkNfQ05UTDsKIAl1aW50MzJfdCBQTExf Q05UTDsKKwl1aW50MzJfdCBQSEFTRTsKKwl1aW50MzJfdCBNT0RVTE87CisJdWludDMyX3QgUElY RUxfUkFURV9DTlRMOwogfTsKIAogc3RydWN0IGRjZTExMF9jbGtfc3JjIHsKLS0gCjIuOS4zCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1h aWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK