From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 1/3] drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins Date: Mon, 20 Jul 2015 14:43:37 -0700 Message-ID: <1437428619-30160-2-git-send-email-imre.deak@intel.com> References: <1437428619-30160-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 97E266E773 for ; Mon, 20 Jul 2015 14:43:41 -0700 (PDT) In-Reply-To: <1437428619-30160-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 VGhlc2UgZnVuY3Rpb25zIGFyZSBxdWl0ZSBzaW1pbGFyLCBzbyBjb21iaW5lIHRoZW0gd2l0aCB0 aGUgdXNlIG9mIGEgbmV3CmFyZ3VtZW50IGZvciBhIGZ1bmN0aW9uIHRoYXQgZGV0ZWN0cyBsb25n IHB1bHNlcy4gVGhpcyB3aWxsIGJlIGFsc28KbmVlZGVkIGJ5IGFuIHVwY29taW5nIHBhdGNoIGFk ZGluZyBzdXBwb3J0IGZvciBCWFQgbG9uZyBwdWxzZSBkZXRlY3Rpb24uCgpObyBmdW5jdGlvbmFs IGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIHwgNTQgKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25z KCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCBhNmZiZTY0 Li4zMDZkZTc4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTEyNTYsOSArMTI1NiwxMCBA QCBzdGF0aWMgYm9vbCBpOXh4X3BvcnRfaG90cGx1Z19sb25nX2RldGVjdChlbnVtIHBvcnQgcG9y dCwgdTMyIHZhbCkKIH0KIAogLyogR2V0IGEgYml0IG1hc2sgb2YgcGlucyB0aGF0IGhhdmUgdHJp Z2dlcmVkLCBhbmQgd2hpY2ggb25lcyBtYXkgYmUgbG9uZy4gKi8KLXN0YXRpYyB2b2lkIHBjaF9n ZXRfaHBkX3BpbnModTMyICpwaW5fbWFzaywgdTMyICpsb25nX21hc2ssCitzdGF0aWMgdm9pZCBp bnRlbF9nZXRfaHBkX3BpbnModTMyICpwaW5fbWFzaywgdTMyICpsb25nX21hc2ssCiAJCQkgICAg IHUzMiBob3RwbHVnX3RyaWdnZXIsIHUzMiBkaWdfaG90cGx1Z19yZWcsCi0JCQkgICAgIGNvbnN0 IHUzMiBocGRbSFBEX05VTV9QSU5TXSkKKwkJCSAgICAgY29uc3QgdTMyIGhwZFtIUERfTlVNX1BJ TlNdLAorCQkJICAgICBib29sIGxvbmdfcHVsc2VfZGV0ZWN0KGVudW0gcG9ydCBwb3J0LCB1MzIg dmFsKSkKIHsKIAllbnVtIHBvcnQgcG9ydDsKIAlpbnQgaTsKQEAgLTEyNzYsNyArMTI3Nyw3IEBA IHN0YXRpYyB2b2lkIHBjaF9nZXRfaHBkX3BpbnModTMyICpwaW5fbWFzaywgdTMyICpsb25nX21h c2ssCiAJCSpwaW5fbWFzayB8PSBCSVQoaSk7CiAKIAkJcG9ydCA9IGludGVsX2hwZF9waW5fdG9f cG9ydChpKTsKLQkJaWYgKHBjaF9wb3J0X2hvdHBsdWdfbG9uZ19kZXRlY3QocG9ydCwgZGlnX2hv dHBsdWdfcmVnKSkKKwkJaWYgKGxvbmdfcHVsc2VfZGV0ZWN0KHBvcnQsIGRpZ19ob3RwbHVnX3Jl ZykpCiAJCQkqbG9uZ19tYXNrIHw9IEJJVChpKTsKIAl9CiAKQEAgLTEyODUsMzQgKzEyODYsNiBA QCBzdGF0aWMgdm9pZCBwY2hfZ2V0X2hwZF9waW5zKHUzMiAqcGluX21hc2ssIHUzMiAqbG9uZ19t YXNrLAogCiB9CiAKLS8qIEdldCBhIGJpdCBtYXNrIG9mIHBpbnMgdGhhdCBoYXZlIHRyaWdnZXJl ZCwgYW5kIHdoaWNoIG9uZXMgbWF5IGJlIGxvbmcuICovCi1zdGF0aWMgdm9pZCBpOXh4X2dldF9o cGRfcGlucyh1MzIgKnBpbl9tYXNrLCB1MzIgKmxvbmdfbWFzaywKLQkJCSAgICAgIHUzMiBob3Rw bHVnX3RyaWdnZXIsIGNvbnN0IHUzMiBocGRbSFBEX05VTV9QSU5TXSkKLXsKLQllbnVtIHBvcnQg cG9ydDsKLQlpbnQgaTsKLQotCSpwaW5fbWFzayA9IDA7Ci0JKmxvbmdfbWFzayA9IDA7Ci0KLQlp ZiAoIWhvdHBsdWdfdHJpZ2dlcikKLQkJcmV0dXJuOwotCi0JZm9yX2VhY2hfaHBkX3BpbihpKSB7 Ci0JCWlmICgoaHBkW2ldICYgaG90cGx1Z190cmlnZ2VyKSA9PSAwKQotCQkJY29udGludWU7Ci0K LQkJKnBpbl9tYXNrIHw9IEJJVChpKTsKLQotCQlwb3J0ID0gaW50ZWxfaHBkX3Bpbl90b19wb3J0 KGkpOwotCQlpZiAoaTl4eF9wb3J0X2hvdHBsdWdfbG9uZ19kZXRlY3QocG9ydCwgaG90cGx1Z190 cmlnZ2VyKSkKLQkJCSpsb25nX21hc2sgfD0gQklUKGkpOwotCX0KLQotCURSTV9ERUJVR19EUklW RVIoImhvdHBsdWcgZXZlbnQgcmVjZWl2ZWQsIHN0YXQgMHglMDh4LCBwaW5zIDB4JTA4eFxuIiwK LQkJCSBob3RwbHVnX3RyaWdnZXIsICpwaW5fbWFzayk7Ci19Ci0KIHN0YXRpYyB2b2lkIGdtYnVz X2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTE1NTAsNyArMTUyMyw5 IEBAIHN0YXRpYyB2b2lkIGk5eHhfaHBkX2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJaWYgKElTX0c0WChkZXYpIHx8IElTX1ZBTExFWVZJRVcoZGV2KSkgewogCQl1MzIgaG90 cGx1Z190cmlnZ2VyID0gaG90cGx1Z19zdGF0dXMgJiBIT1RQTFVHX0lOVF9TVEFUVVNfRzRYOwog Ci0JCWk5eHhfZ2V0X2hwZF9waW5zKCZwaW5fbWFzaywgJmxvbmdfbWFzaywgaG90cGx1Z190cmln Z2VyLCBocGRfc3RhdHVzX2c0eCk7CisJCWludGVsX2dldF9ocGRfcGlucygmcGluX21hc2ssICZs b25nX21hc2ssIGhvdHBsdWdfdHJpZ2dlciwKKwkJCQkgICBob3RwbHVnX3RyaWdnZXIsIGhwZF9z dGF0dXNfZzR4LAorCQkJCSAgIGk5eHhfcG9ydF9ob3RwbHVnX2xvbmdfZGV0ZWN0KTsKIAkJaW50 ZWxfaHBkX2lycV9oYW5kbGVyKGRldiwgcGluX21hc2ssIGxvbmdfbWFzayk7CiAKIAkJaWYgKGhv dHBsdWdfc3RhdHVzICYgRFBfQVVYX0NIQU5ORUxfTUFTS19JTlRfU1RBVFVTX0c0WCkKQEAgLTE1 NTgsNyArMTUzMyw5IEBAIHN0YXRpYyB2b2lkIGk5eHhfaHBkX2lycV9oYW5kbGVyKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJfSBlbHNlIHsKIAkJdTMyIGhvdHBsdWdfdHJpZ2dlciA9IGhvdHBs dWdfc3RhdHVzICYgSE9UUExVR19JTlRfU1RBVFVTX0k5MTU7CiAKLQkJaTl4eF9nZXRfaHBkX3Bp bnMoJnBpbl9tYXNrLCAmbG9uZ19tYXNrLCBob3RwbHVnX3RyaWdnZXIsIGhwZF9zdGF0dXNfaTkx NSk7CisJCWludGVsX2dldF9ocGRfcGlucygmcGluX21hc2ssICZsb25nX21hc2ssIGhvdHBsdWdf dHJpZ2dlciwKKwkJCQkgICBob3RwbHVnX3RyaWdnZXIsIGhwZF9zdGF0dXNfZzR4LAorCQkJCSAg IGk5eHhfcG9ydF9ob3RwbHVnX2xvbmdfZGV0ZWN0KTsKIAkJaW50ZWxfaHBkX2lycV9oYW5kbGVy KGRldiwgcGluX21hc2ssIGxvbmdfbWFzayk7CiAJfQogfQpAQCAtMTY2NCw3ICsxNjQxLDkgQEAg c3RhdGljIHZvaWQgaWJ4X2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBw Y2hfaWlyKQogCWRpZ19ob3RwbHVnX3JlZyA9IEk5MTVfUkVBRChQQ0hfUE9SVF9IT1RQTFVHKTsK IAlJOTE1X1dSSVRFKFBDSF9QT1JUX0hPVFBMVUcsIGRpZ19ob3RwbHVnX3JlZyk7CiAKLQlwY2hf Z2V0X2hwZF9waW5zKCZwaW5fbWFzaywgJmxvbmdfbWFzaywgaG90cGx1Z190cmlnZ2VyLCBkaWdf aG90cGx1Z19yZWcsIGhwZF9pYngpOworCWludGVsX2dldF9ocGRfcGlucygmcGluX21hc2ssICZs b25nX21hc2ssIGhvdHBsdWdfdHJpZ2dlciwKKwkJCSAgIGRpZ19ob3RwbHVnX3JlZywgaHBkX2li eCwKKwkJCSAgIHBjaF9wb3J0X2hvdHBsdWdfbG9uZ19kZXRlY3QpOwogCWludGVsX2hwZF9pcnFf aGFuZGxlcihkZXYsIHBpbl9tYXNrLCBsb25nX21hc2spOwogCiAJaWYgKHBjaF9paXIgJiBTREVf QVVESU9fUE9XRVJfTUFTSykgewpAQCAtMTc2Myw3ICsxNzQyLDkgQEAgc3RhdGljIHZvaWQgY3B0 X2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBwY2hfaWlyKQogCWRpZ19o b3RwbHVnX3JlZyA9IEk5MTVfUkVBRChQQ0hfUE9SVF9IT1RQTFVHKTsKIAlJOTE1X1dSSVRFKFBD SF9QT1JUX0hPVFBMVUcsIGRpZ19ob3RwbHVnX3JlZyk7CiAKLQlwY2hfZ2V0X2hwZF9waW5zKCZw aW5fbWFzaywgJmxvbmdfbWFzaywgaG90cGx1Z190cmlnZ2VyLCBkaWdfaG90cGx1Z19yZWcsIGhw ZF9jcHQpOworCWludGVsX2dldF9ocGRfcGlucygmcGluX21hc2ssICZsb25nX21hc2ssIGhvdHBs dWdfdHJpZ2dlciwKKwkJCSAgIGRpZ19ob3RwbHVnX3JlZywgaHBkX2NwdCwKKwkJCSAgIHBjaF9w b3J0X2hvdHBsdWdfbG9uZ19kZXRlY3QpOwogCWludGVsX2hwZF9pcnFfaGFuZGxlcihkZXYsIHBp bl9tYXNrLCBsb25nX21hc2spOwogCiAJaWYgKHBjaF9paXIgJiBTREVfQVVESU9fUE9XRVJfTUFT S19DUFQpIHsKQEAgLTE5NzksNyArMTk2MCw4IEBAIHN0YXRpYyB2b2lkIGJ4dF9ocGRfaGFuZGxl cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MzJfdCBpaXJfc3RhdHVzKQogCS8qIENsZWFy IHN0aWNreSBiaXRzIGluIGhwZCBzdGF0dXMgKi8KIAlJOTE1X1dSSVRFKEJYVF9IT1RQTFVHX0NU TCwgaHBfY29udHJvbCk7CiAKLQlwY2hfZ2V0X2hwZF9waW5zKCZwaW5fbWFzaywgJmxvbmdfbWFz aywgaHBfdHJpZ2dlciwgaHBfY29udHJvbCwgaHBkX2J4dCk7CisJaW50ZWxfZ2V0X2hwZF9waW5z KCZwaW5fbWFzaywgJmxvbmdfbWFzaywgaHBfdHJpZ2dlciwgaHBfY29udHJvbCwKKwkJCSAgIGhw ZF9ieHQsIHBjaF9wb3J0X2hvdHBsdWdfbG9uZ19kZXRlY3QpOwogCWludGVsX2hwZF9pcnFfaGFu ZGxlcihkZXYsIHBpbl9tYXNrLCBsb25nX21hc2spOwogfQogCi0tIAoyLjEuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK