From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 2/4] drm/i915: Use connector_type instead of intel_encoder->type for DP. Date: Mon, 20 Jun 2016 15:57:37 +0200 Message-ID: <1466431059-8919-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1466431059-8919-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id B4E706E592 for ; Mon, 20 Jun 2016 13:57:44 +0000 (UTC) In-Reply-To: <1466431059-8919-1-git-send-email-maarten.lankhorst@linux.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 U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDE4 ICsrKysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCAxODg2N2Y1 MzM3ZDcuLjg3YjNlMzFmYjNiYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAg LTI5NTAsNyArMjk1MCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX2luZm8oc3RydWN0IHNlcV9m aWxlICptLAogCiAJc2VxX3ByaW50ZihtLCAiXHREUENEIHJldjogJXhcbiIsIGludGVsX2RwLT5k cGNkW0RQX0RQQ0RfUkVWXSk7CiAJc2VxX3ByaW50ZihtLCAiXHRhdWRpbyBzdXBwb3J0OiAlc1xu IiwgeWVzbm8oaW50ZWxfZHAtPmhhc19hdWRpbykpOwotCWlmIChpbnRlbF9lbmNvZGVyLT50eXBl ID09IElOVEVMX09VVFBVVF9FRFApCisJaWYgKGludGVsX2Nvbm5lY3Rvci0+YmFzZS5jb25uZWN0 b3JfdHlwZSA9PSBEUk1fTU9ERV9DT05ORUNUT1JfZURQKQogCQlpbnRlbF9wYW5lbF9pbmZvKG0s ICZpbnRlbF9jb25uZWN0b3ItPnBhbmVsKTsKIH0KIApAQCAtMzQ3MywxNyArMzQ3MywyMyBAQCBz dGF0aWMgaW50IGk5MTVfZHBfbXN0X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVz ZWQpCiB7CiAJc3RydWN0IGRybV9pbmZvX25vZGUgKm5vZGUgPSAoc3RydWN0IGRybV9pbmZvX25v ZGUgKikgbS0+cHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbm9kZS0+bWlub3It PmRldjsKLQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXI7CiAJc3RydWN0IGludGVsX2VuY29k ZXIgKmludGVsX2VuY29kZXI7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGln X3BvcnQ7CisJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKKwogCWRybV9tb2Rlc2V0 X2xvY2tfYWxsKGRldik7Ci0JbGlzdF9mb3JfZWFjaF9lbnRyeShlbmNvZGVyLCAmZGV2LT5tb2Rl X2NvbmZpZy5lbmNvZGVyX2xpc3QsIGhlYWQpIHsKLQkJaW50ZWxfZW5jb2RlciA9IHRvX2ludGVs X2VuY29kZXIoZW5jb2Rlcik7Ci0JCWlmIChpbnRlbF9lbmNvZGVyLT50eXBlICE9IElOVEVMX09V VFBVVF9ESVNQTEFZUE9SVCkKKwlkcm1fZm9yX2VhY2hfY29ubmVjdG9yKGNvbm5lY3RvciwgZGV2 KSB7CisJCWlmIChjb25uZWN0b3ItPmNvbm5lY3Rvcl90eXBlICE9IERSTV9NT0RFX0NPTk5FQ1RP Ul9EaXNwbGF5UG9ydCkKIAkJCWNvbnRpbnVlOwotCQlpbnRlbF9kaWdfcG9ydCA9IGVuY190b19k aWdfcG9ydChlbmNvZGVyKTsKKworCQlpbnRlbF9lbmNvZGVyID0gaW50ZWxfYXR0YWNoZWRfZW5j b2Rlcihjb25uZWN0b3IpOworCQlpZiAoIWludGVsX2VuY29kZXIgfHwgaW50ZWxfZW5jb2Rlci0+ dHlwZSA9PSBJTlRFTF9PVVRQVVRfRFBfTVNUKQorCQkJY29udGludWU7CisKKwkJaW50ZWxfZGln X3BvcnQgPSBlbmNfdG9fZGlnX3BvcnQoJmludGVsX2VuY29kZXItPmJhc2UpOwogCQlpZiAoIWlu dGVsX2RpZ19wb3J0LT5kcC5jYW5fbXN0KQogCQkJY29udGludWU7CisKIAkJc2VxX3ByaW50Ziht LCAiTVNUIFNvdXJjZSBQb3J0ICVjXG4iLAogCQkJICAgcG9ydF9uYW1lKGludGVsX2RpZ19wb3J0 LT5wb3J0KSk7CiAJCWRybV9kcF9tc3RfZHVtcF90b3BvbG9neShtLCAmaW50ZWxfZGlnX3BvcnQt PmRwLm1zdF9tZ3IpOwotLSAKMi41LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=