From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 1/3] drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins Date: Tue, 21 Jul 2015 15:32:44 -0700 Message-ID: <1437517965-2605-1-git-send-email-imre.deak@intel.com> References: <1437428619-30160-2-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 5CB976E765 for ; Tue, 21 Jul 2015 15:32:46 -0700 (PDT) In-Reply-To: <1437428619-30160-2-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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org VGhlc2UgZnVuY3Rpb25zIGFyZSBxdWl0ZSBzaW1pbGFyLCBzbyBjb21iaW5lIHRoZW0gd2l0aCB0 aGUgdXNlIG9mIGEgbmV3CmFyZ3VtZW50IGZvciBhIGZ1bmN0aW9uIHRoYXQgZGV0ZWN0cyBsb25n IHB1bHNlcy4gVGhpcyB3aWxsIGJlIGFsc28KbmVlZGVkIGJ5IGFuIHVwY29taW5nIHBhdGNoIGFk ZGluZyBzdXBwb3J0IGZvciBCWFQgbG9uZyBwdWxzZSBkZXRlY3Rpb24uCgpObyBmdW5jdGlvbmFs IGNoYW5nZS4KCnYyOgotIHJlYmFzZSBvbiB0b3AgLW5pZ2h0bHkgKERhbmllbCkKClNpZ25lZC1v ZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFNvbmlr YSBKaW5kYWwgPHNvbmlrYS5qaW5kYWxAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMgfCA1NyArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDM4IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IGQ4N2YxNzMuLjk0MTBhYWIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9pcnEuYwpAQCAtMTI1Niw5ICsxMjU2LDEwIEBAIHN0YXRpYyBib29sIGk5eHhfcG9y dF9ob3RwbHVnX2xvbmdfZGV0ZWN0KGVudW0gcG9ydCBwb3J0LCB1MzIgdmFsKQogfQogCiAvKiBH ZXQgYSBiaXQgbWFzayBvZiBwaW5zIHRoYXQgaGF2ZSB0cmlnZ2VyZWQsIGFuZCB3aGljaCBvbmVz IG1heSBiZSBsb25nLiAqLwotc3RhdGljIHZvaWQgcGNoX2dldF9ocGRfcGlucyh1MzIgKnBpbl9t YXNrLCB1MzIgKmxvbmdfbWFzaywKK3N0YXRpYyB2b2lkIGludGVsX2dldF9ocGRfcGlucyh1MzIg KnBpbl9tYXNrLCB1MzIgKmxvbmdfbWFzaywKIAkJCSAgICAgdTMyIGhvdHBsdWdfdHJpZ2dlciwg dTMyIGRpZ19ob3RwbHVnX3JlZywKLQkJCSAgICAgY29uc3QgdTMyIGhwZFtIUERfTlVNX1BJTlNd KQorCQkJICAgICBjb25zdCB1MzIgaHBkW0hQRF9OVU1fUElOU10sCisJCQkgICAgIGJvb2wgbG9u Z19wdWxzZV9kZXRlY3QoZW51bSBwb3J0IHBvcnQsIHUzMiB2YWwpKQogewogCWVudW0gcG9ydCBw b3J0OwogCWludCBpOwpAQCAtMTI3Myw3ICsxMjc0LDcgQEAgc3RhdGljIHZvaWQgcGNoX2dldF9o cGRfcGlucyh1MzIgKnBpbl9tYXNrLCB1MzIgKmxvbmdfbWFzaywKIAkJKnBpbl9tYXNrIHw9IEJJ VChpKTsKIAogCQlwb3J0ID0gaW50ZWxfaHBkX3Bpbl90b19wb3J0KGkpOwotCQlpZiAocGNoX3Bv cnRfaG90cGx1Z19sb25nX2RldGVjdChwb3J0LCBkaWdfaG90cGx1Z19yZWcpKQorCQlpZiAobG9u Z19wdWxzZV9kZXRlY3QocG9ydCwgZGlnX2hvdHBsdWdfcmVnKSkKIAkJCSpsb25nX21hc2sgfD0g QklUKGkpOwogCX0KIApAQCAtMTI4MiwzNCArMTI4Myw2IEBAIHN0YXRpYyB2b2lkIHBjaF9nZXRf aHBkX3BpbnModTMyICpwaW5fbWFzaywgdTMyICpsb25nX21hc2ssCiAKIH0KIAotLyogR2V0IGEg Yml0IG1hc2sgb2YgcGlucyB0aGF0IGhhdmUgdHJpZ2dlcmVkLCBhbmQgd2hpY2ggb25lcyBtYXkg YmUgbG9uZy4gKi8KLXN0YXRpYyB2b2lkIGk5eHhfZ2V0X2hwZF9waW5zKHUzMiAqcGluX21hc2ss IHUzMiAqbG9uZ19tYXNrLAotCQkJICAgICAgdTMyIGhvdHBsdWdfdHJpZ2dlciwgY29uc3QgdTMy IGhwZFtIUERfTlVNX1BJTlNdKQotewotCWVudW0gcG9ydCBwb3J0OwotCWludCBpOwotCi0JKnBp bl9tYXNrID0gMDsKLQkqbG9uZ19tYXNrID0gMDsKLQotCWlmICghaG90cGx1Z190cmlnZ2VyKQot CQlyZXR1cm47Ci0KLQlmb3JfZWFjaF9ocGRfcGluKGkpIHsKLQkJaWYgKChocGRbaV0gJiBob3Rw bHVnX3RyaWdnZXIpID09IDApCi0JCQljb250aW51ZTsKLQotCQkqcGluX21hc2sgfD0gQklUKGkp OwotCi0JCXBvcnQgPSBpbnRlbF9ocGRfcGluX3RvX3BvcnQoaSk7Ci0JCWlmIChpOXh4X3BvcnRf aG90cGx1Z19sb25nX2RldGVjdChwb3J0LCBob3RwbHVnX3RyaWdnZXIpKQotCQkJKmxvbmdfbWFz ayB8PSBCSVQoaSk7Ci0JfQotCi0JRFJNX0RFQlVHX0RSSVZFUigiaG90cGx1ZyBldmVudCByZWNl aXZlZCwgc3RhdCAweCUwOHgsIHBpbnMgMHglMDh4XG4iLAotCQkJIGhvdHBsdWdfdHJpZ2dlciwg KnBpbl9tYXNrKTsKLX0KLQogc3RhdGljIHZvaWQgZ21idXNfaXJxX2hhbmRsZXIoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwpAQCAtMTU0Nyw3ICsxNTIwLDkgQEAgc3RhdGljIHZvaWQgaTl4eF9o cGRfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoSVNfRzRYKGRldikg fHwgSVNfVkFMTEVZVklFVyhkZXYpKSB7CiAJCXUzMiBob3RwbHVnX3RyaWdnZXIgPSBob3RwbHVn X3N0YXR1cyAmIEhPVFBMVUdfSU5UX1NUQVRVU19HNFg7CiAKLQkJaTl4eF9nZXRfaHBkX3BpbnMo JnBpbl9tYXNrLCAmbG9uZ19tYXNrLCBob3RwbHVnX3RyaWdnZXIsIGhwZF9zdGF0dXNfZzR4KTsK KwkJaW50ZWxfZ2V0X2hwZF9waW5zKCZwaW5fbWFzaywgJmxvbmdfbWFzaywgaG90cGx1Z190cmln Z2VyLAorCQkJCSAgIGhvdHBsdWdfdHJpZ2dlciwgaHBkX3N0YXR1c19nNHgsCisJCQkJICAgaTl4 eF9wb3J0X2hvdHBsdWdfbG9uZ19kZXRlY3QpOwogCQlpbnRlbF9ocGRfaXJxX2hhbmRsZXIoZGV2 LCBwaW5fbWFzaywgbG9uZ19tYXNrKTsKIAogCQlpZiAoaG90cGx1Z19zdGF0dXMgJiBEUF9BVVhf Q0hBTk5FTF9NQVNLX0lOVF9TVEFUVVNfRzRYKQpAQCAtMTU1NSw3ICsxNTMwLDkgQEAgc3RhdGlj IHZvaWQgaTl4eF9ocGRfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl9IGVs c2UgewogCQl1MzIgaG90cGx1Z190cmlnZ2VyID0gaG90cGx1Z19zdGF0dXMgJiBIT1RQTFVHX0lO VF9TVEFUVVNfSTkxNTsKIAotCQlpOXh4X2dldF9ocGRfcGlucygmcGluX21hc2ssICZsb25nX21h c2ssIGhvdHBsdWdfdHJpZ2dlciwgaHBkX3N0YXR1c19pOTE1KTsKKwkJaW50ZWxfZ2V0X2hwZF9w aW5zKCZwaW5fbWFzaywgJmxvbmdfbWFzaywgaG90cGx1Z190cmlnZ2VyLAorCQkJCSAgIGhvdHBs dWdfdHJpZ2dlciwgaHBkX3N0YXR1c19nNHgsCisJCQkJICAgaTl4eF9wb3J0X2hvdHBsdWdfbG9u Z19kZXRlY3QpOwogCQlpbnRlbF9ocGRfaXJxX2hhbmRsZXIoZGV2LCBwaW5fbWFzaywgbG9uZ19t YXNrKTsKIAl9CiB9CkBAIC0xNjYyLDggKzE2MzksOSBAQCBzdGF0aWMgdm9pZCBpYnhfaXJxX2hh bmRsZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIHBjaF9paXIpCiAJCWRpZ19ob3RwbHVn X3JlZyA9IEk5MTVfUkVBRChQQ0hfUE9SVF9IT1RQTFVHKTsKIAkJSTkxNV9XUklURShQQ0hfUE9S VF9IT1RQTFVHLCBkaWdfaG90cGx1Z19yZWcpOwogCi0JCXBjaF9nZXRfaHBkX3BpbnMoJnBpbl9t YXNrLCAmbG9uZ19tYXNrLCBob3RwbHVnX3RyaWdnZXIsCi0JCQkJIGRpZ19ob3RwbHVnX3JlZywg aHBkX2lieCk7CisJCWludGVsX2dldF9ocGRfcGlucygmcGluX21hc2ssICZsb25nX21hc2ssIGhv dHBsdWdfdHJpZ2dlciwKKwkJCQkgICBkaWdfaG90cGx1Z19yZWcsIGhwZF9pYngsCisJCQkJICAg cGNoX3BvcnRfaG90cGx1Z19sb25nX2RldGVjdCk7CiAJCWludGVsX2hwZF9pcnFfaGFuZGxlcihk ZXYsIHBpbl9tYXNrLCBsb25nX21hc2spOwogCX0KIApAQCAtMTc2Myw4ICsxNzQxLDEwIEBAIHN0 YXRpYyB2b2lkIGNwdF9pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgcGNo X2lpcikKIAogCQlkaWdfaG90cGx1Z19yZWcgPSBJOTE1X1JFQUQoUENIX1BPUlRfSE9UUExVRyk7 CiAJCUk5MTVfV1JJVEUoUENIX1BPUlRfSE9UUExVRywgZGlnX2hvdHBsdWdfcmVnKTsKLQkJcGNo X2dldF9ocGRfcGlucygmcGluX21hc2ssICZsb25nX21hc2ssIGhvdHBsdWdfdHJpZ2dlciwKLQkJ CQkgZGlnX2hvdHBsdWdfcmVnLCBocGRfY3B0KTsKKworCQlpbnRlbF9nZXRfaHBkX3BpbnMoJnBp bl9tYXNrLCAmbG9uZ19tYXNrLCBob3RwbHVnX3RyaWdnZXIsCisJCQkJICAgZGlnX2hvdHBsdWdf cmVnLCBocGRfY3B0LAorCQkJCSAgIHBjaF9wb3J0X2hvdHBsdWdfbG9uZ19kZXRlY3QpOwogCQlp bnRlbF9ocGRfaXJxX2hhbmRsZXIoZGV2LCBwaW5fbWFzaywgbG9uZ19tYXNrKTsKIAl9CiAKQEAg LTE5ODEsNyArMTk2MSw4IEBAIHN0YXRpYyB2b2lkIGJ4dF9ocGRfaGFuZGxlcihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCB1aW50MzJfdCBpaXJfc3RhdHVzKQogCS8qIENsZWFyIHN0aWNreSBiaXRz IGluIGhwZCBzdGF0dXMgKi8KIAlJOTE1X1dSSVRFKEJYVF9IT1RQTFVHX0NUTCwgaHBfY29udHJv bCk7CiAKLQlwY2hfZ2V0X2hwZF9waW5zKCZwaW5fbWFzaywgJmxvbmdfbWFzaywgaHBfdHJpZ2dl ciwgaHBfY29udHJvbCwgaHBkX2J4dCk7CisJaW50ZWxfZ2V0X2hwZF9waW5zKCZwaW5fbWFzaywg JmxvbmdfbWFzaywgaHBfdHJpZ2dlciwgaHBfY29udHJvbCwKKwkJCSAgIGhwZF9ieHQsIHBjaF9w b3J0X2hvdHBsdWdfbG9uZ19kZXRlY3QpOwogCWludGVsX2hwZF9pcnFfaGFuZGxlcihkZXYsIHBp bl9tYXNrLCBsb25nX21hc2spOwogfQogCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK