From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 1/6] drm/i915: Don't use staged config for VLV cdclk calculations Date: Thu, 2 Apr 2015 14:47:56 +0300 Message-ID: <1427975281-7688-2-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1427975281-7688-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: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 04A596E9E9 for ; Thu, 2 Apr 2015 04:48:05 -0700 (PDT) In-Reply-To: <1427975281-7688-1-git-send-email-ander.conselvan.de.oliveira@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: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org Tm93IHRoYXQgd2UgdXNlIGEgZHJtIGF0b21pYyBzdGF0ZSBmb3IgdGhlIGxlZ2FjeSBtb2Rlc2V0 LCBpdCBpcwpwb3NzaWJsZSB0byBnZXQgcmlkIG9mIHRoZSB1c2FnZSBvZiBpbnRlbF9jcnRjLT5u ZXdfY29uZmlnIGluIHRoZQpmdW5jdGlvbiBpbnRlbF9tb2RlX21heF9waXhjbGsoKS4KClNpZ25l ZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRl Lm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCA1NSArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggODRmNWI0MS4uYTZjZDhjNyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNTE2MCwzNiArNTE2MCw0OCBAQCBzdGF0aWMgaW50IHZh bGxleXZpZXdfY2FsY19jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB9 CiAKIC8qIGNvbXB1dGUgdGhlIG1heCBwaXhlbCBjbG9jayBmb3IgbmV3IGNvbmZpZ3VyYXRpb24g Ki8KLXN0YXRpYyBpbnQgaW50ZWxfbW9kZV9tYXhfcGl4Y2xrKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKK3N0YXRpYyBpbnQgaW50ZWxfbW9kZV9tYXhfcGl4Y2xrKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2 X3ByaXYtPmRldjsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKIAlzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZTsKIAlpbnQgbWF4X3BpeGNsayA9IDA7CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRl diwgaW50ZWxfY3J0YykgewotCQlpZiAoaW50ZWxfY3J0Yy0+bmV3X2VuYWJsZWQpCi0JCQltYXhf cGl4Y2xrID0gbWF4KG1heF9waXhjbGssCi0JCQkJCSBpbnRlbF9jcnRjLT5uZXdfY29uZmlnLT5i YXNlLmFkanVzdGVkX21vZGUuY3J0Y19jbG9jayk7CisJCWNydGNfc3RhdGUgPSBpbnRlbF9hdG9t aWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGludGVsX2NydGMpOworCQlpZiAoSVNfRVJSKGNydGNf c3RhdGUpKQorCQkJcmV0dXJuIFBUUl9FUlIoY3J0Y19zdGF0ZSk7CisKKwkJaWYgKCFjcnRjX3N0 YXRlLT5iYXNlLmVuYWJsZSkKKwkJCWNvbnRpbnVlOworCisJCW1heF9waXhjbGsgPSBtYXgobWF4 X3BpeGNsaywKKwkJCQkgY3J0Y19zdGF0ZS0+YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfY2xvY2sp OwogCX0KIAogCXJldHVybiBtYXhfcGl4Y2xrOwogfQogCi1zdGF0aWMgdm9pZCB2YWxsZXl2aWV3 X21vZGVzZXRfZ2xvYmFsX3BpcGVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCitzdGF0aWMgaW50 IHZhbGxleXZpZXdfbW9kZXNldF9nbG9iYWxfcGlwZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlLAogCQkJCQkgICAgdW5zaWduZWQgKnByZXBhcmVfcGlwZXMpCiB7Ci0Jc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHN0YXRlLT5kZXYpOwogCXN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjOwotCWludCBtYXhfcGl4Y2xrID0gaW50ZWxfbW9kZV9tYXhf cGl4Y2xrKGRldl9wcml2KTsKKwlpbnQgbWF4X3BpeGNsayA9IGludGVsX21vZGVfbWF4X3BpeGNs ayhzdGF0ZSk7CisKKwlpZiAobWF4X3BpeGNsayA8IDApCisJCXJldHVybiBtYXhfcGl4Y2xrOwog CiAJaWYgKHZhbGxleXZpZXdfY2FsY19jZGNsayhkZXZfcHJpdiwgbWF4X3BpeGNsaykgPT0KIAkg ICAgZGV2X3ByaXYtPnZsdl9jZGNsa19mcmVxKQotCQlyZXR1cm47CisJCXJldHVybiAwOwogCiAJ LyogZGlzYWJsZS9lbmFibGUgYWxsIGN1cnJlbnRseSBhY3RpdmUgcGlwZXMgd2hpbGUgd2UgY2hh bmdlIGNkY2xrICovCi0JZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGludGVsX2NydGMpCisJZm9y X2VhY2hfaW50ZWxfY3J0YyhzdGF0ZS0+ZGV2LCBpbnRlbF9jcnRjKQogCQlpZiAoaW50ZWxfY3J0 Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlKQogCQkJKnByZXBhcmVfcGlwZXMgfD0gKDEgPDwgaW50ZWxf Y3J0Yy0+cGlwZSk7CisKKwlyZXR1cm4gMDsKIH0KIAogc3RhdGljIHZvaWQgdmx2X3Byb2dyYW1f cGZpX2NyZWRpdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpAQCAtNTIzMiw4 ICs1MjQ0LDE4IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfbW9kZXNldF9nbG9iYWxfcmVzb3Vy Y2VzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gc3RhdGUtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwotCWludCBtYXhfcGl4Y2xrID0gaW50ZWxfbW9kZV9tYXhfcGl4 Y2xrKGRldl9wcml2KTsKLQlpbnQgcmVxX2NkY2xrID0gdmFsbGV5dmlld19jYWxjX2NkY2xrKGRl dl9wcml2LCBtYXhfcGl4Y2xrKTsKKwlpbnQgbWF4X3BpeGNsayA9IGludGVsX21vZGVfbWF4X3Bp eGNsayhzdGF0ZSk7CisJaW50IHJlcV9jZGNsazsKKworCS8qIFRoZSBvbmx5IHJlYXNvbiB0aGlz IGNhbiBmYWlsIGlzIGlmIHdlIGZhaWwgdG8gYWRkIHRoZSBjcnRjX3N0YXRlCisJICogdG8gdGhl IGF0b21pYyBzdGF0ZS4gQnV0IHRoYXQgY2FuJ3QgaGFwcGVuIHNpbmNlIHRoZSBjYWxsIHRvCisJ ICogaW50ZWxfbW9kZV9tYXhfcGl4Y2xrKCkgaW4gdmFsbGV5dmlld19tb2Rlc2V0X2dsb2JhbF9w aXBlcygpICh3aGljaAorCSAqIGNhbid0IGhhdmUgZmFpbGVkIG90aGVyd2lzZSB0aGUgbW9kZSBz ZXQgd291bGQgYmUgYWJvcnRlZCkgYWRkZWQgYWxsCisJICogdGhlIHN0YXRlcyBhbHJlYWR5LiAq LworCWlmIChXQVJOX09OKG1heF9waXhjbGsgPCAwKSkKKwkJcmV0dXJuOworCisJcmVxX2NkY2xr ID0gdmFsbGV5dmlld19jYWxjX2NkY2xrKGRldl9wcml2LCBtYXhfcGl4Y2xrKTsKIAogCWlmIChy ZXFfY2RjbGsgIT0gZGV2X3ByaXYtPnZsdl9jZGNsa19mcmVxKSB7CiAJCS8qCkBAIC0xMTU1MCw2 ICsxMTU3Miw4IEBAIGludGVsX21vZGVzZXRfY29tcHV0ZV9jb25maWcoc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCQlpZiAoSVNfRVJSKHBpcGVfY29uZmlnKSkKIAkJCXJldHVybiBwaXBlX2NvbmZp ZzsKIAorCQlwaXBlX2NvbmZpZy0+YmFzZS5lbmFibGUgPSB0cnVlOworCiAJCWludGVsX2R1bXBf cGlwZV9jb25maWcodG9faW50ZWxfY3J0YyhjcnRjKSwgcGlwZV9jb25maWcsCiAJCQkJICAgICAg ICJbbW9kZXNldF0iKTsKIAl9CkBAIC0xMTU5OCw2ICsxMTYyMiw3IEBAIHN0YXRpYyBpbnQgX19p bnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpzYXZlZF9tb2RlOwor CXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IHBpcGVfY29uZmlnLT5iYXNlLnN0YXRl OwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlX2NvcHkgPSBOVUxMOwogCXN0 cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwogCWludCByZXQgPSAwOwpAQCAtMTE2MjUsNyAr MTE2NTAsOSBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCSAqIGFkanVzdGVkX21vZGUgYml0cyBpbiB0aGUgY3J0YyBkaXJlY3RseS4KIAkgKi8K IAlpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7Ci0JCXZhbGxleXZpZXdfbW9kZXNldF9nbG9iYWxf cGlwZXMoZGV2LCAmcHJlcGFyZV9waXBlcyk7CisJCXJldCA9IHZhbGxleXZpZXdfbW9kZXNldF9n bG9iYWxfcGlwZXMoc3RhdGUsICZwcmVwYXJlX3BpcGVzKTsKKwkJaWYgKHJldCkKKwkJCWdvdG8g ZG9uZTsKIAogCQkvKiBtYXkgaGF2ZSBhZGRlZCBtb3JlIHRvIHByZXBhcmVfcGlwZXMgdGhhbiB3 ZSBzaG91bGQgKi8KIAkJcHJlcGFyZV9waXBlcyAmPSB+ZGlzYWJsZV9waXBlczsKQEAgLTExNjY5 LDcgKzExNjk2LDcgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKIAkgKiB1cGRhdGUgdGhlIHRoZSBvdXRwdXQgY29uZmlndXJhdGlvbi4gKi8KIAlp bnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGF0ZShkZXYsIHByZXBhcmVfcGlwZXMpOwogCi0JbW9kZXNl dF91cGRhdGVfY3J0Y19wb3dlcl9kb21haW5zKHBpcGVfY29uZmlnLT5iYXNlLnN0YXRlKTsKKwlt b2Rlc2V0X3VwZGF0ZV9jcnRjX3Bvd2VyX2RvbWFpbnMoc3RhdGUpOwogCiAJLyogU2V0IHVwIHRo ZSBEUExMIGFuZCBhbnkgZW5jb2RlcnMgc3RhdGUgdGhhdCBuZWVkcyB0byBhZGp1c3Qgb3IgZGVw ZW5kCiAJICogb24gdGhlIERQTEwuCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK