From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH v2] drm/i915: index gmbus tables using the pin pair number Date: Wed, 1 Apr 2015 10:55:04 +0300 Message-ID: <1427874904-26533-1-git-send-email-jani.nikula@intel.com> References: <20150327150010.GB17410@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 C444D6E7F5 for ; Wed, 1 Apr 2015 00:53:23 -0700 (PDT) In-Reply-To: <20150327150010.GB17410@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Jani Nikula Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org SW5kZXggdGhlIGdtYnVzIHRhYmxlcyBkaXJlY3RseSB1c2luZyB0aGUgcGluIGluc3RlYWQgb2Yg aGF2aW5nIGEKY29uZnVzaW5nICJwb3J0ID0gaSArIDEiIG1hcHBpbmcuIFRoaXMgZmluaXNoZXMg b2ZmIHJlbW92aW5nIHRoZSAiZ21idXMKcG9ydCIgYXMgYSBub3Rpb24sIGFuZCBsZWF2ZXMgdXMg d2l0aCBqdXN0IHRoZSAiZ21idXMgcGluIi4KCkFzIHBpbiAwIGlzIGludmFsaWQgYnkgZGVmaW5p dGlvbiBhbmQgdGhlIGdtYnVzIHRhYmxlcyB3aWxsIGhhdmUgYSBnYXAKYXQgdGhhdCBpbmRleCwg YWRkIHBpbiB2YWxpZGl0eSBjaGVjayB0byBhbGwgdGhlIGxvb3BzLiBUaGlzIHdpbGwgYmUKYmVu ZWZpdGlhbCBmb3Igc3VwcG9ydGluZyBwbGF0Zm9ybXMgdGhhdCBoYXZlIGRpZmZlcmVudCBudW1i ZXJzIG9mIHBpbnMsCm9yIGdhcHMuCgp2Mjogcy9HTUJVU19QSU5fTUFYL0dNQlVTX05VTV9QSU5T LyAoVmlsbGUsIERhbmllbCkKClJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5u aWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggIHwg IDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggIHwgIDIgKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2kyYy5jIHwgNjUgKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCAzMCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBlN2RiMWUxZmNkMTYuLmU1MGIz Mjc3MmJiNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xNTc0LDggKzE1NzQsNyBAQCBz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAKIAlzdHJ1Y3QgaTkxNV92aXJ0dWFsX2dwdSB2Z3B1 OwogCi0Jc3RydWN0IGludGVsX2dtYnVzIGdtYnVzW0dNQlVTX05VTV9QT1JUU107Ci0KKwlzdHJ1 Y3QgaW50ZWxfZ21idXMgZ21idXNbR01CVVNfTlVNX1BJTlNdOwogCiAJLyoqIGdtYnVzX211dGV4 IHByb3RlY3RzIGFnYWluc3QgY29uY3VycmVudCB1c2FnZSBvZiB0aGUgc2luZ2xlIGh3IGdtYnVz CiAJICogY29udHJvbGxlciBvbiBkaWZmZXJlbnQgaTJjIGJ1c2VzLiAqLwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcmVnLmgKaW5kZXggODE2N2VmNTNiMDJjLi5iMTM0ZmEzOWM1YjggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9yZWcuaApAQCAtMTc5Nyw3ICsxNzk3LDcgQEAgZW51bSBza2xfZGlzcF9wb3dlcl93ZWxs cyB7CiAjZGVmaW5lICAgR01CVVNfUElOX0RQQgkJNSAvKiBTRFZPLCBIRE1JQiAqLwogI2RlZmlu ZSAgIEdNQlVTX1BJTl9EUEQJCTYgLyogSERNSUQgKi8KICNkZWZpbmUgICBHTUJVU19QSU5fUkVT RVJWRUQJNyAvKiA3IHJlc2VydmVkICovCi0jZGVmaW5lICAgR01CVVNfTlVNX1BPUlRTCShHTUJV U19QSU5fRFBEIC0gR01CVVNfUElOX1NTQyArIDEpCisjZGVmaW5lICAgR01CVVNfTlVNX1BJTlMJ NyAvKiBpbmNsdWRpbmcgMCAqLwogI2RlZmluZSBHTUJVUzEJCQkweDUxMDQgLyogY29tbWFuZC9z dGF0dXMgKi8KICNkZWZpbmUgICBHTUJVU19TV19DTFJfSU5UCSgxPDwzMSkKICNkZWZpbmUgICBH TUJVU19TV19SRFkJCSgxPDwzMCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2kyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMKaW5kZXggYjAwMDNh MmJkODU0Li5mZjQ3YThmZGNiNmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2kyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCkBAIC0zNCwx OCArMzQsMTkgQEAKICNpbmNsdWRlIDxkcm0vaTkxNV9kcm0uaD4KICNpbmNsdWRlICJpOTE1X2Ry di5oIgogCi1zdHJ1Y3QgZ21idXNfcG9ydCB7CitzdHJ1Y3QgZ21idXNfcGluIHsKIAljb25zdCBj aGFyICpuYW1lOwogCWludCByZWc7CiB9OwogCi1zdGF0aWMgY29uc3Qgc3RydWN0IGdtYnVzX3Bv cnQgZ21idXNfcG9ydHNbXSA9IHsKLQl7ICJzc2MiLCBHUElPQiB9LAotCXsgInZnYSIsIEdQSU9B IH0sCi0JeyAicGFuZWwiLCBHUElPQyB9LAotCXsgImRwYyIsIEdQSU9EIH0sCi0JeyAiZHBiIiwg R1BJT0UgfSwKLQl7ICJkcGQiLCBHUElPRiB9LAorLyogTWFwIGdtYnVzIHBpbiBwYWlycyB0byBu YW1lcyBhbmQgcmVnaXN0ZXJzLiAqLworc3RhdGljIGNvbnN0IHN0cnVjdCBnbWJ1c19waW4gZ21i dXNfcGluc1tdID0geworCVtHTUJVU19QSU5fU1NDXSA9IHsgInNzYyIsIEdQSU9CIH0sCisJW0dN QlVTX1BJTl9WR0FERENdID0geyAidmdhIiwgR1BJT0EgfSwKKwlbR01CVVNfUElOX1BBTkVMXSA9 IHsgInBhbmVsIiwgR1BJT0MgfSwKKwlbR01CVVNfUElOX0RQQ10gPSB7ICJkcGMiLCBHUElPRCB9 LAorCVtHTUJVU19QSU5fRFBCXSA9IHsgImRwYiIsIEdQSU9FIH0sCisJW0dNQlVTX1BJTl9EUERd ID0geyAiZHBkIiwgR1BJT0YgfSwKIH07CiAKIC8qIEludGVsIEdQSU8gYWNjZXNzIGZ1bmN0aW9u cyAqLwpAQCAtMTgyLDE1ICsxODMsMTQgQEAgaW50ZWxfZ3Bpb19wb3N0X3hmZXIoc3RydWN0IGky Y19hZGFwdGVyICphZGFwdGVyKQogfQogCiBzdGF0aWMgdm9pZAotaW50ZWxfZ3Bpb19zZXR1cChz dHJ1Y3QgaW50ZWxfZ21idXMgKmJ1cywgdTMyIHBpbikKK2ludGVsX2dwaW9fc2V0dXAoc3RydWN0 IGludGVsX2dtYnVzICpidXMsIHVuc2lnbmVkIGludCBwaW4pCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gYnVzLT5kZXZfcHJpdjsKIAlzdHJ1Y3QgaTJjX2FsZ29fYml0 X2RhdGEgKmFsZ287CiAKIAlhbGdvID0gJmJ1cy0+Yml0X2FsZ287CiAKLQkvKiAtMSB0byBtYXAg cGluIHBhaXIgdG8gZ21idXMgaW5kZXggKi8KLQlidXMtPmdwaW9fcmVnID0gZGV2X3ByaXYtPmdw aW9fbW1pb19iYXNlICsgZ21idXNfcG9ydHNbcGluIC0gMV0ucmVnOworCWJ1cy0+Z3Bpb19yZWcg PSBkZXZfcHJpdi0+Z3Bpb19tbWlvX2Jhc2UgKyBnbWJ1c19waW5zW3Bpbl0ucmVnOwogCiAJYnVz LT5hZGFwdGVyLmFsZ29fZGF0YSA9IGFsZ287CiAJYWxnby0+c2V0c2RhID0gc2V0X2RhdGE7CkBA IC01MTcsNyArNTE3LDkgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpMmNfYWxnb3JpdGhtIGdtYnVz X2FsZ29yaXRobSA9IHsKIGludCBpbnRlbF9zZXR1cF9nbWJ1cyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7Ci0JaW50IHJldCwgaTsKKwlzdHJ1Y3QgaW50ZWxfZ21idXMgKmJ1czsKKwl1bnNpZ25l ZCBpbnQgcGluOworCWludCByZXQ7CiAKIAlpZiAoSEFTX1BDSF9OT1AoZGV2KSkKIAkJcmV0dXJu IDA7CkBAIC01MzEsMTYgKzUzMywxOCBAQCBpbnQgaW50ZWxfc2V0dXBfZ21idXMoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAltdXRleF9pbml0KCZkZXZfcHJpdi0+Z21idXNfbXV0ZXgpOwogCWlu aXRfd2FpdHF1ZXVlX2hlYWQoJmRldl9wcml2LT5nbWJ1c193YWl0X3F1ZXVlKTsKIAotCWZvciAo aSA9IDA7IGkgPCBHTUJVU19OVU1fUE9SVFM7IGkrKykgewotCQlzdHJ1Y3QgaW50ZWxfZ21idXMg KmJ1cyA9ICZkZXZfcHJpdi0+Z21idXNbaV07Ci0JCXUzMiBwb3J0ID0gaSArIDE7IC8qICsxIHRv IG1hcCBnbWJ1cyBpbmRleCB0byBwaW4gcGFpciAqLworCWZvciAocGluID0gMDsgcGluIDwgQVJS QVlfU0laRShkZXZfcHJpdi0+Z21idXMpOyBwaW4rKykgeworCQlpZiAoIWludGVsX2dtYnVzX2lz X3ZhbGlkX3BpbihwaW4pKQorCQkJY29udGludWU7CisKKwkJYnVzID0gJmRldl9wcml2LT5nbWJ1 c1twaW5dOwogCiAJCWJ1cy0+YWRhcHRlci5vd25lciA9IFRISVNfTU9EVUxFOwogCQlidXMtPmFk YXB0ZXIuY2xhc3MgPSBJMkNfQ0xBU1NfRERDOwogCQlzbnByaW50ZihidXMtPmFkYXB0ZXIubmFt ZSwKIAkJCSBzaXplb2YoYnVzLT5hZGFwdGVyLm5hbWUpLAogCQkJICJpOTE1IGdtYnVzICVzIiwK LQkJCSBnbWJ1c19wb3J0c1tpXS5uYW1lKTsKKwkJCSBnbWJ1c19waW5zW3Bpbl0ubmFtZSk7CiAK IAkJYnVzLT5hZGFwdGVyLmRldi5wYXJlbnQgPSAmZGV2LT5wZGV2LT5kZXY7CiAJCWJ1cy0+ZGV2 X3ByaXYgPSBkZXZfcHJpdjsKQEAgLTU0OCwxMyArNTUyLDEzIEBAIGludCBpbnRlbF9zZXR1cF9n bWJ1cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlidXMtPmFkYXB0ZXIuYWxnbyA9ICZnbWJ1 c19hbGdvcml0aG07CiAKIAkJLyogQnkgZGVmYXVsdCB1c2UgYSBjb25zZXJ2YXRpdmUgY2xvY2sg cmF0ZSAqLwotCQlidXMtPnJlZzAgPSBwb3J0IHwgR01CVVNfUkFURV8xMDBLSFo7CisJCWJ1cy0+ cmVnMCA9IHBpbiB8IEdNQlVTX1JBVEVfMTAwS0haOwogCiAJCS8qIGdtYnVzIHNlZW1zIHRvIGJl IGJyb2tlbiBvbiBpODMwICovCiAJCWlmIChJU19JODMwKGRldikpCiAJCQlidXMtPmZvcmNlX2Jp dCA9IDE7CiAKLQkJaW50ZWxfZ3Bpb19zZXR1cChidXMsIHBvcnQpOworCQlpbnRlbF9ncGlvX3Nl dHVwKGJ1cywgcGluKTsKIAogCQlyZXQgPSBpMmNfYWRkX2FkYXB0ZXIoJmJ1cy0+YWRhcHRlcik7 CiAJCWlmIChyZXQpCkBAIC01NjYsOCArNTcwLDExIEBAIGludCBpbnRlbF9zZXR1cF9nbWJ1cyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJldHVybiAwOwogCiBlcnI6Ci0Jd2hpbGUgKC0taSkg ewotCQlzdHJ1Y3QgaW50ZWxfZ21idXMgKmJ1cyA9ICZkZXZfcHJpdi0+Z21idXNbaV07CisJd2hp bGUgKC0tcGluKSB7CisJCWlmICghaW50ZWxfZ21idXNfaXNfdmFsaWRfcGluKHBpbikpCisJCQlj b250aW51ZTsKKworCQlidXMgPSAmZGV2X3ByaXYtPmdtYnVzW3Bpbl07CiAJCWkyY19kZWxfYWRh cHRlcigmYnVzLT5hZGFwdGVyKTsKIAl9CiAJcmV0dXJuIHJldDsKQEAgLTU3NiwxMCArNTgzLDEw IEBAIGVycjoKIHN0cnVjdCBpMmNfYWRhcHRlciAqaW50ZWxfZ21idXNfZ2V0X2FkYXB0ZXIoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCQkgICAgdW5zaWduZWQgaW50IHBp bikKIHsKLQlXQVJOX09OKCFpbnRlbF9nbWJ1c19pc192YWxpZF9waW4ocGluKSk7Ci0JLyogLTEg dG8gbWFwIHBpbiBwYWlyIHRvIGdtYnVzIGluZGV4ICovCi0JcmV0dXJuIChpbnRlbF9nbWJ1c19p c192YWxpZF9waW4ocGluKSkgPwotCQkmZGV2X3ByaXYtPmdtYnVzW3BpbiAtIDFdLmFkYXB0ZXIg OiBOVUxMOworCWlmIChXQVJOX09OKCFpbnRlbF9nbWJ1c19pc192YWxpZF9waW4ocGluKSkpCisJ CXJldHVybiBOVUxMOworCisJcmV0dXJuICZkZXZfcHJpdi0+Z21idXNbcGluXS5hZGFwdGVyOwog fQogCiB2b2lkIGludGVsX2dtYnVzX3NldF9zcGVlZChzdHJ1Y3QgaTJjX2FkYXB0ZXIgKmFkYXB0 ZXIsIGludCBzcGVlZCkKQEAgLTYwMiwxMCArNjA5LDE0IEBAIHZvaWQgaW50ZWxfZ21idXNfZm9y Y2VfYml0KHN0cnVjdCBpMmNfYWRhcHRlciAqYWRhcHRlciwgYm9vbCBmb3JjZV9iaXQpCiB2b2lk IGludGVsX3RlYXJkb3duX2dtYnVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlpbnQgaTsK KwlzdHJ1Y3QgaW50ZWxfZ21idXMgKmJ1czsKKwl1bnNpZ25lZCBpbnQgcGluOworCisJZm9yIChw aW4gPSAwOyBwaW4gPCBBUlJBWV9TSVpFKGRldl9wcml2LT5nbWJ1cyk7IHBpbisrKSB7CisJCWlm ICghaW50ZWxfZ21idXNfaXNfdmFsaWRfcGluKHBpbikpCisJCQljb250aW51ZTsKIAotCWZvciAo aSA9IDA7IGkgPCBHTUJVU19OVU1fUE9SVFM7IGkrKykgewotCQlzdHJ1Y3QgaW50ZWxfZ21idXMg KmJ1cyA9ICZkZXZfcHJpdi0+Z21idXNbaV07CisJCWJ1cyA9ICZkZXZfcHJpdi0+Z21idXNbcGlu XTsKIAkJaTJjX2RlbF9hZGFwdGVyKCZidXMtPmFkYXB0ZXIpOwogCX0KIH0KLS0gCjIuMS40Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=