From: Ville Syrjala Subject: [PATCH 18/29] drm/i915: Pass encoder type to cnl_ddi_vswing_sequence() explicitly Date: Mon, 18 Sep 2017 21:25:53 +0300 Message-ID: <20170918182604.9519-19-ville.syrjala@linux.intel.com> References: <20170918182604.9519-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B4F36E3F8 for ; Mon, 18 Sep 2017 18:27:06 +0000 (UTC) In-Reply-To: <20170918182604.9519-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 ZSBkbyBmb3IgQlhULgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGku YyB8IDQzICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RkaS5jCmluZGV4IDQwNmM3NmZlODMwYS4uZGMzMmRmYTIzZDA3IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kZGkuYwpAQCAtMTkxNCwxNiArMTkxNCwxNSBAQCBzdGF0aWMgdm9pZCBjbmxfZGRp X3Zzd2luZ19wcm9ncmFtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkg ICAgdTMyIGxldmVsLCBlbnVtIHBvcnQgcG9ydCwgaW50IHR5cGUpCiB7CiAJY29uc3Qgc3RydWN0 IGNubF9kZGlfYnVmX3RyYW5zICpkZGlfdHJhbnNsYXRpb25zID0gTlVMTDsKLQl1MzIgbl9lbnRy aWVzLCB2YWw7Ci0JaW50IGxuOworCWludCBuX2VudHJpZXMsIGxuOworCXUzMiB2YWw7CiAKLQlp ZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfSERNSSkgeworCWlmICh0eXBlID09IElOVEVMX09VVFBV VF9IRE1JKQogCQlkZGlfdHJhbnNsYXRpb25zID0gY25sX2dldF9idWZfdHJhbnNfaGRtaShkZXZf cHJpdiwgJm5fZW50cmllcyk7Ci0JfSBlbHNlIGlmICh0eXBlID09IElOVEVMX09VVFBVVF9EUCkg ewotCQlkZGlfdHJhbnNsYXRpb25zID0gY25sX2dldF9idWZfdHJhbnNfZHAoZGV2X3ByaXYsICZu X2VudHJpZXMpOwotCX0gZWxzZSBpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKSB7CisJZWxz ZSBpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKQogCQlkZGlfdHJhbnNsYXRpb25zID0gY25s X2dldF9idWZfdHJhbnNfZWRwKGRldl9wcml2LCAmbl9lbnRyaWVzKTsKLQl9CisJZWxzZQorCQlk ZGlfdHJhbnNsYXRpb25zID0gY25sX2dldF9idWZfdHJhbnNfZHAoZGV2X3ByaXYsICZuX2VudHJp ZXMpOwogCiAJaWYgKFdBUk5fT04oZGRpX3RyYW5zbGF0aW9ucyA9PSBOVUxMKSkKIAkJcmV0dXJu OwpAQCAtMTk3NiwyNiArMTk3NSwyMiBAQCBzdGF0aWMgdm9pZCBjbmxfZGRpX3Zzd2luZ19wcm9n cmFtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlJOTE1X1dSSVRFKENOTF9Q T1JUX1RYX0RXN19HUlAocG9ydCksIHZhbCk7CiB9CiAKLXN0YXRpYyB2b2lkIGNubF9kZGlfdnN3 aW5nX3NlcXVlbmNlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLCB1MzIgbGV2ZWwpCitz dGF0aWMgdm9pZCBjbmxfZGRpX3Zzd2luZ19zZXF1ZW5jZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciwKKwkJCQkgICAgaW50IGxldmVsLCBpbnQgdHlwZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKLQlzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsK IAllbnVtIHBvcnQgcG9ydCA9IGludGVsX2RkaV9nZXRfZW5jb2Rlcl9wb3J0KGVuY29kZXIpOwot CWludCB0eXBlID0gZW5jb2Rlci0+dHlwZTsKLQlpbnQgd2lkdGggPSAwOwotCWludCByYXRlID0g MDsKKwlpbnQgd2lkdGgsIHJhdGUsIGxuOwogCXUzMiB2YWw7Ci0JaW50IGxuID0gMDsKIAotCWlm ICgoaW50ZWxfZHApICYmICh0eXBlID09IElOVEVMX09VVFBVVF9FRFAgfHwgdHlwZSA9PSBJTlRF TF9PVVRQVVRfRFApKSB7Ci0JCXdpZHRoID0gaW50ZWxfZHAtPmxhbmVfY291bnQ7Ci0JCXJhdGUg PSBpbnRlbF9kcC0+bGlua19yYXRlOwotCX0gZWxzZSBpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRf SERNSSkgeworCWlmICh0eXBlID09IElOVEVMX09VVFBVVF9IRE1JKSB7CiAJCXdpZHRoID0gNDsK LQkJLyogUmF0ZSBpcyBhbHdheXMgPCB0aGFuIDZHSHogZm9yIEhETUkgKi8KKwkJcmF0ZSA9IDA7 IC8qIFJhdGUgaXMgYWx3YXlzIDwgdGhhbiA2R0h6IGZvciBIRE1JICovCiAJfSBlbHNlIHsKLQkJ TUlTU0lOR19DQVNFKHR5cGUpOwotCQlyZXR1cm47CisJCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHAgPSBlbmNfdG9faW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOworCisJCXdpZHRoID0gaW50ZWxf ZHAtPmxhbmVfY291bnQ7CisJCXJhdGUgPSBpbnRlbF9kcC0+bGlua19yYXRlOwogCX0KIAogCS8q CkBAIC0yMDA0LDcgKzE5OTksNyBAQCBzdGF0aWMgdm9pZCBjbmxfZGRpX3Zzd2luZ19zZXF1ZW5j ZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwgdTMyIGxldmVsKQogCSAqIGVsc2UgY2xl YXIgdG8gMGIuCiAJICovCiAJdmFsID0gSTkxNV9SRUFEKENOTF9QT1JUX1BDU19EVzFfTE4wKHBv cnQpKTsKLQlpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQIHx8IHR5cGUgPT0gSU5URUxfT1VU UFVUX0RQKQorCWlmICh0eXBlICE9IElOVEVMX09VVFBVVF9IRE1JKQogCQl2YWwgfD0gQ09NTU9O X0tFRVBFUl9FTjsKIAllbHNlCiAJCXZhbCAmPSB+Q09NTU9OX0tFRVBFUl9FTjsKQEAgLTIwNzks NyArMjA3NCw3IEBAIHUzMiBieHRfc2lnbmFsX2xldmVscyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQogCXUzMiBsZXZlbCA9IGludGVsX2RkaV9kcF9sZXZlbChpbnRlbF9kcCk7CiAKIAlpZiAo SVNfQ0FOTk9OTEFLRShkZXZfcHJpdikpCi0JCWNubF9kZGlfdnN3aW5nX3NlcXVlbmNlKGVuY29k ZXIsIGxldmVsKTsKKwkJY25sX2RkaV92c3dpbmdfc2VxdWVuY2UoZW5jb2RlciwgbGV2ZWwsIGVu Y29kZXItPnR5cGUpOwogCWVsc2UKIAkJYnh0X2RkaV92c3dpbmdfc2VxdWVuY2UoZW5jb2Rlciwg bGV2ZWwsIGVuY29kZXItPnR5cGUpOwogCkBAIC0yMTc4LDcgKzIxNzMsNyBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9kZGlfcHJlX2VuYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwK IAlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgZGlnX3BvcnQtPmRkaV9pb19wb3dl cl9kb21haW4pOwogCiAJaWYgKElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpKQotCQljbmxfZGRpX3Zz d2luZ19zZXF1ZW5jZShlbmNvZGVyLCBsZXZlbCk7CisJCWNubF9kZGlfdnN3aW5nX3NlcXVlbmNl KGVuY29kZXIsIGxldmVsLCBlbmNvZGVyLT50eXBlKTsKIAllbHNlIGlmIChJU19HRU45X0xQKGRl dl9wcml2KSkKIAkJYnh0X2RkaV92c3dpbmdfc2VxdWVuY2UoZW5jb2RlciwgbGV2ZWwsIGVuY29k ZXItPnR5cGUpOwogCWVsc2UKQEAgLTIyMDgsNyArMjIwMyw3IEBAIHN0YXRpYyB2b2lkIGludGVs X2RkaV9wcmVfZW5hYmxlX2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJaW50 ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIGRpZ19wb3J0LT5kZGlfaW9fcG93ZXJfZG9t YWluKTsKIAogCWlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSkKLQkJY25sX2RkaV92c3dpbmdf c2VxdWVuY2UoZW5jb2RlciwgbGV2ZWwpOworCQljbmxfZGRpX3Zzd2luZ19zZXF1ZW5jZShlbmNv ZGVyLCBsZXZlbCwgSU5URUxfT1VUUFVUX0hETUkpOwogCWVsc2UgaWYgKElTX0dFTjlfTFAoZGV2 X3ByaXYpKQogCQlieHRfZGRpX3Zzd2luZ19zZXF1ZW5jZShlbmNvZGVyLCBsZXZlbCwgSU5URUxf T1VUUFVUX0hETUkpOwogCWVsc2UKLS0gCjIuMTMuNQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==