From mboxrd@z Thu Jan  1 00:00:00 1970
From: Imre Deak <imre.deak@intel.com>
Subject: [PATCH v2 2/3] drm/i915: don't use HPD_PORT_A as an
	alias for HPD_NONE
Date: Tue, 21 Jul 2015 15:32:45 -0700
Message-ID: <1437517965-2605-2-git-send-email-imre.deak@intel.com>
References: <1437517965-2605-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 7F36F6E766
 for <intel-gfx@lists.freedesktop.org>; Tue, 21 Jul 2015 15:32:46 -0700 (PDT)
In-Reply-To: <1437517965-2605-1-git-send-email-imre.deak@intel.com>
In-Reply-To: <1437428619-30160-3-git-send-email-imre.deak@intel.com>
References: <1437428619-30160-3-git-send-email-imre.deak@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

Q3VycmVudGx5IEhQRF9QT1JUX0EgaXMgdXNlZCBhcyBhbiBhbGlhcyBmb3IgSFBEX05PTkUgdG8g
bWVhbiB0aGF0IHRoZQpnaXZlbiBwb3J0IGRvZXNuJ3Qgc3VwcG9ydCBsb25nL3Nob3J0IEhQRCBw
dWxzZSBkZXRlY3Rpb24uIFNEVk8gYW5kIENSVApwb3J0cyBhcmUgbGlrZSB0aGlzIGFuZCBmb3Ig
dGhlc2UgcG9ydHMgd2Ugb25seSB3YW50IHRvIGtub3cgd2hldGhlciBhbgpob3QgcGx1ZyBldmVu
dCB3YXMgZGV0ZWN0ZWQgb24gdGhlIGNvcnJlc3BvbmRpbmcgcGluLiBTaW5jZSBhdCBsZWFzdCBv
bgpCWFQgd2UgbmVlZCBsb25nL3Nob3J0IHB1bHNlIGRldGVjdGlvbiBvbiBQT1JUIEEgYXMgd2Vs
bCAoYWRkZWQgYnkgdGhlCm5leHQgcGF0Y2gpIHJlbW92ZSB0aGlzIGFsaWFzaW5nIG9mIEhQRF9Q
T1JUX0EvSFBEX05PTkUgYW5kIGxldCB0aGUKcmV0dXJuIHZhbHVlIG9mIGludGVsX2hwZF9waW5f
dG9fcG9ydCgpIHNob3cgd2hldGhlciBsb25nL3Nob3J0IHB1bHNlCmRldGVjdGlvbiBpcyBzdXBw
b3J0ZWQgb24gdGhlIHBhc3NlZCBpbiBwaW4uCgpObyBmdW5jdGlvbmFsIGNoYW5nZS4KCnYyOgot
IHJlYmFzZSBvbiB0b3Agb2YgLW5pZ2h0bHkgKERhbmllbCkKLSBtYWtlIHRoZSBjaGVjayBmb3Ig
aW50ZWxfaHBkX3Bpbl90b19wb3J0KCkgcmV0dXJuIHZhbHVlIG1vcmUgcmVhZGFibGUKICAoU2l2
YWt1bWFyKQoKU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgpS
ZXZpZXdlZC1ieTogU29uaWthIEppbmRhbCA8c29uaWthLmppbmRhbEBpbnRlbC5jb20+ClJldmll
d2VkLWJ5OiBTaXZha3VtYXIgVGh1bGFzaW1hbmkgPHNpdmFrdW1hci50aHVsYXNpbWFuaUBpbnRl
bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDQgKyst
LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgIHwgIDQgKysrLQogZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jIHwgMjAgKysrKysrKysrKysrKy0tLS0tLS0K
IDMgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYjg3NmU3OC4uYjk0YWRhOSAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2Rydi5oCkBAIC0yMDYsMTEgKzIwNiwxMSBAQCBlbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJf
ZG9tYWluIHsKIAogZW51bSBocGRfcGluIHsKIAlIUERfTk9ORSA9IDAsCi0JSFBEX1BPUlRfQSA9
IEhQRF9OT05FLCAvKiBQT1JUX0EgaXMgaW50ZXJuYWwgKi8KIAlIUERfVFYgPSBIUERfTk9ORSwg
ICAgIC8qIFRWIGlzIGtub3duIHRvIGJlIHVucmVsaWFibGUgKi8KIAlIUERfQ1JULAogCUhQRF9T
RFZPX0IsCiAJSFBEX1NEVk9fQywKKwlIUERfUE9SVF9BLAogCUhQRF9QT1JUX0IsCiAJSFBEX1BP
UlRfQywKIAlIUERfUE9SVF9ELApAQCAtMjY0OCw3ICsyNjQ4LDcgQEAgdm9pZCBpbnRlbF9ocGRf
aXJxX2hhbmRsZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIHBpbl9tYXNrLCB1MzIgbG9u
Z19tYXNrKTsKIHZvaWQgaW50ZWxfaHBkX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl
dl9wcml2KTsKIHZvaWQgaW50ZWxfaHBkX2luaXRfd29yayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0
ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9ocGRfY2FuY2VsX3dvcmsoc3RydWN0IGRybV9pOTE1
X3ByaXZhdGUgKmRldl9wcml2KTsKLWVudW0gcG9ydCBpbnRlbF9ocGRfcGluX3RvX3BvcnQoZW51
bSBocGRfcGluIHBpbik7Citib29sIGludGVsX2hwZF9waW5fdG9fcG9ydChlbnVtIGhwZF9waW4g
cGluLCBlbnVtIHBvcnQgKnBvcnQpOwogCiAvKiBpOTE1X2lycS5jICovCiB2b2lkIGk5MTVfcXVl
dWVfaGFuZ2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx
LmMKaW5kZXggOTQxMGFhYi4uZjA4ZWM5YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0x
MjczLDcgKzEyNzMsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9nZXRfaHBkX3BpbnModTMyICpwaW5f
bWFzaywgdTMyICpsb25nX21hc2ssCiAKIAkJKnBpbl9tYXNrIHw9IEJJVChpKTsKIAotCQlwb3J0
ID0gaW50ZWxfaHBkX3Bpbl90b19wb3J0KGkpOworCQlpZiAoIWludGVsX2hwZF9waW5fdG9fcG9y
dChpLCAmcG9ydCkpCisJCQljb250aW51ZTsKKwogCQlpZiAobG9uZ19wdWxzZV9kZXRlY3QocG9y
dCwgZGlnX2hvdHBsdWdfcmVnKSkKIAkJCSpsb25nX21hc2sgfD0gQklUKGkpOwogCX0KZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hvdHBsdWcuYyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2hvdHBsdWcuYwppbmRleCAzYzkxNzFmLi4wMzJhMGJmIDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ob3RwbHVnLmMKKysrIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jCkBAIC03NiwxNyArNzYsMjMgQEAKICAqIGl0IHdp
bGwgdXNlIGk5MTVfaG90cGx1Z193b3JrX2Z1bmMgd2hlcmUgdGhpcyBsb2dpYyBpcyBoYW5kbGVk
LgogICovCiAKLWVudW0gcG9ydCBpbnRlbF9ocGRfcGluX3RvX3BvcnQoZW51bSBocGRfcGluIHBp
bikKK2Jvb2wgaW50ZWxfaHBkX3Bpbl90b19wb3J0KGVudW0gaHBkX3BpbiBwaW4sIGVudW0gcG9y
dCAqcG9ydCkKIHsKIAlzd2l0Y2ggKHBpbikgeworCWNhc2UgSFBEX1BPUlRfQToKKwkJKnBvcnQg
PSBQT1JUX0E7CisJCXJldHVybiB0cnVlOwogCWNhc2UgSFBEX1BPUlRfQjoKLQkJcmV0dXJuIFBP
UlRfQjsKKwkJKnBvcnQgPSBQT1JUX0I7CisJCXJldHVybiB0cnVlOwogCWNhc2UgSFBEX1BPUlRf
QzoKLQkJcmV0dXJuIFBPUlRfQzsKKwkJKnBvcnQgPSBQT1JUX0M7CisJCXJldHVybiB0cnVlOwog
CWNhc2UgSFBEX1BPUlRfRDoKLQkJcmV0dXJuIFBPUlRfRDsKKwkJKnBvcnQgPSBQT1JUX0Q7CisJ
CXJldHVybiB0cnVlOwogCWRlZmF1bHQ6Ci0JCXJldHVybiBQT1JUX0E7IC8qIG5vIGhwZCAqLwor
CQlyZXR1cm4gZmFsc2U7CS8qIG5vIGhwZCAqLwogCX0KIH0KIApAQCAtMzY5LDggKzM3NSw4IEBA
IHZvaWQgaW50ZWxfaHBkX2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlm
ICghKEJJVChpKSAmIHBpbl9tYXNrKSkKIAkJCWNvbnRpbnVlOwogCi0JCXBvcnQgPSBpbnRlbF9o
cGRfcGluX3RvX3BvcnQoaSk7Ci0JCWlzX2RpZ19wb3J0ID0gcG9ydCAmJiBkZXZfcHJpdi0+aG90
cGx1Zy5pcnFfcG9ydFtwb3J0XTsKKwkJaXNfZGlnX3BvcnQgPSBpbnRlbF9ocGRfcGluX3RvX3Bv
cnQoaSwgJnBvcnQpICYmCisJCQkgICAgICBkZXZfcHJpdi0+aG90cGx1Zy5pcnFfcG9ydFtwb3J0
XTsKIAogCQlpZiAoaXNfZGlnX3BvcnQpIHsKIAkJCWJvb2wgbG9uZ19ocGQgPSBsb25nX21hc2sg
JiBCSVQoaSk7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl
c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p
bnRlbC1nZngK