From: ville.syrjala@linux.intel.com Subject: [PATCH 13/14] drm/i915: Replace the .modeset_commit_cdclk() hook with a more direct .set_cdclk() hook Date: Mon, 19 Dec 2016 14:35:00 +0200 Message-ID: <20161219123501.3750-14-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4D3E06E5F8 for ; Mon, 19 Dec 2016 12:36:08 +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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldp dGggdGhlIGNkY2xrIHN0YXRlLCBhbGwgdGhlIC5tb2Rlc2V0X2NvbW1pdF9jZGNsaygpIGhvb2tz IGFyZQpub3cgcG9pbnRsZXNzIHdyYXBwZXJzLiBHZXQgcmlkIG9mIHRoZSBleHRyYSBpbmRpcmVj dGlvbiBhbmQganVzdAp1c2Ugc2V0X2NkY2xrIGZ1bmN0aW9uIGRpcmVjdGx5LgoKU2lnbmVkLW9m Zi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgMyArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYyAgIHwgNTcgKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgNSAr Ky0tCiAzIGZpbGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDUxIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGI1YThkMGY0Y2ZiZC4uZmFmNzUzNTcwYTlhIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTYxNCw2ICs2MTQsOCBAQCBzdHJ1Y3QgaW50ZWxf Y2RjbGtfc3RhdGU7CiBzdHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJdm9pZCAoKmdl dF9jZGNsaykoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICBzdHJ1Y3Qg aW50ZWxfY2RjbGtfc3RhdGUgKmNkY2xrX3N0YXRlKTsKKwl2b2lkICgqc2V0X2NkY2xrKShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9j ZGNsa19zdGF0ZSAqY2RjbGtfc3RhdGUpOwogCWludCAoKmdldF9maWZvX3NpemUpKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHBsYW5lKTsKIAlpbnQgKCpjb21wdXRlX3Bp cGVfd20pKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpOwogCWludCAoKmNvbXB1dGVf aW50ZXJtZWRpYXRlX3dtKShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LApAQCAtNjI4LDcgKzYzMCw2 IEBAIHN0cnVjdCBkcm1faTkxNV9kaXNwbGF5X2Z1bmNzIHsKIAlpbnQgKCpjb21wdXRlX2dsb2Jh bF93YXRlcm1hcmtzKShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwogCXZvaWQgKCp1 cGRhdGVfd20pKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKIAlpbnQgKCptb2Rlc2V0X2NhbGNf Y2RjbGspKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7Ci0Jdm9pZCAoKm1vZGVzZXRf Y29tbWl0X2NkY2xrKShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwogCS8qIFJldHVy bnMgdGhlIGFjdGl2ZSBzdGF0ZSBvZiB0aGUgY3J0YywgYW5kIGlmIHRoZSBjcnRjIGlzIGFjdGl2 ZSwKIAkgKiBmaWxscyBvdXQgdGhlIHBpcGUtY29uZmlnIHdpdGggdGhlIGh3IHN0YXRlLiAqLwog CWJvb2wgKCpnZXRfcGlwZV9jb25maWcpKHN0cnVjdCBpbnRlbF9jcnRjICosCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfY2RjbGsuYwppbmRleCAwYTkxNzVlYjc3MTguLmVkNGJmZWUxMWEwOCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCkBAIC0xNDE3LDE4ICsxNDE3LDYgQEAgc3RhdGljIGlu dCB2bHZfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK IAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgdmx2X21vZGVzZXRfY29tbWl0X2NkY2xrKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShvbGRfc3RhdGUtPmRldik7Ci0Jc3RydWN0IGludGVs X2F0b21pY19zdGF0ZSAqb2xkX2ludGVsX3N0YXRlID0KLQkJdG9faW50ZWxfYXRvbWljX3N0YXRl KG9sZF9zdGF0ZSk7Ci0KLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCi0JCWNodl9zZXRf Y2RjbGsoZGV2X3ByaXYsICZvbGRfaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbCk7Ci0JZWxzZQot CQl2bHZfc2V0X2NkY2xrKGRldl9wcml2LCAmb2xkX2ludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwp OwotfQotCiBzdGF0aWMgaW50IGJkd19tb2Rlc2V0X2NhbGNfY2RjbGsoc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoc3RhdGUtPmRldik7CkBAIC0xNDYyLDE1ICsxNDUwLDYgQEAgc3RhdGljIGludCBi ZHdfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAly ZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgYmR3X21vZGVzZXRfY29tbWl0X2NkY2xrKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShvbGRfc3RhdGUtPmRldik7Ci0Jc3RydWN0IGludGVsX2F0 b21pY19zdGF0ZSAqb2xkX2ludGVsX3N0YXRlID0KLQkJdG9faW50ZWxfYXRvbWljX3N0YXRlKG9s ZF9zdGF0ZSk7Ci0KLQliZHdfc2V0X2NkY2xrKGRldl9wcml2LCAmb2xkX2ludGVsX3N0YXRlLT5j ZGNsay5hY3R1YWwpOwotfQotCiBzdGF0aWMgaW50IHNrbF9tb2Rlc2V0X2NhbGNfY2RjbGsoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBpbnRlbF9hdG9taWNfc3Rh dGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKTsKQEAgLTE1MTAs MTUgKzE0ODksNiBAQCBzdGF0aWMgaW50IHNrbF9tb2Rlc2V0X2NhbGNfY2RjbGsoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9pZCBza2xf bW9kZXNldF9jb21taXRfY2RjbGsoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkK LXsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KG9sZF9zdGF0 ZS0+ZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICppbnRlbF9zdGF0ZSA9Ci0JCXRv X2ludGVsX2F0b21pY19zdGF0ZShvbGRfc3RhdGUpOwotCi0Jc2tsX3NldF9jZGNsayhkZXZfcHJp diwgJmludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwpOwotfQotCiBzdGF0aWMgaW50IGJ4dF9tb2Rl c2V0X2NhbGNfY2RjbGsoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoc3RhdGUtPmRldik7CkBAIC0x NTYzLDE1ICsxNTMzLDYgQEAgc3RhdGljIGludCBieHRfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQg Ynh0X21vZGVzZXRfY29tbWl0X2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3Rh dGUpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShvbGRf c3RhdGUtPmRldik7Ci0Jc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqb2xkX2ludGVsX3N0YXRl ID0KLQkJdG9faW50ZWxfYXRvbWljX3N0YXRlKG9sZF9zdGF0ZSk7Ci0KLQlieHRfc2V0X2NkY2xr KGRldl9wcml2LCAmb2xkX2ludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwpOwotfQotCiBzdGF0aWMg aW50IGludGVsX2NvbXB1dGVfbWF4X2RvdGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiB7CiAJaW50IG1heF9jZGNsa19mcmVxID0gZGV2X3ByaXYtPm1heF9jZGNsa19mcmVx OwpAQCAtMTcyNiwyNCArMTY4NywyNCBAQCB2b2lkIGludGVsX3VwZGF0ZV9yYXdjbGsoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiB2b2lkIGludGVsX2luaXRfY2RjbGtfaG9v a3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCWlmIChJU19WQUxMRVlW SUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewotCQlkZXZfcHJpdi0+ ZGlzcGxheS5tb2Rlc2V0X2NvbW1pdF9jZGNsayA9Ci0JCQl2bHZfbW9kZXNldF9jb21taXRfY2Rj bGs7CisJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CisJCWRldl9wcml2LT5kaXNwbGF5 LnNldF9jZGNsayA9IGNodl9zZXRfY2RjbGs7CisJCWRldl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRf Y2FsY19jZGNsayA9CisJCQl2bHZfbW9kZXNldF9jYWxjX2NkY2xrOworCX0gZWxzZSBpZiAoSVNf VkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKKwkJZGV2 X3ByaXYtPmRpc3BsYXkuc2V0X2NkY2xrID0gdmx2X3NldF9jZGNsazsKIAkJZGV2X3ByaXYtPmRp c3BsYXkubW9kZXNldF9jYWxjX2NkY2xrID0KIAkJCXZsdl9tb2Rlc2V0X2NhbGNfY2RjbGs7CiAJ fSBlbHNlIGlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7Ci0JCWRldl9wcml2LT5kaXNwbGF5 Lm1vZGVzZXRfY29tbWl0X2NkY2xrID0KLQkJCWJkd19tb2Rlc2V0X2NvbW1pdF9jZGNsazsKKwkJ ZGV2X3ByaXYtPmRpc3BsYXkuc2V0X2NkY2xrID0gYmR3X3NldF9jZGNsazsKIAkJZGV2X3ByaXYt PmRpc3BsYXkubW9kZXNldF9jYWxjX2NkY2xrID0KIAkJCWJkd19tb2Rlc2V0X2NhbGNfY2RjbGs7 CiAJfSBlbHNlIGlmIChJU19HRU45X0xQKGRldl9wcml2KSkgewotCQlkZXZfcHJpdi0+ZGlzcGxh eS5tb2Rlc2V0X2NvbW1pdF9jZGNsayA9Ci0JCQlieHRfbW9kZXNldF9jb21taXRfY2RjbGs7CisJ CWRldl9wcml2LT5kaXNwbGF5LnNldF9jZGNsayA9IGJ4dF9zZXRfY2RjbGs7CiAJCWRldl9wcml2 LT5kaXNwbGF5Lm1vZGVzZXRfY2FsY19jZGNsayA9CiAJCQlieHRfbW9kZXNldF9jYWxjX2NkY2xr OwogCX0gZWxzZSBpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikgfHwgSVNfS0FCWUxBS0UoZGV2X3By aXYpKSB7Ci0JCWRldl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRfY29tbWl0X2NkY2xrID0KLQkJCXNr bF9tb2Rlc2V0X2NvbW1pdF9jZGNsazsKKwkJZGV2X3ByaXYtPmRpc3BsYXkuc2V0X2NkY2xrID0g c2tsX3NldF9jZGNsazsKIAkJZGV2X3ByaXYtPmRpc3BsYXkubW9kZXNldF9jYWxjX2NkY2xrID0K IAkJCXNrbF9tb2Rlc2V0X2NhbGNfY2RjbGs7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IDAwZjA0NzMyNGE0Zi4uMjJhNmJiNzZlODViIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMjg3MiwxMCArMTI4NzIsMTEgQEAgc3RhdGljIHZvaWQg aW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK IAlpZiAoaW50ZWxfc3RhdGUtPm1vZGVzZXQpIHsKIAkJZHJtX2F0b21pY19oZWxwZXJfdXBkYXRl X2xlZ2FjeV9tb2Rlc2V0X3N0YXRlKHN0YXRlLT5kZXYsIHN0YXRlKTsKIAotCQlpZiAoZGV2X3By aXYtPmRpc3BsYXkubW9kZXNldF9jb21taXRfY2RjbGsgJiYKKwkJaWYgKGRldl9wcml2LT5kaXNw bGF5LnNldF9jZGNsayAmJgogCQkgICAgIWludGVsX2NkY2xrX3N0YXRlX2NvbXBhcmUoJmRldl9w cml2LT5jZGNsay5hY3R1YWwsCiAJCQkJCSAgICAgICAmaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVh bCkpCi0JCQlkZXZfcHJpdi0+ZGlzcGxheS5tb2Rlc2V0X2NvbW1pdF9jZGNsayhzdGF0ZSk7CisJ CQlkZXZfcHJpdi0+ZGlzcGxheS5zZXRfY2RjbGsoZGV2X3ByaXYsCisJCQkJCQkgICAgJmludGVs X3N0YXRlLT5jZGNsay5hY3R1YWwpOwogCiAJCS8qCiAJCSAqIFNLTCB3b3JrYXJvdW5kOiBic3Bl YyByZWNvbW1lbmRzIHdlIGRpc2FibGUgdGhlIFNBR1Ygd2hlbiB3ZQotLSAKMi4xMC4yCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK