From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 2/3] drm/i915: don't use HPD_PORT_A as an alias for HPD_NONE Date: Mon, 20 Jul 2015 14:43:38 -0700 Message-ID: <1437428619-30160-3-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 B31636E0D7 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 Q3VycmVudGx5IEhQRF9QT1JUX0EgaXMgdXNlZCBhcyBhbiBhbGlhcyBmb3IgSFBEX05PTkUgdG8g bWVhbiB0aGF0IHRoZQpnaXZlbiBwb3J0IGRvZXNuJ3Qgc3VwcG9ydCBsb25nL3Nob3J0IEhQRCBw dWxzZSBkZXRlY3Rpb24uIFNEVk8gYW5kIENSVApwb3J0cyBhcmUgbGlrZSB0aGlzIGFuZCBmb3Ig dGhlc2UgcG9ydHMgd2Ugb25seSB3YW50IHRvIGtub3cgd2hldGhlciBhbgpob3QgcGx1ZyBldmVu dCB3YXMgZGV0ZWN0ZWQgb24gdGhlIGNvcnJlc3BvbmRpbmcgcGluLiBTaW5jZSBhdCBsZWFzdCBv bgpCWFQgd2UgbmVlZCBsb25nL3Nob3J0IHB1bHNlIGRldGVjdGlvbiBvbiBQT1JUIEEgYXMgd2Vs bCAoYWRkZWQgYnkgdGhlCm5leHQgcGF0Y2gpIHJlbW92ZSB0aGlzIGFsaWFzaW5nIG9mIEhQRF9Q T1JUX0EvSFBEX05PTkUgYW5kIGxldCB0aGUKcmV0dXJuIHZhbHVlIG9mIGludGVsX2hwZF9waW5f dG9fcG9ydCgpIHNob3cgd2hldGhlciBsb25nL3Nob3J0IHB1bHNlCmRldGVjdGlvbiBpcyBzdXBw b3J0ZWQgb24gdGhlIHBhc3NlZCBpbiBwaW4uCgpObyBmdW5jdGlvbmFsIGNoYW5nZS4KClNpZ25l ZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5jICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o b3RwbHVnLmMgfCAyMCArKysrKysrKysrKysrLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxNyBp bnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRl eCA3OGQ2YzdhLi5lYmZkNWE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIwNiwxMSAr MjA2LDExIEBAIGVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gewogCiBlbnVtIGhwZF9w aW4gewogCUhQRF9OT05FID0gMCwKLQlIUERfUE9SVF9BID0gSFBEX05PTkUsIC8qIFBPUlRfQSBp cyBpbnRlcm5hbCAqLwogCUhQRF9UViA9IEhQRF9OT05FLCAgICAgLyogVFYgaXMga25vd24gdG8g YmUgdW5yZWxpYWJsZSAqLwogCUhQRF9DUlQsCiAJSFBEX1NEVk9fQiwKIAlIUERfU0RWT19DLAor CUhQRF9QT1JUX0EsCiAJSFBEX1BPUlRfQiwKIAlIUERfUE9SVF9DLAogCUhQRF9QT1JUX0QsCkBA IC0yNjI3LDcgKzI2MjcsNyBAQCB2b2lkIGludGVsX2hwZF9pcnFfaGFuZGxlcihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCB1MzIgcGluX21hc2ssIHUzMiBsb25nX21hc2spOwogdm9pZCBpbnRlbF9o cGRfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9o cGRfaW5pdF93b3JrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGlu dGVsX2hwZF9jYW5jZWxfd29yayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwot ZW51bSBwb3J0IGludGVsX2hwZF9waW5fdG9fcG9ydChlbnVtIGhwZF9waW4gcGluKTsKK2Jvb2wg aW50ZWxfaHBkX3Bpbl90b19wb3J0KGVudW0gaHBkX3BpbiBwaW4sIGVudW0gcG9ydCAqcG9ydCk7 CiAKIC8qIGk5MTVfaXJxLmMgKi8KIHZvaWQgaTkxNV9xdWV1ZV9oYW5nY2hlY2soc3RydWN0IGRy bV9kZXZpY2UgKmRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2ly cS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCAzMDZkZTc4Li40YWQ3 YTMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTEyNzYsOCArMTI3Niw4IEBAIHN0YXRp YyB2b2lkIGludGVsX2dldF9ocGRfcGlucyh1MzIgKnBpbl9tYXNrLCB1MzIgKmxvbmdfbWFzaywK IAogCQkqcGluX21hc2sgfD0gQklUKGkpOwogCi0JCXBvcnQgPSBpbnRlbF9ocGRfcGluX3RvX3Bv cnQoaSk7Ci0JCWlmIChsb25nX3B1bHNlX2RldGVjdChwb3J0LCBkaWdfaG90cGx1Z19yZWcpKQor CQlpZiAoaW50ZWxfaHBkX3Bpbl90b19wb3J0KGksICZwb3J0KSAmJgorCQkgICAgbG9uZ19wdWxz ZV9kZXRlY3QocG9ydCwgZGlnX2hvdHBsdWdfcmVnKSkKIAkJCSpsb25nX21hc2sgfD0gQklUKGkp OwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jCmluZGV4IDNjNTNhYWMuLjhj ZGE3YjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hvdHBsdWcuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ob3RwbHVnLmMKQEAgLTI5LDE3ICsyOSwy MyBAQAogI2luY2x1ZGUgImk5MTVfZHJ2LmgiCiAjaW5jbHVkZSAiaW50ZWxfZHJ2LmgiCiAKLWVu dW0gcG9ydCBpbnRlbF9ocGRfcGluX3RvX3BvcnQoZW51bSBocGRfcGluIHBpbikKK2Jvb2wgaW50 ZWxfaHBkX3Bpbl90b19wb3J0KGVudW0gaHBkX3BpbiBwaW4sIGVudW0gcG9ydCAqcG9ydCkKIHsK IAlzd2l0Y2ggKHBpbikgeworCWNhc2UgSFBEX1BPUlRfQToKKwkJKnBvcnQgPSBQT1JUX0E7CisJ CXJldHVybiB0cnVlOwogCWNhc2UgSFBEX1BPUlRfQjoKLQkJcmV0dXJuIFBPUlRfQjsKKwkJKnBv cnQgPSBQT1JUX0I7CisJCXJldHVybiB0cnVlOwogCWNhc2UgSFBEX1BPUlRfQzoKLQkJcmV0dXJu IFBPUlRfQzsKKwkJKnBvcnQgPSBQT1JUX0M7CisJCXJldHVybiB0cnVlOwogCWNhc2UgSFBEX1BP UlRfRDoKLQkJcmV0dXJuIFBPUlRfRDsKKwkJKnBvcnQgPSBQT1JUX0Q7CisJCXJldHVybiB0cnVl OwogCWRlZmF1bHQ6Ci0JCXJldHVybiBQT1JUX0E7IC8qIG5vIGhwZCAqLworCQlyZXR1cm4gZmFs c2U7CS8qIG5vIGhwZCAqLwogCX0KIH0KIApAQCAtMzIyLDggKzMyOCw4IEBAIHZvaWQgaW50ZWxf aHBkX2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmICghKEJJVChpKSAm IHBpbl9tYXNrKSkKIAkJCWNvbnRpbnVlOwogCi0JCXBvcnQgPSBpbnRlbF9ocGRfcGluX3RvX3Bv cnQoaSk7Ci0JCWlzX2RpZ19wb3J0ID0gcG9ydCAmJiBkZXZfcHJpdi0+aG90cGx1Zy5pcnFfcG9y dFtwb3J0XTsKKwkJaXNfZGlnX3BvcnQgPSBpbnRlbF9ocGRfcGluX3RvX3BvcnQoaSwgJnBvcnQp ICYmCisJCQkgICAgICBkZXZfcHJpdi0+aG90cGx1Zy5pcnFfcG9ydFtwb3J0XTsKIAogCQlpZiAo aXNfZGlnX3BvcnQpIHsKIAkJCWJvb2wgbG9uZ19ocGQgPSBsb25nX21hc2sgJiBCSVQoaSk7Ci0t IAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK