From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Subject: [PATCH 11/15] drm/i915: Merge ironlake_compute_clocks()
	and ironlake_crtc_compute_clock()
Date: Mon, 21 Mar 2016 18:00:12 +0200
Message-ID: <1458576016-30348-12-git-send-email-ander.conselvan.de.oliveira@intel.com>
References: <1458576016-30348-1-git-send-email-ander.conselvan.de.oliveira@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id 4334E6E060
 for <intel-gfx@lists.freedesktop.org>; Mon, 21 Mar 2016 16:01:16 +0000 (UTC)
In-Reply-To: <1458576016-30348-1-git-send-email-ander.conselvan.de.oliveira@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

TWVyZ2UgaXJvbmxha2VfY29tcHV0ZV9jbG9ja3MoKSBpbnRvIGlyb25sYWtlX2NydGNfY29tcHV0
ZV9jbG9jaygpIHNvCnRoZSBjbG9jayBjb21wdXRhdGlvbiBsb2dpYyBpcyBhbGwgaW4gb25lIHBs
YWNlLiBUaGUgcmVzdWx0aW5nIGZ1bmN0aW9uCmlzIHN0aWxsIHF1aXRlIHNpbXBsZS4gRm9sbG93
IHVwIHBhdGNoZXMgd2lsbCBtYWtlIHRoZSBzaW1pbGFyIGNvZGUgZm9yCkdNQ0ggcGxhdGZvcm1z
IGxvb2sgc2ltaWxhci4KClNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWly
YSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA4NiArKysrKysrKysrKysrKy0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMyBpbnNlcnRpb25zKCspLCA1MyBkZWxldGlv
bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYjY1NDFhMC4uMTNi
NTA5ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtODQ4LDYgKzg0OCwx
MSBAQCBwbnZfZmluZF9iZXN0X2RwbGwoY29uc3QgaW50ZWxfbGltaXRfdCAqbGltaXQsCiAJcmV0
dXJuIChlcnIgIT0gdGFyZ2V0KTsKIH0KIAorLyoKKyAqIFJldHVybnMgYSBzZXQgb2YgZGl2aXNv
cnMgZm9yIHRoZSBkZXNpcmVkIHRhcmdldCBjbG9jayB3aXRoIHRoZSBnaXZlbgorICogcmVmY2xr
LCBvciBGQUxTRS4gIFRoZSByZXR1cm5lZCB2YWx1ZXMgcmVwcmVzZW50IHRoZSBjbG9jayBlcXVh
dGlvbjoKKyAqIHJlZmxjayAqICg1ICogKG0xICsgMikgKyAobTIgKyAyKSkgLyAobiArIDIpIC8g
cDEgLyBwMi4KKyAqLwogc3RhdGljIGJvb2wKIGc0eF9maW5kX2Jlc3RfZHBsbChjb25zdCBpbnRl
bF9saW1pdF90ICpsaW1pdCwKIAkJICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh
dGUsCkBAIC04NzU2LDU1ICs4NzYxLDYgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9zZXRfcGlwZW1p
c2Moc3RydWN0IGRybV9jcnRjICpjcnRjKQogCX0KIH0KIAotc3RhdGljIGJvb2wgaXJvbmxha2Vf
Y29tcHV0ZV9jbG9ja3Moc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkJCSAgICBzdHJ1Y3QgaW50
ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKLQkJCQkgICAgaW50ZWxfY2xvY2tfdCAqY2xvY2ss
Ci0JCQkJICAgIGJvb2wgKmhhc19yZWR1Y2VkX2Nsb2NrLAotCQkJCSAgICBpbnRlbF9jbG9ja190
ICpyZWR1Y2VkX2Nsb2NrKQotewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7
Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK
LQlpbnQgcmVmY2xrOwotCWNvbnN0IGludGVsX2xpbWl0X3QgKmxpbWl0OwotCWJvb2wgcmV0Owot
Ci0JcmVmY2xrID0gMTIwMDAwOwotCi0JaWYgKGludGVsX3BpcGVfd2lsbF9oYXZlX3R5cGUoY3J0
Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0xWRFMpKSB7Ci0JCWlmIChpbnRlbF9wYW5lbF91c2Vfc3Nj
KGRldl9wcml2KSkgewotCQkJRFJNX0RFQlVHX0tNUygidXNpbmcgU1NDIHJlZmVyZW5jZSBjbG9j
ayBvZiAlZCBrSHpcbiIsCi0JCQkJICAgICAgZGV2X3ByaXYtPnZidC5sdmRzX3NzY19mcmVxKTsK
LQkJCXJlZmNsayA9IGRldl9wcml2LT52YnQubHZkc19zc2NfZnJlcTsKLQkJfQotCi0JCWlmIChp
bnRlbF9pc19kdWFsX2xpbmtfbHZkcyhkZXYpKSB7Ci0JCQlpZiAocmVmY2xrID09IDEwMDAwMCkK
LQkJCQlsaW1pdCA9ICZpbnRlbF9saW1pdHNfaXJvbmxha2VfZHVhbF9sdmRzXzEwMG07Ci0JCQll
bHNlCi0JCQkJbGltaXQgPSAmaW50ZWxfbGltaXRzX2lyb25sYWtlX2R1YWxfbHZkczsKLQkJfSBl
bHNlIHsKLQkJCWlmIChyZWZjbGsgPT0gMTAwMDAwKQotCQkJCWxpbWl0ID0gJmludGVsX2xpbWl0
c19pcm9ubGFrZV9zaW5nbGVfbHZkc18xMDBtOwotCQkJZWxzZQotCQkJCWxpbWl0ID0gJmludGVs
X2xpbWl0c19pcm9ubGFrZV9zaW5nbGVfbHZkczsKLQkJfQotCX0gZWxzZSB7Ci0JCWxpbWl0ID0g
JmludGVsX2xpbWl0c19pcm9ubGFrZV9kYWM7Ci0JfQotCi0JLyoKLQkgKiBSZXR1cm5zIGEgc2V0
IG9mIGRpdmlzb3JzIGZvciB0aGUgZGVzaXJlZCB0YXJnZXQgY2xvY2sgd2l0aCB0aGUgZ2l2ZW4K
LQkgKiByZWZjbGssIG9yIEZBTFNFLiAgVGhlIHJldHVybmVkIHZhbHVlcyByZXByZXNlbnQgdGhl
IGNsb2NrIGVxdWF0aW9uOgotCSAqIHJlZmxjayAqICg1ICogKG0xICsgMikgKyAobTIgKyAyKSkg
LyAobiArIDIpIC8gcDEgLyBwMi4KLQkgKi8KLQlyZXQgPSBnNHhfZmluZF9iZXN0X2RwbGwobGlt
aXQsIGNydGNfc3RhdGUsIGNydGNfc3RhdGUtPnBvcnRfY2xvY2ssCi0JCQkJIHJlZmNsaywgTlVM
TCwgY2xvY2spOwotCWlmICghcmV0KQotCQlyZXR1cm4gZmFsc2U7Ci0KLQlyZXR1cm4gdHJ1ZTsK
LX0KLQogaW50IGlyb25sYWtlX2dldF9sYW5lc19yZXF1aXJlZChpbnQgdGFyZ2V0X2Nsb2NrLCBp
bnQgbGlua19idywgaW50IGJwcCkKIHsKIAkvKgpAQCAtODkyOSw5ICs4ODg1LDEzIEBAIHN0YXRp
YyB2b2lkIGlyb25sYWtlX2NvbXB1dGVfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0
YywKIHN0YXRpYyBpbnQgaXJvbmxha2VfY3J0Y19jb21wdXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9j
cnRjICpjcnRjLAogCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0
ZSkKIHsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CisJc3RydWN0
IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnRlbF9j
bG9ja190IHJlZHVjZWRfY2xvY2s7CiAJYm9vbCBoYXNfcmVkdWNlZF9jbG9jayA9IGZhbHNlOwog
CXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsOworCWNvbnN0IGludGVsX2xpbWl0X3QgKmxp
bWl0OworCWludCByZWZjbGsgPSAxMjAwMDA7CiAKIAltZW1zZXQoJmNydGNfc3RhdGUtPmRwbGxf
aHdfc3RhdGUsIDAsCiAJICAgICAgIHNpemVvZihjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlKSk7
CkBAIC04OTQyLDExICs4OTAyLDMxIEBAIHN0YXRpYyBpbnQgaXJvbmxha2VfY3J0Y19jb21wdXRl
X2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCWlmICghY3J0Y19zdGF0ZS0+aGFzX3Bj
aF9lbmNvZGVyKQogCQlyZXR1cm4gMDsKIAorCWlmIChpbnRlbF9waXBlX3dpbGxfaGF2ZV90eXBl
KGNydGNfc3RhdGUsIElOVEVMX09VVFBVVF9MVkRTKSkgeworCQlpZiAoaW50ZWxfcGFuZWxfdXNl
X3NzYyhkZXZfcHJpdikpIHsKKwkJCURSTV9ERUJVR19LTVMoInVzaW5nIFNTQyByZWZlcmVuY2Ug
Y2xvY2sgb2YgJWQga0h6XG4iLAorCQkJCSAgICAgIGRldl9wcml2LT52YnQubHZkc19zc2NfZnJl
cSk7CisJCQlyZWZjbGsgPSBkZXZfcHJpdi0+dmJ0Lmx2ZHNfc3NjX2ZyZXE7CisJCX0KKworCQlp
ZiAoaW50ZWxfaXNfZHVhbF9saW5rX2x2ZHMoZGV2KSkgeworCQkJaWYgKHJlZmNsayA9PSAxMDAw
MDApCisJCQkJbGltaXQgPSAmaW50ZWxfbGltaXRzX2lyb25sYWtlX2R1YWxfbHZkc18xMDBtOwor
CQkJZWxzZQorCQkJCWxpbWl0ID0gJmludGVsX2xpbWl0c19pcm9ubGFrZV9kdWFsX2x2ZHM7CisJ
CX0gZWxzZSB7CisJCQlpZiAocmVmY2xrID09IDEwMDAwMCkKKwkJCQlsaW1pdCA9ICZpbnRlbF9s
aW1pdHNfaXJvbmxha2Vfc2luZ2xlX2x2ZHNfMTAwbTsKKwkJCWVsc2UKKwkJCQlsaW1pdCA9ICZp
bnRlbF9saW1pdHNfaXJvbmxha2Vfc2luZ2xlX2x2ZHM7CisJCX0KKwl9IGVsc2UgeworCQlsaW1p
dCA9ICZpbnRlbF9saW1pdHNfaXJvbmxha2VfZGFjOworCX0KKwogCWlmICghY3J0Y19zdGF0ZS0+
Y2xvY2tfc2V0ICYmCi0JICAgICFpcm9ubGFrZV9jb21wdXRlX2Nsb2NrcygmY3J0Yy0+YmFzZSwg
Y3J0Y19zdGF0ZSwKLQkJCQkgICAgICZjcnRjX3N0YXRlLT5kcGxsLAotCQkJCSAgICAgJmhhc19y
ZWR1Y2VkX2Nsb2NrLAotCQkJCSAgICAgJnJlZHVjZWRfY2xvY2spKSB7CisJICAgICFnNHhfZmlu
ZF9iZXN0X2RwbGwobGltaXQsIGNydGNfc3RhdGUsIGNydGNfc3RhdGUtPnBvcnRfY2xvY2ssCisJ
CQkJcmVmY2xrLCBOVUxMLCAmY3J0Y19zdGF0ZS0+ZHBsbCkpIHsKIAkJRFJNX0VSUk9SKCJDb3Vs
ZG4ndCBmaW5kIFBMTCBzZXR0aW5ncyBmb3IgbW9kZSFcbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsK
IAl9Ci0tIAoyLjQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au
b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt
Z2Z4Cg==