From: Ville Syrjala Subject: [PATCH v2 06/10] drm/i915: Pass encoder type to cnl_ddi_vswing_sequence() explicitly Date: Mon, 16 Oct 2017 17:57:01 +0300 Message-ID: <20171016145705.11780-7-ville.syrjala@linux.intel.com> References: <20171016145705.11780-1-ville.syrjala@linux.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 ESMTPS id CD1CE6E411 for ; Mon, 16 Oct 2017 14:57:32 +0000 (UTC) In-Reply-To: <20171016145705.11780-1-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmVu Y29kZXItPnR5cGUgaXMgdW5yZWxpYWJsZSBmb3IgRFAvSERNSSwgc28gcGFzcyBpdCBpbiBleHBs aWNpdHkgaW50bwpjbmxfZGRpX3Zzd2luZ19zZXF1ZW5jZSgpLiBUaGlzIG1hdGNoZXMgd2hhdCB3 ZSBkbyBmb3IgQlhULgoKdjI6IFBhc3MgaW50ZWxfZW5jb2RlciBkb3duIHRvIGNubF9kZGlfdnN3 aW5nX3Byb2dyYW0oKSwgYW5kCiAgICBjbGVhbiB1cCB0aGUgYXJndW1lbnQgdHlwZXMgd2hpbGUg YXQgaXQKClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51 eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgfCA1MyAr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MjUgaW5zZXJ0aW9ucygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGku YwppbmRleCAyZDg4NjE0OGE2NTMuLmNhYjcyMTc3Mjk5YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGRpLmMKQEAgLTE5MjAsMjAgKzE5MjAsMjEgQEAgdTggaW50ZWxfZGRpX2RwX3ZvbHRhZ2VfbWF4 KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCQlEUF9UUkFJTl9WT0xUQUdFX1NXSU5H X01BU0s7CiB9CiAKLXN0YXRpYyB2b2lkIGNubF9kZGlfdnN3aW5nX3Byb2dyYW0oc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSAgICB1MzIgbGV2ZWwsIGVudW0gcG9ydCBw b3J0LCBpbnQgdHlwZSkKK3N0YXRpYyB2b2lkIGNubF9kZGlfdnN3aW5nX3Byb2dyYW0oc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIsCisJCQkJICAgaW50IGxldmVsLCBlbnVtIGludGVsX291 dHB1dF90eXBlIHR5cGUpCiB7Ci0JY29uc3Qgc3RydWN0IGNubF9kZGlfYnVmX3RyYW5zICpkZGlf dHJhbnNsYXRpb25zID0gTlVMTDsKLQl1MzIgbl9lbnRyaWVzLCB2YWw7Ci0JaW50IGxuOworCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5k ZXYpOworCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoZW5jb2Rl cik7CisJY29uc3Qgc3RydWN0IGNubF9kZGlfYnVmX3RyYW5zICpkZGlfdHJhbnNsYXRpb25zOwor CWludCBuX2VudHJpZXMsIGxuOworCXUzMiB2YWw7CiAKLQlpZiAodHlwZSA9PSBJTlRFTF9PVVRQ VVRfSERNSSkgeworCWlmICh0eXBlID09IElOVEVMX09VVFBVVF9IRE1JKQogCQlkZGlfdHJhbnNs YXRpb25zID0gY25sX2dldF9idWZfdHJhbnNfaGRtaShkZXZfcHJpdiwgJm5fZW50cmllcyk7Ci0J fSBlbHNlIGlmICh0eXBlID09IElOVEVMX09VVFBVVF9EUCkgewotCQlkZGlfdHJhbnNsYXRpb25z ID0gY25sX2dldF9idWZfdHJhbnNfZHAoZGV2X3ByaXYsICZuX2VudHJpZXMpOwotCX0gZWxzZSBp ZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKSB7CisJZWxzZSBpZiAodHlwZSA9PSBJTlRFTF9P VVRQVVRfRURQKQogCQlkZGlfdHJhbnNsYXRpb25zID0gY25sX2dldF9idWZfdHJhbnNfZWRwKGRl dl9wcml2LCAmbl9lbnRyaWVzKTsKLQl9CisJZWxzZQorCQlkZGlfdHJhbnNsYXRpb25zID0gY25s X2dldF9idWZfdHJhbnNfZHAoZGV2X3ByaXYsICZuX2VudHJpZXMpOwogCiAJaWYgKFdBUk5fT04o ZGRpX3RyYW5zbGF0aW9ucyA9PSBOVUxMKSkKIAkJcmV0dXJuOwpAQCAtMTk4NiwyNiArMTk4Nywy MiBAQCBzdGF0aWMgdm9pZCBjbmxfZGRpX3Zzd2luZ19wcm9ncmFtKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAlJOTE1X1dSSVRFKENOTF9QT1JUX1RYX0RXN19HUlAocG9ydCks IHZhbCk7CiB9CiAKLXN0YXRpYyB2b2lkIGNubF9kZGlfdnN3aW5nX3NlcXVlbmNlKHN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyLCB1MzIgbGV2ZWwpCitzdGF0aWMgdm9pZCBjbmxfZGRpX3Zz d2luZ19zZXF1ZW5jZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKKwkJCQkgICAgaW50 IGxldmVsLCBlbnVtIGludGVsX291dHB1dF90eXBlIHR5cGUpCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7Ci0Jc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCA9IGVuY190b19pbnRlbF9kcCgmZW5jb2Rlci0+YmFzZSk7CiAJ ZW51bSBwb3J0IHBvcnQgPSBpbnRlbF9kZGlfZ2V0X2VuY29kZXJfcG9ydChlbmNvZGVyKTsKLQlp bnQgdHlwZSA9IGVuY29kZXItPnR5cGU7Ci0JaW50IHdpZHRoID0gMDsKLQlpbnQgcmF0ZSA9IDA7 CisJaW50IHdpZHRoLCByYXRlLCBsbjsKIAl1MzIgdmFsOwotCWludCBsbiA9IDA7CiAKLQlpZiAo KGludGVsX2RwKSAmJiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQIHx8IHR5cGUgPT0gSU5URUxf T1VUUFVUX0RQKSkgeworCWlmICh0eXBlID09IElOVEVMX09VVFBVVF9IRE1JKSB7CisJCXdpZHRo ID0gNDsKKwkJcmF0ZSA9IDA7IC8qIFJhdGUgaXMgYWx3YXlzIDwgdGhhbiA2R0h6IGZvciBIRE1J ICovCisJfSBlbHNlIHsKKwkJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGVuY190b19pbnRl bF9kcCgmZW5jb2Rlci0+YmFzZSk7CisKIAkJd2lkdGggPSBpbnRlbF9kcC0+bGFuZV9jb3VudDsK IAkJcmF0ZSA9IGludGVsX2RwLT5saW5rX3JhdGU7Ci0JfSBlbHNlIGlmICh0eXBlID09IElOVEVM X09VVFBVVF9IRE1JKSB7Ci0JCXdpZHRoID0gNDsKLQkJLyogUmF0ZSBpcyBhbHdheXMgPCB0aGFu IDZHSHogZm9yIEhETUkgKi8KLQl9IGVsc2UgewotCQlNSVNTSU5HX0NBU0UodHlwZSk7Ci0JCXJl dHVybjsKIAl9CiAKIAkvKgpAQCAtMjAxNCw3ICsyMDExLDcgQEAgc3RhdGljIHZvaWQgY25sX2Rk aV92c3dpbmdfc2VxdWVuY2Uoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsIHUzMiBsZXZl bCkKIAkgKiBlbHNlIGNsZWFyIHRvIDBiLgogCSAqLwogCXZhbCA9IEk5MTVfUkVBRChDTkxfUE9S VF9QQ1NfRFcxX0xOMChwb3J0KSk7Ci0JaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0VEUCB8fCB0 eXBlID09IElOVEVMX09VVFBVVF9EUCkKKwlpZiAodHlwZSAhPSBJTlRFTF9PVVRQVVRfSERNSSkK IAkJdmFsIHw9IENPTU1PTl9LRUVQRVJfRU47CiAJZWxzZQogCQl2YWwgJj0gfkNPTU1PTl9LRUVQ RVJfRU47CkBAIC0yMDQ5LDcgKzIwNDYsNyBAQCBzdGF0aWMgdm9pZCBjbmxfZGRpX3Zzd2luZ19z ZXF1ZW5jZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwgdTMyIGxldmVsKQogCUk5MTVf V1JJVEUoQ05MX1BPUlRfVFhfRFc1X0dSUChwb3J0KSwgdmFsKTsKIAogCS8qIDUuIFByb2dyYW0g c3dpbmcgYW5kIGRlLWVtcGhhc2lzICovCi0JY25sX2RkaV92c3dpbmdfcHJvZ3JhbShkZXZfcHJp diwgbGV2ZWwsIHBvcnQsIHR5cGUpOworCWNubF9kZGlfdnN3aW5nX3Byb2dyYW0oZW5jb2Rlciwg bGV2ZWwsIHR5cGUpOwogCiAJLyogNi4gU2V0IHRyYWluaW5nIGVuYWJsZSB0byB0cmlnZ2VyIHVw ZGF0ZSAqLwogCXZhbCA9IEk5MTVfUkVBRChDTkxfUE9SVF9UWF9EVzVfTE4wKHBvcnQpKTsKQEAg LTIwODksNyArMjA4Niw3IEBAIHUzMiBieHRfc2lnbmFsX2xldmVscyhzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwKQogCXUzMiBsZXZlbCA9IGludGVsX2RkaV9kcF9sZXZlbChpbnRlbF9kcCk7CiAK IAlpZiAoSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikpCi0JCWNubF9kZGlfdnN3aW5nX3NlcXVlbmNl KGVuY29kZXIsIGxldmVsKTsKKwkJY25sX2RkaV92c3dpbmdfc2VxdWVuY2UoZW5jb2RlciwgbGV2 ZWwsIGVuY29kZXItPnR5cGUpOwogCWVsc2UKIAkJYnh0X2RkaV92c3dpbmdfc2VxdWVuY2UoZW5j b2RlciwgbGV2ZWwsIGVuY29kZXItPnR5cGUpOwogCkBAIC0yMTg4LDcgKzIxODUsNyBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9kZGlfcHJlX2VuYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlciwKIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgZGlnX3BvcnQtPmRkaV9p b19wb3dlcl9kb21haW4pOwogCiAJaWYgKElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpKQotCQljbmxf ZGRpX3Zzd2luZ19zZXF1ZW5jZShlbmNvZGVyLCBsZXZlbCk7CisJCWNubF9kZGlfdnN3aW5nX3Nl cXVlbmNlKGVuY29kZXIsIGxldmVsLCBlbmNvZGVyLT50eXBlKTsKIAllbHNlIGlmIChJU19HRU45 X0xQKGRldl9wcml2KSkKIAkJYnh0X2RkaV92c3dpbmdfc2VxdWVuY2UoZW5jb2RlciwgbGV2ZWws IGVuY29kZXItPnR5cGUpOwogCWVsc2UKQEAgLTIyMTksNyArMjIxNiw3IEBAIHN0YXRpYyB2b2lk IGludGVsX2RkaV9wcmVfZW5hYmxlX2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIs CiAJaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIGRpZ19wb3J0LT5kZGlfaW9fcG93 ZXJfZG9tYWluKTsKIAogCWlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSkKLQkJY25sX2RkaV92 c3dpbmdfc2VxdWVuY2UoZW5jb2RlciwgbGV2ZWwpOworCQljbmxfZGRpX3Zzd2luZ19zZXF1ZW5j ZShlbmNvZGVyLCBsZXZlbCwgSU5URUxfT1VUUFVUX0hETUkpOwogCWVsc2UgaWYgKElTX0dFTjlf TFAoZGV2X3ByaXYpKQogCQlieHRfZGRpX3Zzd2luZ19zZXF1ZW5jZShlbmNvZGVyLCBsZXZlbCwg SU5URUxfT1VUUFVUX0hETUkpOwogCWVsc2UKLS0gCjIuMTMuNgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==