From: ville.syrjala@linux.intel.com Subject: [PATCH 10/14] drm/i915: Pass the cdclk state to the set_cdclk() functions Date: Mon, 19 Dec 2016 14:34:57 +0200 Message-ID: <20161219123501.3750-11-ville.syrjala@linux.intel.com> References: <20161219123501.3750-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id C3CE16E60F for ; Mon, 19 Dec 2016 12:35:42 +0000 (UTC) In-Reply-To: <20161219123501.3750-1-ville.syrjala@linux.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: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJh dGhlciB0aGFuIHBhc3NpbmcgYWxsIHRoZSBkaWZmZXJlbnQgcGFyYW1ldGVycyAoY2RjbGssdmNv IHNvCmZhcikgc3BhcmF0ZWx5IHRvIHRoZSBzZXRfY2RjbGsoKSBmdW5jdGlvbnMsIGp1c3QgcGFz cyB0aGUKZW50aXJlIGNkY2xrIHN0YXRlLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jZGNsay5jIHwgNzkgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYwppbmRleCA5NWRmZDI2MjkwNjIuLmY5MmE1NzBhZGYx YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCkBAIC00MzMsOCArNDMzLDEwIEBAIHN0 YXRpYyB2b2lkIHZsdl9wcm9ncmFtX3BmaV9jcmVkaXRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAlXQVJOX09OKEk5MTVfUkVBRChHQ0lfQ09OVFJPTCkgJiBQRklfQ1JFRElU X1JFU0VORCk7CiB9CiAKLXN0YXRpYyB2b2lkIHZsdl9zZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgY2RjbGspCitzdGF0aWMgdm9pZCB2bHZfc2V0X2NkY2xr KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgY29uc3Qgc3RydWN0IGlu dGVsX2NkY2xrX3N0YXRlICpjZGNsa19zdGF0ZSkKIHsKKwlpbnQgY2RjbGsgPSBjZGNsa19zdGF0 ZS0+Y2RjbGs7CiAJdTMyIHZhbCwgY21kOwogCiAJaWYgKGNkY2xrID49IDMyMDAwMCkgLyoganVt cCB0byBoaWdoZXN0IHZvbHRhZ2UgZm9yIDQwME1IeiB0b28gKi8KQEAgLTQ5NSw4ICs0OTcsMTAg QEAgc3RhdGljIHZvaWQgdmx2X3NldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIGludCBjZGNsaykKIAlpbnRlbF91cGRhdGVfY2RjbGsoZGV2X3ByaXYpOwogfQogCi1z dGF0aWMgdm9pZCBjaHZfc2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwgaW50IGNkY2xrKQorc3RhdGljIHZvaWQgY2h2X3NldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAq Y2RjbGtfc3RhdGUpCiB7CisJaW50IGNkY2xrID0gY2RjbGtfc3RhdGUtPmNkY2xrOwogCXUzMiB2 YWwsIGNtZDsKIAogCXN3aXRjaCAoY2RjbGspIHsKQEAgLTU2NCw4ICs1NjgsMTAgQEAgc3RhdGlj IHZvaWQgYmR3X2dldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ CWNkY2xrX3N0YXRlLT5jZGNsayA9IDY3NTAwMDsKIH0KIAotc3RhdGljIHZvaWQgYmR3X3NldF9j ZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCBjZGNsaykKK3N0YXRp YyB2b2lkIGJkd19zZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAor CQkJICBjb25zdCBzdHJ1Y3QgaW50ZWxfY2RjbGtfc3RhdGUgKmNkY2xrX3N0YXRlKQogeworCWlu dCBjZGNsayA9IGNkY2xrX3N0YXRlLT5jZGNsazsKIAl1aW50MzJfdCB2YWwsIGRhdGE7CiAJaW50 IHJldDsKIApAQCAtODM2LDggKzg0MiwxMCBAQCBzdGF0aWMgdm9pZCBza2xfZHBsbDBfZGlzYWJs ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB9CiAKIHN0YXRpYyB2b2lkIHNr bF9zZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJICBpbnQg Y2RjbGssIGludCB2Y28pCisJCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAqY2Rj bGtfc3RhdGUpCiB7CisJaW50IGNkY2xrID0gY2RjbGtfc3RhdGUtPmNkY2xrOworCWludCB2Y28g PSBjZGNsa19zdGF0ZS0+dmNvOwogCXUzMiBmcmVxX3NlbGVjdCwgcGN1X2FjazsKIAlpbnQgcmV0 OwogCkBAIC05NDIsMTIgKzk1MCwxNyBAQCBzdGF0aWMgdm9pZCBza2xfc2FuaXRpemVfY2RjbGso c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiB2b2lkIHNrbF91bmluaXRfY2Rj bGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXNrbF9zZXRfY2RjbGso ZGV2X3ByaXYsIGRldl9wcml2LT5jZGNsay5ody5yZWYsIDApOworCXN0cnVjdCBpbnRlbF9jZGNs a19zdGF0ZSBjZGNsa19zdGF0ZSA9IGRldl9wcml2LT5jZGNsay5odzsKKworCWNkY2xrX3N0YXRl LmNkY2xrID0gY2RjbGtfc3RhdGUucmVmOworCWNkY2xrX3N0YXRlLnZjbyA9IDA7CisKKwlza2xf c2V0X2NkY2xrKGRldl9wcml2LCAmY2RjbGtfc3RhdGUpOwogfQogCiB2b2lkIHNrbF9pbml0X2Nk Y2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlpbnQgY2RjbGssIHZj bzsKKwlzdHJ1Y3QgaW50ZWxfY2RjbGtfc3RhdGUgY2RjbGtfc3RhdGU7CiAKIAlza2xfc2FuaXRp emVfY2RjbGsoZGV2X3ByaXYpOwogCkBAIC05NjMsMTIgKzk3NiwxNCBAQCB2b2lkIHNrbF9pbml0 X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuOwogCX0K IAotCXZjbyA9IGRldl9wcml2LT5za2xfcHJlZmVycmVkX3Zjb19mcmVxOwotCWlmICh2Y28gPT0g MCkKLQkJdmNvID0gODEwMDAwMDsKLQljZGNsayA9IHNrbF9jYWxjX2NkY2xrKDAsIHZjbyk7CisJ Y2RjbGtfc3RhdGUgPSBkZXZfcHJpdi0+Y2RjbGsuaHc7CiAKLQlza2xfc2V0X2NkY2xrKGRldl9w cml2LCBjZGNsaywgdmNvKTsKKwljZGNsa19zdGF0ZS52Y28gPSBkZXZfcHJpdi0+c2tsX3ByZWZl cnJlZF92Y29fZnJlcTsKKwlpZiAoY2RjbGtfc3RhdGUudmNvID09IDApCisJCWNkY2xrX3N0YXRl LnZjbyA9IDgxMDAwMDA7CisJY2RjbGtfc3RhdGUuY2RjbGsgPSBza2xfY2FsY19jZGNsaygwLCBj ZGNsa19zdGF0ZS52Y28pOworCisJc2tsX3NldF9jZGNsayhkZXZfcHJpdiwgJmNkY2xrX3N0YXRl KTsKIH0KIAogc3RhdGljIGludCBieHRfY2FsY19jZGNsayhpbnQgbWF4X3BpeGNsaykKQEAgLTEx MzIsOCArMTE0NywxMCBAQCBzdGF0aWMgdm9pZCBieHRfZGVfcGxsX2VuYWJsZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCB2Y28pCiB9CiAKIHN0YXRpYyB2b2lkIGJ4dF9z ZXRfY2RjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJICBpbnQgY2Rj bGssIGludCB2Y28pCisJCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAqY2RjbGtf c3RhdGUpCiB7CisJaW50IGNkY2xrID0gY2RjbGtfc3RhdGUtPmNkY2xrOworCWludCB2Y28gPSBj ZGNsa19zdGF0ZS0+dmNvOwogCXUzMiB2YWwsIGRpdmlkZXI7CiAJaW50IHJldDsKIApAQCAtMTI1 OSw3ICsxMjc2LDcgQEAgc3RhdGljIHZvaWQgYnh0X3Nhbml0aXplX2NkY2xrKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogdm9pZCBieHRfaW5pdF9jZGNsayhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JaW50IGNkY2xrLCB2Y287CisJc3RydWN0IGlu dGVsX2NkY2xrX3N0YXRlIGNkY2xrX3N0YXRlOwogCiAJYnh0X3Nhbml0aXplX2NkY2xrKGRldl9w cml2KTsKIApAQCAtMTI2NywyNSArMTI4NCwzMyBAQCB2b2lkIGJ4dF9pbml0X2NkY2xrKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgICAgZGV2X3ByaXYtPmNkY2xrLmh3LnZj byAhPSAwKQogCQlyZXR1cm47CiAKKwljZGNsa19zdGF0ZSA9IGRldl9wcml2LT5jZGNsay5odzsK KwogCS8qCiAJICogRklYTUU6CiAJICogLSBUaGUgaW5pdGlhbCBDRENMSyBuZWVkcyB0byBiZSBy ZWFkIGZyb20gVkJULgogCSAqICAgTmVlZCB0byBtYWtlIHRoaXMgY2hhbmdlIGFmdGVyIFZCVCBo YXMgY2hhbmdlcyBmb3IgQlhULgogCSAqLwogCWlmIChJU19HRU1JTklMQUtFKGRldl9wcml2KSkg ewotCQljZGNsayA9IGdsa19jYWxjX2NkY2xrKDApOwotCQl2Y28gPSBnbGtfZGVfcGxsX3Zjbyhk ZXZfcHJpdiwgY2RjbGspOworCQljZGNsa19zdGF0ZS5jZGNsayA9IGdsa19jYWxjX2NkY2xrKDAp OworCQljZGNsa19zdGF0ZS52Y28gPSBnbGtfZGVfcGxsX3ZjbyhkZXZfcHJpdiwgY2RjbGtfc3Rh dGUuY2RjbGspOwogCX0gZWxzZSB7Ci0JCWNkY2xrID0gYnh0X2NhbGNfY2RjbGsoMCk7Ci0JCXZj byA9IGJ4dF9kZV9wbGxfdmNvKGRldl9wcml2LCBjZGNsayk7CisJCWNkY2xrX3N0YXRlLnJlZiA9 IGRldl9wcml2LT5jZGNsay5ody5yZWY7CisJCWNkY2xrX3N0YXRlLmNkY2xrID0gYnh0X2NhbGNf Y2RjbGsoMCk7CisJCWNkY2xrX3N0YXRlLnZjbyA9IGJ4dF9kZV9wbGxfdmNvKGRldl9wcml2LCBj ZGNsa19zdGF0ZS5jZGNsayk7CiAJfQogCi0JYnh0X3NldF9jZGNsayhkZXZfcHJpdiwgY2RjbGss IHZjbyk7CisJYnh0X3NldF9jZGNsayhkZXZfcHJpdiwgJmNkY2xrX3N0YXRlKTsKIH0KIAogdm9p ZCBieHRfdW5pbml0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK LQlieHRfc2V0X2NkY2xrKGRldl9wcml2LCBkZXZfcHJpdi0+Y2RjbGsuaHcucmVmLCAwKTsKKwlz dHJ1Y3QgaW50ZWxfY2RjbGtfc3RhdGUgY2RjbGtfc3RhdGUgPSBkZXZfcHJpdi0+Y2RjbGsuaHc7 CisKKwljZGNsa19zdGF0ZS5jZGNsayA9IGNkY2xrX3N0YXRlLnJlZjsKKwljZGNsa19zdGF0ZS52 Y28gPSAwOworCisJYnh0X3NldF9jZGNsayhkZXZfcHJpdiwgJmNkY2xrX3N0YXRlKTsKIH0KIAog Ym9vbCBpbnRlbF9jZGNsa19zdGF0ZV9jb21wYXJlKHN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSAq YSwKQEAgLTEzOTMsNyArMTQxOCw2IEBAIHN0YXRpYyB2b2lkIHZsdl9tb2Rlc2V0X2NvbW1pdF9j ZGNsayhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKQogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUob2xkX3N0YXRlLT5kZXYpOwogCXN0cnVjdCBp bnRlbF9hdG9taWNfc3RhdGUgKm9sZF9pbnRlbF9zdGF0ZSA9CiAJCXRvX2ludGVsX2F0b21pY19z dGF0ZShvbGRfc3RhdGUpOwotCXVuc2lnbmVkIGludCByZXFfY2RjbGsgPSBvbGRfaW50ZWxfc3Rh dGUtPmNkY2xrLmFjdHVhbC5jZGNsazsKIAogCS8qCiAJICogRklYTUU6IFdlIGNhbiBlbmQgdXAg aGVyZSB3aXRoIGFsbCBwb3dlciBkb21haW5zIG9mZiwgeWV0CkBAIC0xNDA3LDkgKzE0MzEsOSBA QCBzdGF0aWMgdm9pZCB2bHZfbW9kZXNldF9jb21taXRfY2RjbGsoc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKm9sZF9zdGF0ZSkKIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgUE9X RVJfRE9NQUlOX1BJUEVfQSk7CiAKIAlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCi0JCWNo dl9zZXRfY2RjbGsoZGV2X3ByaXYsIHJlcV9jZGNsayk7CisJCWNodl9zZXRfY2RjbGsoZGV2X3By aXYsICZvbGRfaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbCk7CiAJZWxzZQotCQl2bHZfc2V0X2Nk Y2xrKGRldl9wcml2LCByZXFfY2RjbGspOworCQl2bHZfc2V0X2NkY2xrKGRldl9wcml2LCAmb2xk X2ludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwpOwogCiAJdmx2X3Byb2dyYW1fcGZpX2NyZWRpdHMo ZGV2X3ByaXYpOwogCkBAIC0xNDU0LDkgKzE0NzgsOCBAQCBzdGF0aWMgdm9pZCBiZHdfbW9kZXNl dF9jb21taXRfY2RjbGsoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KG9sZF9zdGF0ZS0+ZGV2KTsK IAlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpvbGRfaW50ZWxfc3RhdGUgPQogCQl0b19pbnRl bF9hdG9taWNfc3RhdGUob2xkX3N0YXRlKTsKLQl1bnNpZ25lZCBpbnQgcmVxX2NkY2xrID0gb2xk X2ludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwuY2RjbGs7CiAKLQliZHdfc2V0X2NkY2xrKGRldl9w cml2LCByZXFfY2RjbGspOworCWJkd19zZXRfY2RjbGsoZGV2X3ByaXYsICZvbGRfaW50ZWxfc3Rh dGUtPmNkY2xrLmFjdHVhbCk7CiB9CiAKIHN0YXRpYyBpbnQgc2tsX21vZGVzZXRfY2FsY19jZGNs ayhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCkBAIC0xNTAzLDEwICsxNTI2LDggQEAg c3RhdGljIHZvaWQgc2tsX21vZGVzZXRfY29tbWl0X2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpvbGRfc3RhdGUpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShvbGRfc3RhdGUtPmRldik7CiAJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqaW50ZWxf c3RhdGUgPQogCQl0b19pbnRlbF9hdG9taWNfc3RhdGUob2xkX3N0YXRlKTsKLQl1bnNpZ25lZCBp bnQgcmVxX2NkY2xrID0gaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC5jZGNsazsKLQl1bnNpZ25l ZCBpbnQgcmVxX3ZjbyA9IGludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwudmNvOwogCi0Jc2tsX3Nl dF9jZGNsayhkZXZfcHJpdiwgcmVxX2NkY2xrLCByZXFfdmNvKTsKKwlza2xfc2V0X2NkY2xrKGRl dl9wcml2LCAmaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbCk7CiB9CiAKIHN0YXRpYyBpbnQgYnh0 X21vZGVzZXRfY2FsY19jZGNsayhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCkBAIC0x NTU4LDEwICsxNTc5LDggQEAgc3RhdGljIHZvaWQgYnh0X21vZGVzZXRfY29tbWl0X2NkY2xrKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShvbGRfc3RhdGUtPmRldik7CiAJc3RydWN0IGludGVsX2F0 b21pY19zdGF0ZSAqb2xkX2ludGVsX3N0YXRlID0KIAkJdG9faW50ZWxfYXRvbWljX3N0YXRlKG9s ZF9zdGF0ZSk7Ci0JdW5zaWduZWQgaW50IHJlcV9jZGNsayA9IG9sZF9pbnRlbF9zdGF0ZS0+Y2Rj bGsuYWN0dWFsLmNkY2xrOwotCXVuc2lnbmVkIGludCByZXFfdmNvID0gb2xkX2ludGVsX3N0YXRl LT5jZGNsay5hY3R1YWwudmNvOwogCi0JYnh0X3NldF9jZGNsayhkZXZfcHJpdiwgcmVxX2NkY2xr LCByZXFfdmNvKTsKKwlieHRfc2V0X2NkY2xrKGRldl9wcml2LCAmb2xkX2ludGVsX3N0YXRlLT5j ZGNsay5hY3R1YWwpOwogfQogCiBzdGF0aWMgaW50IGludGVsX2NvbXB1dGVfbWF4X2RvdGNsayhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi0tIAoyLjEwLjIKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=