From mboxrd@z Thu Jan 1 00:00:00 1970 From: tom.orourke@intel.com Subject: [RFC 04/22] drm/i915/slpc: Use intel_slpc_* functions if supported Date: Wed, 20 Jan 2016 18:26:06 -0800 Message-ID: <1453343184-160456-5-git-send-email-tom.orourke@intel.com> References: <1453343184-160456-1-git-send-email-tom.orourke@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 9334A6E1D8 for ; Wed, 20 Jan 2016 18:27:14 -0800 (PST) In-Reply-To: <1453343184-160456-1-git-send-email-tom.orourke@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: Tom O'Rourke List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVG9tIE8nUm91cmtlIDxUb20uTydSb3Vya2VAaW50ZWwuY29tPgoKT24gcGxhdGZvcm1z IHdpdGggU0xQQyBzdXBwb3J0OiBjYWxsIGludGVsX3NscGNfKigpCmZ1bmN0aW9ucyBmcm9tIGNv cnJlc3BvbmRpbmcgaW50ZWxfKl9ndF9wb3dlcnNhdmUoKQpmdW5jdGlvbnM7IGFuZCBkbyBub3Qg dXNlIHJwcyBmdW5jdGlvbnMuCgpTaWduZWQtb2ZmLWJ5OiBUb20gTydSb3Vya2UgPFRvbS5PJ1Jv dXJrZUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvTWFrZWZpbGUgICAgIHwg IDUgKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgfCAzNiArKysrKysrKysr KysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3NscGMuYyB8IDY4ICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc2xwYy5oIHwgMzUgKysrKysrKysrKysrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwg MTMyIGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3NscGMuYwogY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3NscGMuaAoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L01ha2VmaWxlIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvTWFrZWZpbGUKaW5kZXggMDg1 MWRlMDcuLjkyYjM3OGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L01ha2VmaWxl CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L01ha2VmaWxlCkBAIC00MSw4ICs0MSw5IEBAIGk5 MTUteSArPSBpOTE1X2NtZF9wYXJzZXIubyBcCiAJICBpbnRlbF91bmNvcmUubwogCiAjIGdlbmVy YWwtcHVycG9zZSBtaWNyb2NvbnRyb2xsZXIgKEd1Qykgc3VwcG9ydAotaTkxNS15ICs9IGludGVs X2d1Y19sb2FkZXIubyBcCi0JICBpOTE1X2d1Y19zdWJtaXNzaW9uLm8KK2k5MTUteSArPSBpOTE1 X2d1Y19zdWJtaXNzaW9uLm8gXAorCSAgaW50ZWxfZ3VjX2xvYWRlci5vIFwKKwkgIGludGVsX3Ns cGMubwogCiAjIGF1dG9nZW5lcmF0ZWQgbnVsbCByZW5kZXIgc3RhdGUKIGk5MTUteSArPSBpbnRl bF9yZW5kZXJzdGF0ZV9nZW42Lm8gXApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggMjBiZjg1 NC4uMjc3MTNhYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC02MDY3LDcgKzYwNjcsOSBA QCB2b2lkIGludGVsX2luaXRfZ3RfcG93ZXJzYXZlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ CWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKIAl9CiAKLQlpZiAoSVNfQ0hFUlJZVklF VyhkZXYpKQorCWlmIChIQVNfU0xQQyhkZXYpKQorCQlpbnRlbF9zbHBjX2luaXQoZGV2KTsKKwll bHNlIGlmIChJU19DSEVSUllWSUVXKGRldikpCiAJCWNoZXJyeXZpZXdfaW5pdF9ndF9wb3dlcnNh dmUoZGV2KTsKIAllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpCiAJCXZhbGxleXZpZXdfaW5p dF9ndF9wb3dlcnNhdmUoZGV2KTsKQEAgLTYwNzYsOCArNjA3OCwxMCBAQCB2b2lkIGludGVsX2lu aXRfZ3RfcG93ZXJzYXZlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB2b2lkIGludGVsX2NsZWFu dXBfZ3RfcG93ZXJzYXZlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQotCWlmIChJU19DSEVS UllWSUVXKGRldikpCisJCisJaWYgKEhBU19TTFBDKGRldikpCisJCWludGVsX3NscGNfY2xlYW51 cChkZXYpOworCWVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkKIAkJcmV0dXJuOwogCWVsc2Ug aWYgKElTX1ZBTExFWVZJRVcoZGV2KSkKIAkJdmFsbGV5dmlld19jbGVhbnVwX2d0X3Bvd2Vyc2F2 ZShkZXYpOwpAQCAtNjExMCwxNyArNjExNCwyMyBAQCB2b2lkIGludGVsX3N1c3BlbmRfZ3RfcG93 ZXJzYXZlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu IDwgNikKIAkJcmV0dXJuOwogCi0JZ2VuNl9zdXNwZW5kX3JwcyhkZXYpOworCWlmIChIQVNfU0xQ QyhkZXYpKSB7CisJCWludGVsX3NscGNfc3VzcGVuZChkZXYpOworCX0gZWxzZSB7CisJCWdlbjZf c3VzcGVuZF9ycHMoZGV2KTsKIAotCS8qIEZvcmNlIEdQVSB0byBtaW4gZnJlcSBkdXJpbmcgc3Vz cGVuZCAqLwotCWdlbjZfcnBzX2lkbGUoZGV2X3ByaXYpOworCQkvKiBGb3JjZSBHUFUgdG8gbWlu IGZyZXEgZHVyaW5nIHN1c3BlbmQgKi8KKwkJZ2VuNl9ycHNfaWRsZShkZXZfcHJpdik7CisJfQog fQogCiB2b2lkIGludGVsX2Rpc2FibGVfZ3RfcG93ZXJzYXZlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKIAotCWlmIChJU19JUk9OTEFLRV9NKGRldikpIHsKKwlpZiAoSEFTX1NMUEMoZGV2KSkg eworCQlpbnRlbF9zbHBjX2Rpc2FibGUoZGV2KTsKKwl9IGVsc2UgaWYgKElTX0lST05MQUtFX00o ZGV2KSkgewogCQlpcm9ubGFrZV9kaXNhYmxlX2RycHMoZGV2KTsKIAl9IGVsc2UgaWYgKElOVEVM X0lORk8oZGV2KS0+Z2VuID49IDYpIHsKIAkJaW50ZWxfc3VzcGVuZF9ndF9wb3dlcnNhdmUoZGV2 KTsKQEAgLTYxOTEsNyArNjIwMSw5IEBAIHZvaWQgaW50ZWxfZW5hYmxlX2d0X3Bvd2Vyc2F2ZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChpbnRlbF92Z3B1X2FjdGl2ZShkZXYpKQogCQly ZXR1cm47CiAKLQlpZiAoSVNfSVJPTkxBS0VfTShkZXYpKSB7CisJaWYgKEhBU19TTFBDKGRldikp IHsKKwkJaW50ZWxfc2xwY19lbmFibGUoZGV2KTsKKwl9IGVsc2UgaWYgKElTX0lST05MQUtFX00o ZGV2KSkgewogCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJCWlyb25sYWtlX2Vu YWJsZV9kcnBzKGRldik7CiAJCWludGVsX2luaXRfZW1vbihkZXYpOwpAQCAtNjIyMiw4ICs2MjM0 LDEyIEBAIHZvaWQgaW50ZWxfcmVzZXRfZ3RfcG93ZXJzYXZlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNikKIAkJcmV0dXJuOwogCi0JZ2VuNl9z dXNwZW5kX3JwcyhkZXYpOwotCWRldl9wcml2LT5ycHMuZW5hYmxlZCA9IGZhbHNlOworCWlmIChI QVNfU0xQQyhkZXYpKSB7CisJCWludGVsX3NscGNfcmVzZXQoZGV2KTsKKwl9IGVsc2UgeworCQln ZW42X3N1c3BlbmRfcnBzKGRldik7CisJCWRldl9wcml2LT5ycHMuZW5hYmxlZCA9IGZhbHNlOwor CX0KIH0KIAogc3RhdGljIHZvaWQgaWJ4X2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zbHBjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zbHBjLmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMC4uZGNkMjM3ZgotLS0gL2Rldi9udWxsCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3NscGMuYwpAQCAtMCwwICsxLDY4IEBACisvKgorICogQ29weXJpZ2h0IMKp IDIwMTUgSW50ZWwgQ29ycG9yYXRpb24KKyAqCisgKiBQZXJtaXNzaW9uIGlzIGhlcmVieSBncmFu dGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNvbiBvYnRhaW5pbmcgYQorICogY29weSBv ZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRvY3VtZW50YXRpb24gZmlsZXMgKHRoZSAi U29mdHdhcmUiKSwKKyAqIHRvIGRlYWwgaW4gdGhlIFNvZnR3YXJlIHdpdGhvdXQgcmVzdHJpY3Rp b24sIGluY2x1ZGluZyB3aXRob3V0IGxpbWl0YXRpb24KKyAqIHRoZSByaWdodHMgdG8gdXNlLCBj b3B5LCBtb2RpZnksIG1lcmdlLCBwdWJsaXNoLCBkaXN0cmlidXRlLCBzdWJsaWNlbnNlLAorICog YW5kL29yIHNlbGwgY29waWVzIG9mIHRoZSBTb2Z0d2FyZSwgYW5kIHRvIHBlcm1pdCBwZXJzb25z IHRvIHdob20gdGhlCisgKiBTb2Z0d2FyZSBpcyBmdXJuaXNoZWQgdG8gZG8gc28sIHN1YmplY3Qg dG8gdGhlIGZvbGxvd2luZyBjb25kaXRpb25zOgorICoKKyAqIFRoZSBhYm92ZSBjb3B5cmlnaHQg bm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIChpbmNsdWRpbmcgdGhlIG5leHQKKyAq IHBhcmFncmFwaCkgc2hhbGwgYmUgaW5jbHVkZWQgaW4gYWxsIGNvcGllcyBvciBzdWJzdGFudGlh bCBwb3J0aW9ucyBvZiB0aGUKKyAqIFNvZnR3YXJlLgorICoKKyAqIFRIRSBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCAiQVMgSVMiLCBXSVRIT1VUIFdBUlJBTlRZIE9GIEFOWSBLSU5ELCBFWFBSRVNTIE9S CisgKiBJTVBMSUVELCBJTkNMVURJTkcgQlVUIE5PVCBMSU1JVEVEIFRPIFRIRSBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSwKKyAqIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NF IEFORCBOT05JTkZSSU5HRU1FTlQuICBJTiBOTyBFVkVOVCBTSEFMTAorICogVEhFIEFVVEhPUlMg T1IgQ09QWVJJR0hUIEhPTERFUlMgQkUgTElBQkxFIEZPUiBBTlkgQ0xBSU0sIERBTUFHRVMgT1Ig T1RIRVIKKyAqIExJQUJJTElUWSwgV0hFVEhFUiBJTiBBTiBBQ1RJT04gT0YgQ09OVFJBQ1QsIFRP UlQgT1IgT1RIRVJXSVNFLCBBUklTSU5HCisgKiBGUk9NLCBPVVQgT0YgT1IgSU4gQ09OTkVDVElP TiBXSVRIIFRIRSBTT0ZUV0FSRSBPUiBUSEUgVVNFIE9SIE9USEVSIERFQUxJTkdTCisgKiBJTiBU SEUgU09GVFdBUkUuCisgKgorICovCisjaW5jbHVkZSA8bGludXgvZmlybXdhcmUuaD4KKyNpbmNs dWRlICJpOTE1X2Rydi5oIgorI2luY2x1ZGUgImludGVsX2d1Yy5oIgorCitpbnQgaW50ZWxfc2xw Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKworCXJldHVybiAwOworfQorCitpbnQg aW50ZWxfc2xwY19jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKworCXJldHVybiAw OworfQorCitpbnQgaW50ZWxfc2xwY19zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK KworCXJldHVybiAwOworfQorCitpbnQgaW50ZWxfc2xwY19kaXNhYmxlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKKworCXJldHVybiAwOworfQorCitpbnQgaW50ZWxfc2xwY19lbmFibGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkZXYtPmRldl9wcml2YXRlOworCisJcmV0dXJuIDA7Cit9CisKK2ludCBpbnRlbF9zbHBj X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKworCXJldHVybiAwOworfQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2xwYy5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfc2xwYy5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjhm MTNmYjUKLS0tIC9kZXYvbnVsbAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zbHBj LmgKQEAgLTAsMCArMSwzNSBAQAorLyoKKyAqIENvcHlyaWdodCDCqSAyMDE1IEludGVsIENvcnBv cmF0aW9uCisgKgorICogUGVybWlzc2lvbiBpcyBoZXJlYnkgZ3JhbnRlZCwgZnJlZSBvZiBjaGFy Z2UsIHRvIGFueSBwZXJzb24gb2J0YWluaW5nIGEKKyAqIGNvcHkgb2YgdGhpcyBzb2Z0d2FyZSBh bmQgYXNzb2NpYXRlZCBkb2N1bWVudGF0aW9uIGZpbGVzICh0aGUgIlNvZnR3YXJlIiksCisgKiB0 byBkZWFsIGluIHRoZSBTb2Z0d2FyZSB3aXRob3V0IHJlc3RyaWN0aW9uLCBpbmNsdWRpbmcgd2l0 aG91dCBsaW1pdGF0aW9uCisgKiB0aGUgcmlnaHRzIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBtZXJn ZSwgcHVibGlzaCwgZGlzdHJpYnV0ZSwgc3VibGljZW5zZSwKKyAqIGFuZC9vciBzZWxsIGNvcGll cyBvZiB0aGUgU29mdHdhcmUsIGFuZCB0byBwZXJtaXQgcGVyc29ucyB0byB3aG9tIHRoZQorICog U29mdHdhcmUgaXMgZnVybmlzaGVkIHRvIGRvIHNvLCBzdWJqZWN0IHRvIHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9uczoKKyAqCisgKiBUaGUgYWJvdmUgY29weXJpZ2h0IG5vdGljZSBhbmQgdGhpcyBw ZXJtaXNzaW9uIG5vdGljZSAoaW5jbHVkaW5nIHRoZSBuZXh0CisgKiBwYXJhZ3JhcGgpIHNoYWxs IGJlIGluY2x1ZGVkIGluIGFsbCBjb3BpZXMgb3Igc3Vic3RhbnRpYWwgcG9ydGlvbnMgb2YgdGhl CisgKiBTb2Z0d2FyZS4KKyAqCisgKiBUSEUgU09GVFdBUkUgSVMgUFJPVklERUQgIkFTIElTIiwg V0lUSE9VVCBXQVJSQU5UWSBPRiBBTlkgS0lORCwgRVhQUkVTUyBPUgorICogSU1QTElFRCwgSU5D TFVESU5HIEJVVCBOT1QgTElNSVRFRCBUTyBUSEUgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJ VFksCisgKiBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBTkQgTk9OSU5GUklOR0VN RU5ULiAgSU4gTk8gRVZFTlQgU0hBTEwKKyAqIFRIRSBBVVRIT1JTIE9SIENPUFlSSUdIVCBIT0xE RVJTIEJFIExJQUJMRSBGT1IgQU5ZIENMQUlNLCBEQU1BR0VTIE9SIE9USEVSCisgKiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4gQU4gQUNUSU9OIE9GIENPTlRSQUNULCBUT1JUIE9SIE9USEVSV0lTRSwg QVJJU0lORworICogRlJPTSwgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgU09GVFdB UkUgT1IgVEhFIFVTRSBPUiBPVEhFUiBERUFMSU5HUworICogSU4gVEhFIFNPRlRXQVJFLgorICoK KyAqLworI2lmbmRlZiBfSU5URUxfU0xQQ19IXworI2RlZmluZSBfSU5URUxfU0xQQ19IXworCisv KiBpbnRlbF9zbHBjLmMgKi8KK2ludCBpbnRlbF9zbHBjX2luaXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7CitpbnQgaW50ZWxfc2xwY19jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwor aW50IGludGVsX3NscGNfc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK2ludCBpbnRl bF9zbHBjX2Rpc2FibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitpbnQgaW50ZWxfc2xwY19l bmFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitpbnQgaW50ZWxfc2xwY19yZXNldChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KTsKKworI2VuZGlmCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK