From: Ville Syrjala Subject: [PATCH 22/29] drm/i915: Start using output_types for DPLL selection Date: Mon, 18 Sep 2017 21:25:57 +0300 Message-ID: <20170918182604.9519-23-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 133146E3F9 for ; Mon, 18 Sep 2017 18:27:34 +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 Y29kZXItPnR5cGUgaXMgbm90IHJlYWxpYWJsZSBmb3IgRFAvSERNSSBzbyBsZXQncyBzd2l0Y2gg dGhlIERQTEwKc2VsZWN0aW9uIG92ZXIgdG8gdXNpbmcgb3V0cHV0X3R5cGVzLgoKU2lnbmVkLW9m Zi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5jIHwgMzYgKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCsp LCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcGxsX21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYwppbmRl eCBhMmEzZDkzZDY3YmQuLmMwM2Q5ZWM0NThlNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHBsbF9tZ3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cGxsX21nci5jCkBAIC04MTMsMTUgKzgxMywxMSBAQCBoc3dfZ2V0X2RwbGwoc3RydWN0IGludGVs X2NydGMgKmNydGMsIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCW1lbXNl dCgmY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZSwgMCwKIAkgICAgICAgc2l6ZW9mKGNydGNfc3Rh dGUtPmRwbGxfaHdfc3RhdGUpKTsKIAotCWlmIChlbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBV VF9IRE1JKSB7CisJaWYgKGludGVsX2NydGNfaGFzX3R5cGUoY3J0Y19zdGF0ZSwgSU5URUxfT1VU UFVUX0hETUkpKSB7CiAJCXBsbCA9IGhzd19kZGlfaGRtaV9nZXRfZHBsbChjbG9jaywgY3J0Yywg Y3J0Y19zdGF0ZSk7Ci0KLQl9IGVsc2UgaWYgKGVuY29kZXItPnR5cGUgPT0gSU5URUxfT1VUUFVU X0RQIHx8Ci0JCSAgIGVuY29kZXItPnR5cGUgPT0gSU5URUxfT1VUUFVUX0RQX01TVCB8fAotCQkg ICBlbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9FRFApIHsKKwl9IGVsc2UgaWYgKGludGVs X2NydGNfaGFzX2RwX2VuY29kZXIoY3J0Y19zdGF0ZSkpIHsKIAkJcGxsID0gaHN3X2RkaV9kcF9n ZXRfZHBsbChlbmNvZGVyLCBjbG9jayk7Ci0KLQl9IGVsc2UgaWYgKGVuY29kZXItPnR5cGUgPT0g SU5URUxfT1VUUFVUX0FOQUxPRykgeworCX0gZWxzZSBpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShj cnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfQU5BTE9HKSkgewogCQlpZiAoV0FSTl9PTihjcnRjX3N0 YXRlLT5wb3J0X2Nsb2NrIC8gMiAhPSAxMzUwMDApKQogCQkJcmV0dXJuIE5VTEw7CiAKQEAgLTEz NjksMTUgKzEzNjUsMTMgQEAgc2tsX2dldF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAogCW1lbXNldCgmZHBsbF9od19z dGF0ZSwgMCwgc2l6ZW9mKGRwbGxfaHdfc3RhdGUpKTsKIAotCWlmIChlbmNvZGVyLT50eXBlID09 IElOVEVMX09VVFBVVF9IRE1JKSB7CisJaWYgKGludGVsX2NydGNfaGFzX3R5cGUoY3J0Y19zdGF0 ZSwgSU5URUxfT1VUUFVUX0hETUkpKSB7CiAJCWJyZXQgPSBza2xfZGRpX2hkbWlfcGxsX2Rpdmlk ZXJzKGNydGMsIGNydGNfc3RhdGUsIGNsb2NrKTsKIAkJaWYgKCFicmV0KSB7CiAJCQlEUk1fREVC VUdfS01TKCJDb3VsZCBub3QgZ2V0IEhETUkgcGxsIGRpdmlkZXJzLlxuIik7CiAJCQlyZXR1cm4g TlVMTDsKIAkJfQotCX0gZWxzZSBpZiAoZW5jb2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRfRFAg fHwKLQkJICAgZW5jb2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRfRFBfTVNUIHx8Ci0JCSAgIGVu Y29kZXItPnR5cGUgPT0gSU5URUxfT1VUUFVUX0VEUCkgeworCX0gZWxzZSBpZiAoaW50ZWxfY3J0 Y19oYXNfZHBfZW5jb2RlcihjcnRjX3N0YXRlKSkgewogCQlicmV0ID0gc2tsX2RkaV9kcF9zZXRf ZHBsbF9od19zdGF0ZShjbG9jaywgJmRwbGxfaHdfc3RhdGUpOwogCQlpZiAoIWJyZXQpIHsKIAkJ CURSTV9ERUJVR19LTVMoIkNvdWxkIG5vdCBzZXQgRFAgZHBsbCBIVyBzdGF0ZS5cbiIpOwpAQCAt MTM4OCw3ICsxMzgyLDcgQEAgc2tsX2dldF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJcmV0dXJuIE5VTEw7CiAJfQog Ci0JaWYgKGVuY29kZXItPnR5cGUgPT0gSU5URUxfT1VUUFVUX0VEUCkKKwlpZiAoaW50ZWxfY3J0 Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfRURQKSkKIAkJcGxsID0gaW50ZWxf ZmluZF9zaGFyZWRfZHBsbChjcnRjLCBjcnRjX3N0YXRlLAogCQkJCQkgICAgIERQTExfSURfU0tM X0RQTEwwLAogCQkJCQkgICAgIERQTExfSURfU0tMX0RQTEwwKTsKQEAgLTE4MTIsMTQgKzE4MDYs MTIgQEAgYnh0X2dldF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCXN0cnVjdCBpbnRl bF9zaGFyZWRfZHBsbCAqcGxsOwogCWludCBpLCBjbG9jayA9IGNydGNfc3RhdGUtPnBvcnRfY2xv Y2s7CiAKLQlpZiAoZW5jb2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRfSERNSSAmJgorCWlmIChp bnRlbF9jcnRjX2hhc190eXBlKGNydGNfc3RhdGUsIElOVEVMX09VVFBVVF9IRE1JKSAmJgogCSAg ICAhYnh0X2RkaV9oZG1pX3NldF9kcGxsX2h3X3N0YXRlKGNydGMsIGNydGNfc3RhdGUsIGNsb2Nr LAogCQkJCQkgICAgJmRwbGxfaHdfc3RhdGUpKQogCQlyZXR1cm4gTlVMTDsKIAotCWlmICgoZW5j b2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRfRFAgfHwKLQkgICAgIGVuY29kZXItPnR5cGUgPT0g SU5URUxfT1VUUFVUX0VEUCB8fAotCSAgICAgZW5jb2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRf RFBfTVNUKSAmJgorCWlmIChpbnRlbF9jcnRjX2hhc19kcF9lbmNvZGVyKGNydGNfc3RhdGUpICYm CiAJICAgICFieHRfZGRpX2RwX3NldF9kcGxsX2h3X3N0YXRlKGNsb2NrLCAmZHBsbF9od19zdGF0 ZSkpCiAJCXJldHVybiBOVUxMOwogCkBAIC0xODI4LDcgKzE4MjAsNyBAQCBieHRfZ2V0X2RwbGwo c3RydWN0IGludGVsX2NydGMgKmNydGMsCiAKIAljcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlID0g ZHBsbF9od19zdGF0ZTsKIAotCWlmIChlbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9EUF9N U1QpIHsKKwlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRf RFBfTVNUKSkgewogCQlzdHJ1Y3QgaW50ZWxfZHBfbXN0X2VuY29kZXIgKmludGVsX21zdCA9IGVu Y190b19tc3QoJmVuY29kZXItPmJhc2UpOwogCiAJCWludGVsX2RpZ19wb3J0ID0gaW50ZWxfbXN0 LT5wcmltYXJ5OwpAQCAtMjM0NSwxNSArMjMzNywxMyBAQCBjbmxfZ2V0X2RwbGwoc3RydWN0IGlu dGVsX2NydGMgKmNydGMsIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCiAJ bWVtc2V0KCZkcGxsX2h3X3N0YXRlLCAwLCBzaXplb2YoZHBsbF9od19zdGF0ZSkpOwogCi0JaWYg KGVuY29kZXItPnR5cGUgPT0gSU5URUxfT1VUUFVUX0hETUkpIHsKKwlpZiAoaW50ZWxfY3J0Y19o YXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfSERNSSkpIHsKIAkJYnJldCA9IGNubF9k ZGlfaGRtaV9wbGxfZGl2aWRlcnMoY3J0YywgY3J0Y19zdGF0ZSwgY2xvY2spOwogCQlpZiAoIWJy ZXQpIHsKIAkJCURSTV9ERUJVR19LTVMoIkNvdWxkIG5vdCBnZXQgSERNSSBwbGwgZGl2aWRlcnMu XG4iKTsKIAkJCXJldHVybiBOVUxMOwogCQl9Ci0JfSBlbHNlIGlmIChlbmNvZGVyLT50eXBlID09 IElOVEVMX09VVFBVVF9EUCB8fAotCQkgICBlbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9E UF9NU1QgfHwKLQkJICAgZW5jb2Rlci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRfRURQKSB7CisJfSBl bHNlIGlmIChpbnRlbF9jcnRjX2hhc19kcF9lbmNvZGVyKGNydGNfc3RhdGUpKSB7CiAJCWJyZXQg PSBjbmxfZGRpX2RwX3NldF9kcGxsX2h3X3N0YXRlKGNsb2NrLCAmZHBsbF9od19zdGF0ZSk7CiAJ CWlmICghYnJldCkgewogCQkJRFJNX0RFQlVHX0tNUygiQ291bGQgbm90IHNldCBEUCBkcGxsIEhX IHN0YXRlLlxuIik7CkBAIC0yMzYxLDggKzIzNTEsOCBAQCBjbmxfZ2V0X2RwbGwoc3RydWN0IGlu dGVsX2NydGMgKmNydGMsIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQl9 CiAJCWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUgPSBkcGxsX2h3X3N0YXRlOwogCX0gZWxzZSB7 Ci0JCURSTV9ERUJVR19LTVMoIlNraXAgRFBMTCBzZXR1cCBmb3IgZW5jb2RlciAlZFxuIiwKLQkJ CSAgICAgIGVuY29kZXItPnR5cGUpOworCQlEUk1fREVCVUdfS01TKCJTa2lwIERQTEwgc2V0dXAg Zm9yIG91dHB1dF90eXBlcyAweCV4XG4iLAorCQkJICAgICAgY3J0Y19zdGF0ZS0+b3V0cHV0X3R5 cGVzKTsKIAkJcmV0dXJuIE5VTEw7CiAJfQogCi0tIAoyLjEzLjUKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=