From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 40/42] drm/i915: Move cdclk and pll setup to
	intel_modeset_compute_config()
Date: Mon, 11 May 2015 16:25:16 +0200
Message-ID: <1431354318-11995-41-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.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 mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTP id 46CC96E3F7
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 May 2015 07:25:46 -0700 (PDT)
In-Reply-To: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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

RnJvbTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xp
dmVpcmFAaW50ZWwuY29tPgoKSXQgbWFrZXMgbW9yZSBzZW5zZSB0aGVyZSwgc2luY2UgdGhlc2Ug
YXJlIGNvbXB1dGF0aW9uIHN0ZXBzIHRoYXQgY2FuCmZhaWwuCgpTaWduZWQtb2ZmLWJ5OiBNYWFy
dGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDcwICsrKysrKysrKysrKysrKysr
Ky0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDM1
IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA0NTAz
MTQwMDhlZGIuLjlhMTlkODhjYjVjZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YwpAQCAtMTE5NjMsMzcgKzExOTYzLDYgQEAgc3RhdGljIHZvaWQgdXBkYXRlX3NjYW5saW5lX29m
ZnNldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJY3J0Yy0+c2NhbmxpbmVfb2Zmc2V0ID0g
MTsKIH0KIAotc3RhdGljIGludAotaW50ZWxfbW9kZXNldF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3Qg
ZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCi17Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRjOwotCXN0
cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKLQlpbnQgcmV0LCBpOwotCi0JcmV0ID0g
ZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfbW9kZXNldChzdGF0ZS0+ZGV2LCBzdGF0ZSk7Ci0JaWYg
KHJldCkKLQkJcmV0dXJuIHJldDsKLQotCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNy
dGMsIGNydGNfc3RhdGUsIGkpIHsKLQkJaWYgKCFjcnRjX3N0YXRlLT5lbmFibGUgJiYKLQkJICAg
IFdBUk5fT04oY3J0Y19zdGF0ZS0+YWN0aXZlKSkKLQkJCWNydGNfc3RhdGUtPmFjdGl2ZSA9IGZh
bHNlOwotCi0JCWlmICghY3J0Y19zdGF0ZS0+YWN0aXZlKQotCQkJY29udGludWU7Ci0KLQkJcmV0
ID0gaW50ZWxfbW9kZXNldF9waXBlX2NvbmZpZyhjcnRjLCBzdGF0ZSk7Ci0JCWlmIChyZXQpCi0J
CQlyZXR1cm4gcmV0OwotCi0JCWludGVsX2R1bXBfcGlwZV9jb25maWcodG9faW50ZWxfY3J0Yyhj
cnRjKSwKLQkJCQkgICAgICAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKSwKLQkJCQkg
ICAgICAgIlttb2Rlc2V0XSIpOwotCX0KLQotCXJldHVybiBkcm1fYXRvbWljX2hlbHBlcl9jaGVj
a19wbGFuZXMoc3RhdGUtPmRldiwgc3RhdGUpOwotfQotCiBzdGF0aWMgaW50IF9faW50ZWxfc2V0
X21vZGVfc2V0dXBfcGxscyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiB7CiAJc3Ry
dWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7CkBAIC0xMjIzOCw2ICsxMjIwNyw0MSBA
QCBzdGF0aWMgdm9pZCBfX2ludGVsX3NldF9tb2RlX2NsZWFudXBfcGxhbmVzKHN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYsCiAJZHJtX2F0b21pY19oZWxwZXJfY2xlYW51cF9wbGFuZXMoZGV2LCBvbGRf
c3RhdGUpOwogfQogCitzdGF0aWMgaW50CitpbnRlbF9tb2Rlc2V0X2NvbXB1dGVfY29uZmlnKHN0
cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKK3sKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7
CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOworCWludCByZXQsIGk7CisKKwly
ZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19tb2Rlc2V0KHN0YXRlLT5kZXYsIHN0YXRlKTsK
KwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0
ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCQlpZiAoIWNydGNfc3RhdGUtPmVuYWJsZSAmJgor
CQkgICAgV0FSTl9PTihjcnRjX3N0YXRlLT5hY3RpdmUpKQorCQkJY3J0Y19zdGF0ZS0+YWN0aXZl
ID0gZmFsc2U7CisKKwkJaWYgKCFjcnRjX3N0YXRlLT5hY3RpdmUpCisJCQljb250aW51ZTsKKwor
CQlyZXQgPSBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmlnKGNydGMsIHN0YXRlKTsKKwkJaWYgKHJl
dCkKKwkJCXJldHVybiByZXQ7CisKKwkJaW50ZWxfZHVtcF9waXBlX2NvbmZpZyh0b19pbnRlbF9j
cnRjKGNydGMpLAorCQkJCSAgICAgICB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpLAor
CQkJCSAgICAgICAiW21vZGVzZXRdIik7CisJfQorCisJcmV0ID0gZHJtX2F0b21pY19oZWxwZXJf
Y2hlY2tfcGxhbmVzKHN0YXRlLT5kZXYsIHN0YXRlKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0
OworCisJcmV0dXJuIF9faW50ZWxfc2V0X21vZGVfY2hlY2tzKHN0YXRlKTsKK30KKwogc3RhdGlj
IGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsK
IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKQEAgLTEyMjQ3LDEwICsxMjI1
MSw2IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0
ZSAqc3RhdGUpCiAJaW50IHJldDsKIAlpbnQgaTsKIAotCXJldCA9IF9faW50ZWxfc2V0X21vZGVf
Y2hlY2tzKHN0YXRlKTsKLQlpZiAocmV0IDwgMCkKLQkJcmV0dXJuIHJldDsKLQogCXJldCA9IGRy
bV9hdG9taWNfaGVscGVyX3ByZXBhcmVfcGxhbmVzKGRldiwgc3RhdGUpOwogCWlmIChyZXQpCiAJ
CXJldHVybiByZXQ7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m
by9pbnRlbC1nZngK