From: Imre Deak Subject: [PATCH 5/7] drm/i915: Move load time clock gating callback init earlier Date: Wed, 9 Mar 2016 17:31:44 +0200 Message-ID: <1457537506-12455-6-git-send-email-imre.deak@intel.com> References: <1457537506-12455-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 3DB0D6E2E9 for ; Wed, 9 Mar 2016 15:33:30 +0000 (UTC) In-Reply-To: <1457537506-12455-1-git-send-email-imre.deak@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 List-Id: intel-gfx@lists.freedesktop.org U3BsaXQgb3V0IHRoZSBwYXJ0IGluaXRpbmcgdGhlIGNsb2NrIGdhdGluZyBjYWxsYmFja3MgYW5k IG1vdmUgaXQKZWFybGllci4KClRoZSByZXN0IG9mIHRoZSBjYWxsYmFja3MgaW4gaW50ZWxfaW5p dF9wbSgpIHNob3VsZCBiZSBpbml0ZWQgaW4gdGhlCnNhbWUgd2F5LCBidXQgYXRtIHNvbWUgb2Yg dGhlIGNhbGxiYWNrcyBhcmUgc2V0IG9ubHkgY29uZGl0aW9uYWxseSwgc28KYmVmb3JlIGRvaW5n IHRoaXMgd2UgbmVlZCB0byBtYWtlIHRoZSBzZXR1cCB1bmNvbmRpdGlvbmFsIGFuZCB1c2UKaW5z dGVhZCBzb21lIGZsYWdzLgoKU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgIHwgIDEgKwogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jICB8IDY1ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t LS0KIDMgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZG1hLmMKaW5kZXggNTViMGM2Mi4uOGNiZTllZiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2RtYS5jCkBAIC0xMDMwLDYgKzEwMzAsNyBAQCBpbnQgaTkxNV9kcml2ZXJfbG9hZChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQogCWludGVsX3Bvd2Vy X2RvbWFpbnNfaW5pdChkZXZfcHJpdik7CiAJaW50ZWxfaXJxX2luaXQoZGV2X3ByaXYpOwogCWlu dGVsX2luaXRfZGlzcGxheV9jYWxsYmFja3MoZGV2X3ByaXYpOworCWludGVsX2luaXRfY2xvY2tf Z2F0aW5nX2NhbGxiYWNrcyhkZXZfcHJpdik7CiAJaW50ZWxfaW5pdF9hdWRpb19jYWxsYmFja3Mo ZGV2X3ByaXYpOwogCiAJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAppbmRleCA1MjY0OTAxLi5kM2QzMWNjIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtMTU5Niw2ICsxNTk2LDcgQEAgdm9pZCBpbnRlbF9zdXNwZW5kX2h3KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpOwogaW50IGlsa193bV9tYXhfbGV2ZWwoY29uc3Qgc3RydWN0IGRy bV9kZXZpY2UgKmRldik7CiB2b2lkIGludGVsX3VwZGF0ZV93YXRlcm1hcmtzKHN0cnVjdCBkcm1f Y3J0YyAqY3J0Yyk7CiB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9kZXZpY2UgKmRldik7 Cit2b2lkIGludGVsX2luaXRfY2xvY2tfZ2F0aW5nX2NhbGxiYWNrcyhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9wbV9zZXR1cChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KTsKIHZvaWQgaW50ZWxfZ3B1X2lwc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7CiB2b2lkIGludGVsX2dwdV9pcHNfdGVhcmRvd24odm9pZCk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwppbmRleCBkN2FlZjE3Li4wMmQzNTk4IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKQEAgLTcxMDcsNiArNzEwNywzOCBAQCB2b2lkIGludGVsX3N1c3BlbmRfaHcoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAkJbHB0X3N1c3BlbmRfaHcoZGV2KTsKIH0KIAordm9pZCBpbnRl bF9pbml0X2Nsb2NrX2dhdGluZ19jYWxsYmFja3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQoreworCWlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKKwkJZGV2X3ByaXYtPmRpc3Bs YXkuaW5pdF9jbG9ja19nYXRpbmcgPSBieHRfaW5pdF9jbG9ja19nYXRpbmc7CisJZWxzZSBpZiAo SVNfQlJPQURXRUxMKGRldl9wcml2KSkKKwkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19n YXRpbmcgPSBicm9hZHdlbGxfaW5pdF9jbG9ja19nYXRpbmc7CisJZWxzZSBpZiAoSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikpCisJCWRldl9wcml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0aW5nID0g Y2hlcnJ5dmlld19pbml0X2Nsb2NrX2dhdGluZzsKKwllbHNlIGlmIChJU19IQVNXRUxMKGRldl9w cml2KSkKKwkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19nYXRpbmcgPSBoYXN3ZWxsX2lu aXRfY2xvY2tfZ2F0aW5nOworCWVsc2UgaWYgKElTX0lWWUJSSURHRShkZXZfcHJpdikpCisJCWRl dl9wcml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0aW5nID0gaXZ5YnJpZGdlX2luaXRfY2xvY2tf Z2F0aW5nOworCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKQorCQlkZXZfcHJpdi0+ ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IHZhbGxleXZpZXdfaW5pdF9jbG9ja19nYXRpbmc7 CisJZWxzZSBpZiAoSVNfR0VONihkZXZfcHJpdikpCisJCWRldl9wcml2LT5kaXNwbGF5LmluaXRf Y2xvY2tfZ2F0aW5nID0gZ2VuNl9pbml0X2Nsb2NrX2dhdGluZzsKKwllbHNlIGlmIChJU19HRU41 KGRldl9wcml2KSkKKwkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19nYXRpbmcgPSBpcm9u bGFrZV9pbml0X2Nsb2NrX2dhdGluZzsKKwllbHNlIGlmIChJU19HNFgoZGV2X3ByaXYpKQorCQlk ZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IGc0eF9pbml0X2Nsb2NrX2dhdGlu ZzsKKwllbHNlIGlmIChJU19DUkVTVExJTkUoZGV2X3ByaXYpKQorCQlkZXZfcHJpdi0+ZGlzcGxh eS5pbml0X2Nsb2NrX2dhdGluZyA9IGNyZXN0bGluZV9pbml0X2Nsb2NrX2dhdGluZzsKKwllbHNl IGlmIChJU19CUk9BRFdBVEVSKGRldl9wcml2KSkKKwkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9j bG9ja19nYXRpbmcgPSBicm9hZHdhdGVyX2luaXRfY2xvY2tfZ2F0aW5nOworCWVsc2UgaWYgKElT X0dFTjMoZGV2X3ByaXYpKQorCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9 IGdlbjNfaW5pdF9jbG9ja19nYXRpbmc7CisJZWxzZSBpZiAoSVNfSTg1WChkZXZfcHJpdikgfHwg SVNfSTg2NUcoZGV2X3ByaXYpKQorCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGlu ZyA9IGk4NXhfaW5pdF9jbG9ja19nYXRpbmc7CisJZWxzZSBpZiAoSVNfR0VOMihkZXZfcHJpdikp CisJCWRldl9wcml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0aW5nID0gaTgzMF9pbml0X2Nsb2Nr X2dhdGluZzsKK30KKwogLyogU2V0IHVwIGNoaXAgc3BlY2lmaWMgcG93ZXIgbWFuYWdlbWVudC1y ZWxhdGVkIGZ1bmN0aW9ucyAqLwogdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiB7CkBAIC03MTIzLDEwICs3MTU1LDYgQEAgdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJLyogRm9yIEZJRk8gd2F0ZXJtYXJrIHVwZGF0ZXMgKi8KIAlp ZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgewogCQlza2xfc2V0dXBfd21fbGF0ZW5jeShk ZXYpOwotCi0JCWlmIChJU19CUk9YVE9OKGRldikpCi0JCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0 X2Nsb2NrX2dhdGluZyA9Ci0JCQkJYnh0X2luaXRfY2xvY2tfZ2F0aW5nOwogCQlkZXZfcHJpdi0+ ZGlzcGxheS51cGRhdGVfd20gPSBza2xfdXBkYXRlX3dtOwogCX0gZWxzZSBpZiAoSEFTX1BDSF9T UExJVChkZXYpKSB7CiAJCWlsa19zZXR1cF93bV9sYXRlbmN5KGRldik7CkBAIC03MTQ2LDI5ICs3 MTc0LDEyIEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJ RFJNX0RFQlVHX0tNUygiRmFpbGVkIHRvIHJlYWQgZGlzcGxheSBwbGFuZSBsYXRlbmN5LiAiCiAJ CQkJICAgICAgIkRpc2FibGUgQ3hTUlxuIik7CiAJCX0KLQotCQlpZiAoSVNfR0VONShkZXYpKQot CQkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19nYXRpbmcgPSBpcm9ubGFrZV9pbml0X2Ns b2NrX2dhdGluZzsKLQkJZWxzZSBpZiAoSVNfR0VONihkZXYpKQotCQkJZGV2X3ByaXYtPmRpc3Bs YXkuaW5pdF9jbG9ja19nYXRpbmcgPSBnZW42X2luaXRfY2xvY2tfZ2F0aW5nOwotCQllbHNlIGlm IChJU19JVllCUklER0UoZGV2KSkKLQkJCWRldl9wcml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0 aW5nID0gaXZ5YnJpZGdlX2luaXRfY2xvY2tfZ2F0aW5nOwotCQllbHNlIGlmIChJU19IQVNXRUxM KGRldikpCi0JCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IGhhc3dlbGxf aW5pdF9jbG9ja19nYXRpbmc7Ci0JCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDgp Ci0JCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IGJyb2Fkd2VsbF9pbml0 X2Nsb2NrX2dhdGluZzsKIAl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkgewogCQl2bHZf c2V0dXBfd21fbGF0ZW5jeShkZXYpOwotCiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9 IHZsdl91cGRhdGVfd207Ci0JCWRldl9wcml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0aW5nID0K LQkJCWNoZXJyeXZpZXdfaW5pdF9jbG9ja19nYXRpbmc7CiAJfSBlbHNlIGlmIChJU19WQUxMRVlW SUVXKGRldikpIHsKIAkJdmx2X3NldHVwX3dtX2xhdGVuY3koZGV2KTsKLQogCQlkZXZfcHJpdi0+ ZGlzcGxheS51cGRhdGVfd20gPSB2bHZfdXBkYXRlX3dtOwotCQlkZXZfcHJpdi0+ZGlzcGxheS5p bml0X2Nsb2NrX2dhdGluZyA9Ci0JCQl2YWxsZXl2aWV3X2luaXRfY2xvY2tfZ2F0aW5nOwogCX0g ZWxzZSBpZiAoSVNfUElORVZJRVcoZGV2KSkgewogCQlpZiAoIWludGVsX2dldF9jeHNyX2xhdGVu Y3koSVNfUElORVZJRVdfRyhkZXYpLAogCQkJCQkgICAgZGV2X3ByaXYtPmlzX2RkcjMsCkBAIC03 MTg0LDIwICs3MTk1LDEzIEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gTlVMTDsKIAkJfSBlbHNlCiAJ CQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSBwaW5ldmlld191cGRhdGVfd207Ci0JCWRl dl9wcml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0aW5nID0gZ2VuM19pbml0X2Nsb2NrX2dhdGlu ZzsKIAl9IGVsc2UgaWYgKElTX0c0WChkZXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0 ZV93bSA9IGc0eF91cGRhdGVfd207Ci0JCWRldl9wcml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0 aW5nID0gZzR4X2luaXRfY2xvY2tfZ2F0aW5nOwogCX0gZWxzZSBpZiAoSVNfR0VONChkZXYpKSB7 CiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IGk5NjVfdXBkYXRlX3dtOwotCQlpZiAo SVNfQ1JFU1RMSU5FKGRldikpCi0JCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGlu ZyA9IGNyZXN0bGluZV9pbml0X2Nsb2NrX2dhdGluZzsKLQkJZWxzZSBpZiAoSVNfQlJPQURXQVRF UihkZXYpKQotCQkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19nYXRpbmcgPSBicm9hZHdh dGVyX2luaXRfY2xvY2tfZ2F0aW5nOwogCX0gZWxzZSBpZiAoSVNfR0VOMyhkZXYpKSB7CiAJCWRl dl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IGk5eHhfdXBkYXRlX3dtOwogCQlkZXZfcHJpdi0+ ZGlzcGxheS5nZXRfZmlmb19zaXplID0gaTl4eF9nZXRfZmlmb19zaXplOwotCQlkZXZfcHJpdi0+ ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IGdlbjNfaW5pdF9jbG9ja19nYXRpbmc7CiAJfSBl bHNlIGlmIChJU19HRU4yKGRldikpIHsKIAkJaWYgKElOVEVMX0lORk8oZGV2KS0+bnVtX3BpcGVz ID09IDEpIHsKIAkJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IGk4NDVfdXBkYXRlX3dt OwpAQCAtNzIwNiwxMSArNzIxMCw2IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gaTl4eF91cGRhdGVf d207CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfZmlmb19zaXplID0gaTgzMF9nZXRfZmlmb19z aXplOwogCQl9Ci0KLQkJaWYgKElTX0k4NVgoZGV2KSB8fCBJU19JODY1RyhkZXYpKQotCQkJZGV2 X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19nYXRpbmcgPSBpODV4X2luaXRfY2xvY2tfZ2F0aW5n OwotCQllbHNlCi0JCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IGk4MzBf aW5pdF9jbG9ja19nYXRpbmc7CiAJfSBlbHNlIHsKIAkJRFJNX0VSUk9SKCJ1bmV4cGVjdGVkIGZh bGwtdGhyb3VnaCBpbiBpbnRlbF9pbml0X3BtXG4iKTsKIAl9Ci0tIAoyLjUuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==