From: Jani Nikula Subject: [PATCH 2/2] drm/i915/dp: use single point of truth for PPS divisor register Date: Tue, 5 Mar 2019 15:52:15 +0200 Message-ID: <20190305135215.29862-2-jani.nikula@intel.com> References: <20190305135215.29862-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 48A8289E69 for ; Tue, 5 Mar 2019 13:50:13 +0000 (UTC) In-Reply-To: <20190305135215.29862-1-jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org U2V0IHBwX2RpdiBmaWVsZCBvZiBzdHJ1Y3QgcHBzX3JlZ2lzdGVycyB0byBJTlZBTElEX01NSU9f UkVHIHdoZW4gdGhlCnJlZ2lzdGVyIGlzbid0IHRoZXJlLCBhbmQgdXNlIGk5MTVfbW1pb19yZWdf dmFsaWQoKSBpbnN0ZWFkIG9mIHJlcGVhdGluZwp0aGUgY29uZGl0aW9uIGFsbCBvdmVyIHRoZSBw bGFjZS4KClVzZSBJTlZBTElEX01NSU9fUkVHIGV4cGxpY2l0bHkgZm9yIGRvY3VtZW50YXRpb24g cHVycG9zZXMsIGV2ZW4gaWYgdGhlCnZhbHVlIGlzIHVuY2hhbmdlZCBmcm9tIDAuCgpDYzogUm9k cmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2 aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEg PGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jIHwgNzMgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMzkgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw LmMKaW5kZXggZTBmNDIxZTc2MzA1Li5mNDBiMzM0MmQ4MmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHAuYwpAQCAtOTQ5LDggKzk0OSwxMiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wcHNfZ2V0X3JlZ2lz dGVycyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCXJlZ3MtPnBwX3N0YXQgPSBQUF9TVEFU VVMocHBzX2lkeCk7CiAJcmVncy0+cHBfb24gPSBQUF9PTl9ERUxBWVMocHBzX2lkeCk7CiAJcmVn cy0+cHBfb2ZmID0gUFBfT0ZGX0RFTEFZUyhwcHNfaWR4KTsKLQlpZiAoIUlTX0dFTjlfTFAoZGV2 X3ByaXYpICYmICFIQVNfUENIX0NOUChkZXZfcHJpdikgJiYKLQkgICAgIUhBU19QQ0hfSUNQKGRl dl9wcml2KSkKKworCS8qIEN5Y2xlIGRlbGF5IG1vdmVkIGZyb20gUFBfRElWSVNPUiB0byBQUF9D T05UUk9MICovCisJaWYgKElTX0dFTjlfTFAoZGV2X3ByaXYpIHx8IEhBU19QQ0hfQ05QKGRldl9w cml2KSB8fAorCSAgICBIQVNfUENIX0lDUChkZXZfcHJpdikpCisJCXJlZ3MtPnBwX2RpdiA9IElO VkFMSURfTU1JT19SRUc7CisJZWxzZQogCQlyZWdzLT5wcF9kaXYgPSBQUF9ESVZJU09SKHBwc19p ZHgpOwogfQogCkBAIC02NDIwLDcgKzY0MjQsNyBAQCBzdGF0aWMgdm9pZAogaW50ZWxfcHBzX3Jl YWRvdXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgc3RydWN0IGVkcF9wb3dl cl9zZXEgKnNlcSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkcF90 b19pOTE1KGludGVsX2RwKTsKLQl1MzIgcHBfb24sIHBwX29mZiwgcHBfZGl2ID0gMCwgcHBfY3Rs ID0gMDsKKwl1MzIgcHBfb24sIHBwX29mZiwgcHBfY3RsOwogCXN0cnVjdCBwcHNfcmVnaXN0ZXJz IHJlZ3M7CiAKIAlpbnRlbF9wcHNfZ2V0X3JlZ2lzdGVycyhpbnRlbF9kcCwgJnJlZ3MpOwpAQCAt NjQzMywxMCArNjQzNyw2IEBAIGludGVsX3Bwc19yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAsIHN0cnVjdCBlZHBfcG93ZXJfc2VxICpzZXEpCiAKIAlwcF9vbiA9IEk5 MTVfUkVBRChyZWdzLnBwX29uKTsKIAlwcF9vZmYgPSBJOTE1X1JFQUQocmVncy5wcF9vZmYpOwot CWlmICghSVNfR0VOOV9MUChkZXZfcHJpdikgJiYgIUhBU19QQ0hfQ05QKGRldl9wcml2KSAmJgot CSAgICAhSEFTX1BDSF9JQ1AoZGV2X3ByaXYpKSB7Ci0JCXBwX2RpdiA9IEk5MTVfUkVBRChyZWdz LnBwX2Rpdik7Ci0JfQogCiAJLyogUHVsbCB0aW1pbmcgdmFsdWVzIG91dCBvZiByZWdpc3RlcnMg Ki8KIAlzZXEtPnQxX3QzID0gKHBwX29uICYgUEFORUxfUE9XRVJfVVBfREVMQVlfTUFTSykgPj4K QEAgLTY0NTEsMTMgKzY0NTEsMTcgQEAgaW50ZWxfcHBzX3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCwgc3RydWN0IGVkcF9wb3dlcl9zZXEgKnNlcSkKIAlzZXEtPnQx MCA9IChwcF9vZmYgJiBQQU5FTF9QT1dFUl9ET1dOX0RFTEFZX01BU0spID4+CiAJCSAgIFBBTkVM X1BPV0VSX0RPV05fREVMQVlfU0hJRlQ7CiAKLQlpZiAoSVNfR0VOOV9MUChkZXZfcHJpdikgfHwg SEFTX1BDSF9DTlAoZGV2X3ByaXYpIHx8Ci0JICAgIEhBU19QQ0hfSUNQKGRldl9wcml2KSkgewor CWlmIChpOTE1X21taW9fcmVnX3ZhbGlkKHJlZ3MucHBfZGl2KSkgeworCQl1MzIgcHBfZGl2Owor CisJCXBwX2RpdiA9IEk5MTVfUkVBRChyZWdzLnBwX2Rpdik7CisKKwkJc2VxLT50MTFfdDEyID0g KChwcF9kaXYgJiBQQU5FTF9QT1dFUl9DWUNMRV9ERUxBWV9NQVNLKSA+PgorCQkJCVBBTkVMX1BP V0VSX0NZQ0xFX0RFTEFZX1NISUZUKSAqIDEwMDA7CisKKwl9IGVsc2UgewogCQlzZXEtPnQxMV90 MTIgPSAoKHBwX2N0bCAmIEJYVF9QT1dFUl9DWUNMRV9ERUxBWV9NQVNLKSA+PgogCQkJCUJYVF9Q T1dFUl9DWUNMRV9ERUxBWV9TSElGVCkgKiAxMDAwOwotCX0gZWxzZSB7Ci0JCXNlcS0+dDExX3Qx MiA9ICgocHBfZGl2ICYgUEFORUxfUE9XRVJfQ1lDTEVfREVMQVlfTUFTSykgPj4KLQkJICAgICAg IFBBTkVMX1BPV0VSX0NZQ0xFX0RFTEFZX1NISUZUKSAqIDEwMDA7CiAJfQogfQogCkBAIC02NTgy LDcgKzY1ODYsNyBAQCBpbnRlbF9kcF9pbml0X3BhbmVsX3Bvd2VyX3NlcXVlbmNlcl9yZWdpc3Rl cnMoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAkJCQkJICAgICAgYm9vbCBmb3JjZV9kaXNh YmxlX3ZkZCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkcF90b19p OTE1KGludGVsX2RwKTsKLQl1MzIgcHBfb24sIHBwX29mZiwgcHBfZGl2LCBwb3J0X3NlbCA9IDA7 CisJdTMyIHBwX29uLCBwcF9vZmYsIHBvcnRfc2VsID0gMDsKIAlpbnQgZGl2ID0gZGV2X3ByaXYt PnJhd2Nsa19mcmVxIC8gMTAwMDsKIAlzdHJ1Y3QgcHBzX3JlZ2lzdGVycyByZWdzOwogCWVudW0g cG9ydCBwb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApLT5iYXNlLnBvcnQ7CkBAIC02NjIx LDE5ICs2NjI1LDYgQEAgaW50ZWxfZHBfaW5pdF9wYW5lbF9wb3dlcl9zZXF1ZW5jZXJfcmVnaXN0 ZXJzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJCShzZXEtPnQ4IDw8IFBBTkVMX0xJR0hU X09OX0RFTEFZX1NISUZUKTsKIAlwcF9vZmYgPSAoc2VxLT50OSA8PCBQQU5FTF9MSUdIVF9PRkZf REVMQVlfU0hJRlQpIHwKIAkJIChzZXEtPnQxMCA8PCBQQU5FTF9QT1dFUl9ET1dOX0RFTEFZX1NI SUZUKTsKLQkvKiBDb21wdXRlIHRoZSBkaXZpc29yIGZvciB0aGUgcHAgY2xvY2ssIHNpbXBseSBt YXRjaCB0aGUgQnNwZWMKLQkgKiBmb3JtdWxhLiAqLwotCWlmIChJU19HRU45X0xQKGRldl9wcml2 KSB8fCBIQVNfUENIX0NOUChkZXZfcHJpdikgfHwKLQkgICAgSEFTX1BDSF9JQ1AoZGV2X3ByaXYp KSB7Ci0JCXBwX2RpdiA9IEk5MTVfUkVBRChyZWdzLnBwX2N0cmwpOwotCQlwcF9kaXYgJj0gfkJY VF9QT1dFUl9DWUNMRV9ERUxBWV9NQVNLOwotCQlwcF9kaXYgfD0gKERJVl9ST1VORF9VUChzZXEt PnQxMV90MTIsIDEwMDApCi0JCQkJPDwgQlhUX1BPV0VSX0NZQ0xFX0RFTEFZX1NISUZUKTsKLQl9 IGVsc2UgewotCQlwcF9kaXYgPSAoKDEwMCAqIGRpdikvMiAtIDEpIDw8IFBQX1JFRkVSRU5DRV9E SVZJREVSX1NISUZUOwotCQlwcF9kaXYgfD0gKERJVl9ST1VORF9VUChzZXEtPnQxMV90MTIsIDEw MDApCi0JCQkJPDwgUEFORUxfUE9XRVJfQ1lDTEVfREVMQVlfU0hJRlQpOwotCX0KIAogCS8qIEhh c3dlbGwgZG9lc24ndCBoYXZlIGFueSBwb3J0IHNlbGVjdGlvbiBiaXRzIGZvciB0aGUgcGFuZWwK IAkgKiBwb3dlciBzZXF1ZW5jZXIgYW55IG1vcmUuICovCkBAIC02NjYwLDE5ICs2NjUxLDMzIEBA IGludGVsX2RwX2luaXRfcGFuZWxfcG93ZXJfc2VxdWVuY2VyX3JlZ2lzdGVycyhzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwLAogCiAJSTkxNV9XUklURShyZWdzLnBwX29uLCBwcF9vbik7CiAJSTkx NV9XUklURShyZWdzLnBwX29mZiwgcHBfb2ZmKTsKLQlpZiAoSVNfR0VOOV9MUChkZXZfcHJpdikg fHwgSEFTX1BDSF9DTlAoZGV2X3ByaXYpIHx8Ci0JICAgIEhBU19QQ0hfSUNQKGRldl9wcml2KSkK LQkJSTkxNV9XUklURShyZWdzLnBwX2N0cmwsIHBwX2Rpdik7Ci0JZWxzZQorCisJLyoKKwkgKiBD b21wdXRlIHRoZSBkaXZpc29yIGZvciB0aGUgcHAgY2xvY2ssIHNpbXBseSBtYXRjaCB0aGUgQnNw ZWMgZm9ybXVsYS4KKwkgKi8KKwlpZiAoaTkxNV9tbWlvX3JlZ192YWxpZChyZWdzLnBwX2Rpdikp IHsKKwkJdTMyIHBwX2RpdjsKKworCQlwcF9kaXYgPSAoKDEwMCAqIGRpdikgLyAyIC0gMSkgPDwg UFBfUkVGRVJFTkNFX0RJVklERVJfU0hJRlQ7CisJCXBwX2RpdiB8PSAoRElWX1JPVU5EX1VQKHNl cS0+dDExX3QxMiwgMTAwMCkgPDwKKwkJCSAgIFBBTkVMX1BPV0VSX0NZQ0xFX0RFTEFZX1NISUZU KTsKIAkJSTkxNV9XUklURShyZWdzLnBwX2RpdiwgcHBfZGl2KTsKKwl9IGVsc2UgeworCQl1MzIg cHBfY3RsOworCisJCXBwX2N0bCA9IEk5MTVfUkVBRChyZWdzLnBwX2N0cmwpOworCQlwcF9jdGwg Jj0gfkJYVF9QT1dFUl9DWUNMRV9ERUxBWV9NQVNLOworCQlwcF9jdGwgfD0gKERJVl9ST1VORF9V UChzZXEtPnQxMV90MTIsIDEwMDApIDw8CisJCQkgICBCWFRfUE9XRVJfQ1lDTEVfREVMQVlfU0hJ RlQpOworCQlJOTE1X1dSSVRFKHJlZ3MucHBfY3RybCwgcHBfY3RsKTsKKwl9CiAKIAlEUk1fREVC VUdfS01TKCJwYW5lbCBwb3dlciBzZXF1ZW5jZXIgcmVnaXN0ZXIgc2V0dGluZ3M6IFBQX09OICUj eCwgUFBfT0ZGICUjeCwgUFBfRElWICUjeFxuIiwKIAkJICAgICAgSTkxNV9SRUFEKHJlZ3MucHBf b24pLAogCQkgICAgICBJOTE1X1JFQUQocmVncy5wcF9vZmYpLAotCQkgICAgICAoSVNfR0VOOV9M UChkZXZfcHJpdikgfHwgSEFTX1BDSF9DTlAoZGV2X3ByaXYpICB8fAotCQkgICAgICAgSEFTX1BD SF9JQ1AoZGV2X3ByaXYpKSA/Ci0JCSAgICAgIChJOTE1X1JFQUQocmVncy5wcF9jdHJsKSAmIEJY VF9QT1dFUl9DWUNMRV9ERUxBWV9NQVNLKSA6Ci0JCSAgICAgIEk5MTVfUkVBRChyZWdzLnBwX2Rp dikpOworCQkgICAgICBpOTE1X21taW9fcmVnX3ZhbGlkKHJlZ3MucHBfZGl2KSA/CisJCSAgICAg IEk5MTVfUkVBRChyZWdzLnBwX2RpdikgOgorCQkgICAgICAoSTkxNV9SRUFEKHJlZ3MucHBfY3Ry bCkgJiBCWFRfUE9XRVJfQ1lDTEVfREVMQVlfTUFTSykpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRl bF9kcF9wcHNfaW5pdChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQotLSAKMi4yMC4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=