From: Maarten Lankhorst Subject: [PATCH 10/23] drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid() Date: Fri, 20 Sep 2019 13:42:22 +0200 Message-ID: <20190920114235.22411-10-maarten.lankhorst@linux.intel.com> References: <20190920114235.22411-1-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4636D6FC9D for ; Fri, 20 Sep 2019 11:42:42 +0000 (UTC) In-Reply-To: <20190920114235.22411-1-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 U21hbGwgY2hhbmdlcyB0byBpbnRlbF9kcF9tb2RlX3ZhbGlkKCksIGFsbG93IGxpc3RpbmcgbW9k ZXMgdGhhdApjYW4gb25seSBiZSBzdXBwb3J0ZWQgaW4gdGhlIGJpZ2pvaW5lciBjb25maWd1cmF0 aW9uLCB3aGljaCBpcwpub3Qgc3VwcG9ydGVkIHlldC4KCkFsc28gdW5leHBvcnQgYSBmZXcgZnVu Y3Rpb25zIG9ubHkgdXNlZCBpbnRlcm5hbGx5IGluIGludGVsX2RwLmMKClNpZ25lZC1vZmYtYnk6 IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kcC5jIHwgOTggKysrKysrKysr KysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDc1IGluc2VydGlvbnMoKyksIDIzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZHAuYwppbmRleCAy ZmNlYjcxZjdmNzAuLjA0NmUxNjYyZDFlMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfZHAuYwpAQCAtMjQ3LDcgKzI0Nyw3IEBAIGludGVsX2RwX21heF9kYXRhX3JhdGUoaW50 IG1heF9saW5rX2Nsb2NrLCBpbnQgbWF4X2xhbmVzKQogfQogCiBzdGF0aWMgaW50Ci1pbnRlbF9k cF9kb3duc3RyZWFtX21heF9kb3RjbG9jayhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQoraW50 ZWxfZHBfZG93bnN0cmVhbV9tYXhfZG90Y2xvY2soc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwg Ym9vbCBhbGxvd19iaWdqb2luZXIpCiB7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50 ZWxfZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7CiAJc3RydWN0IGludGVsX2Vu Y29kZXIgKmVuY29kZXIgPSAmaW50ZWxfZGlnX3BvcnQtPmJhc2U7CkBAIC0yNTcsNiArMjU3LDkg QEAgaW50ZWxfZHBfZG93bnN0cmVhbV9tYXhfZG90Y2xvY2soc3RydWN0IGludGVsX2RwICppbnRl bF9kcCkKIAogCWludCB0eXBlID0gaW50ZWxfZHAtPmRvd25zdHJlYW1fcG9ydHNbMF0gJiBEUF9E U19QT1JUX1RZUEVfTUFTSzsKIAorCWlmIChhbGxvd19iaWdqb2luZXIgJiYgSU5URUxfR0VOKGRl dl9wcml2KSA+PSAxMSkKKwkJbWF4X2RvdGNsayAqPSAyOworCiAJaWYgKHR5cGUgIT0gRFBfRFNf UE9SVF9UWVBFX1ZHQSkKIAkJcmV0dXJuIG1heF9kb3RjbGs7CiAKQEAgLTUwNSw4ICs1MDgsMTAg QEAgdTMyIGludGVsX2RwX2ZlY190b19tb2RlX2Nsb2NrKHUzMiBmZWNfY2xvY2spCiAJCSAgICAg ICAxMDAwMDAwVSk7CiB9CiAKLXN0YXRpYyB1MTYgaW50ZWxfZHBfZHNjX2dldF9vdXRwdXRfYnBw KHUzMiBsaW5rX2Nsb2NrLCB1MzIgbGFuZV9jb3VudCwKLQkJCQkgICAgICAgdTMyIG1vZGVfY2xv Y2ssIHUzMiBtb2RlX2hkaXNwbGF5KQorc3RhdGljIHUxNiBpbnRlbF9kcF9kc2NfZ2V0X291dHB1 dF9icHAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSAgICAgICB1MzIg bGlua19jbG9jaywgdTMyIGxhbmVfY291bnQsCisJCQkJICAgICAgIHUzMiBtb2RlX2Nsb2NrLCB1 MzIgbW9kZV9oZGlzcGxheSwKKwkJCQkgICAgICAgYm9vbCBiaWdqb2luZXIpCiB7CiAJdTMyIGJp dHNfcGVyX3BpeGVsLCBtYXhfYnBwX3NtYWxsX2pvaW5lcl9yYW07CiAJaW50IGk7CkBAIC01MjMs NiArNTI4LDEwIEBAIHN0YXRpYyB1MTYgaW50ZWxfZHBfZHNjX2dldF9vdXRwdXRfYnBwKHUzMiBs aW5rX2Nsb2NrLCB1MzIgbGFuZV9jb3VudCwKIAogCS8qIFNtYWxsIEpvaW5lciBDaGVjazogb3V0 cHV0IGJwcCA8PSBqb2luZXIgUkFNIChiaXRzKSAvIEhvcml6LiB3aWR0aCAqLwogCW1heF9icHBf c21hbGxfam9pbmVyX3JhbSA9IERQX0RTQ19NQVhfU01BTExfSk9JTkVSX1JBTV9CVUZGRVIgLyBt b2RlX2hkaXNwbGF5OworCisJaWYgKGJpZ2pvaW5lcikKKwkJbWF4X2JwcF9zbWFsbF9qb2luZXJf cmFtICo9IDI7CisKIAlEUk1fREVCVUdfS01TKCJNYXggc21hbGwgam9pbmVyIGJwcDogJXVcbiIs IG1heF9icHBfc21hbGxfam9pbmVyX3JhbSk7CiAKIAkvKgpAQCAtNTMxLDYgKzU0MCwxNSBAQCBz dGF0aWMgdTE2IGludGVsX2RwX2RzY19nZXRfb3V0cHV0X2JwcCh1MzIgbGlua19jbG9jaywgdTMy IGxhbmVfY291bnQsCiAJICovCiAJYml0c19wZXJfcGl4ZWwgPSBtaW4oYml0c19wZXJfcGl4ZWws IG1heF9icHBfc21hbGxfam9pbmVyX3JhbSk7CiAKKwlpZiAoYmlnam9pbmVyKSB7CisJCXUzMiBt YXhfYnBwX2JpZ2pvaW5lciA9CisJCQlkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgKiA0OCAvCisJ CQlpbnRlbF9kcF9tb2RlX3RvX2ZlY19jbG9jayhtb2RlX2Nsb2NrKTsKKworCQlEUk1fREVCVUdf S01TKCJNYXggYmlnIGpvaW5lciBicHA6ICV1XG4iLCBtYXhfYnBwX2JpZ2pvaW5lcik7CisJCWJp dHNfcGVyX3BpeGVsID0gbWluKGJpdHNfcGVyX3BpeGVsLCBtYXhfYnBwX2JpZ2pvaW5lcik7CisJ fQorCiAJLyogRXJyb3Igb3V0IGlmIHRoZSBtYXggYnBwIGlzIGxlc3MgdGhhbiBzbWFsbGVzdCBh bGxvd2VkIHZhbGlkIGJwcCAqLwogCWlmIChiaXRzX3Blcl9waXhlbCA8IHZhbGlkX2RzY19icHBb MF0pIHsKIAkJRFJNX0RFQlVHX0tNUygiVW5zdXBwb3J0ZWQgQlBQICV1LCBtaW4gJXVcbiIsCkBA IC01NTMsNyArNTcxLDggQEAgc3RhdGljIHUxNiBpbnRlbF9kcF9kc2NfZ2V0X291dHB1dF9icHAo dTMyIGxpbmtfY2xvY2ssIHUzMiBsYW5lX2NvdW50LAogfQogCiBzdGF0aWMgdTggaW50ZWxfZHBf ZHNjX2dldF9zbGljZV9jb3VudChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAotCQkJCSAgICAg ICBpbnQgbW9kZV9jbG9jaywgaW50IG1vZGVfaGRpc3BsYXkpCisJCQkJICAgICAgIGludCBtb2Rl X2Nsb2NrLCBpbnQgbW9kZV9oZGlzcGxheSwKKwkJCQkgICAgICAgYm9vbCBiaWdqb2luZXIpCiB7 CiAJdTggbWluX3NsaWNlX2NvdW50LCBpOwogCWludCBtYXhfc2xpY2Vfd2lkdGg7CkBAIC01Nzgs MTIgKzU5NywyMCBAQCBzdGF0aWMgdTggaW50ZWxfZHBfZHNjX2dldF9zbGljZV9jb3VudChzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCiAJLyogRmluZCB0aGUgY2xvc2VzdCBtYXRjaCB0byB0 aGUgdmFsaWQgc2xpY2UgY291bnQgdmFsdWVzICovCiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJ WkUodmFsaWRfZHNjX3NsaWNlY291bnQpOyBpKyspIHsKLQkJaWYgKHZhbGlkX2RzY19zbGljZWNv dW50W2ldID4KLQkJICAgIGRybV9kcF9kc2Nfc2lua19tYXhfc2xpY2VfY291bnQoaW50ZWxfZHAt PmRzY19kcGNkLAotCQkJCQkJICAgIGZhbHNlKSkKKwkJdTggdGVzdF9zbGljZV9jb3VudCA9IGJp Z2pvaW5lciA/CisJCQkyICogdmFsaWRfZHNjX3NsaWNlY291bnRbaV0gOgorCQkJdmFsaWRfZHNj X3NsaWNlY291bnRbaV07CisKKwkJaWYgKHRlc3Rfc2xpY2VfY291bnQgPgorCQkgICAgZHJtX2Rw X2RzY19zaW5rX21heF9zbGljZV9jb3VudChpbnRlbF9kcC0+ZHNjX2RwY2QsIGZhbHNlKSkKIAkJ CWJyZWFrOwotCQlpZiAobWluX3NsaWNlX2NvdW50ICA8PSB2YWxpZF9kc2Nfc2xpY2Vjb3VudFtp XSkKLQkJCXJldHVybiB2YWxpZF9kc2Nfc2xpY2Vjb3VudFtpXTsKKworCQkvKiBiaWcgam9pbmVy IG5lZWRzIHNtYWxsIGpvaW5lciB0byBiZSBlbmFibGVkICovCisJCWlmIChiaWdqb2luZXIgJiYg dGVzdF9zbGljZV9jb3VudCA8IDQpCisJCQljb250aW51ZTsKKworCQlpZiAobWluX3NsaWNlX2Nv dW50IDw9IHRlc3Rfc2xpY2VfY291bnQpCisJCQlyZXR1cm4gdGVzdF9zbGljZV9jb3VudDsKIAl9 CiAKIAlEUk1fREVCVUdfS01TKCJVbnN1cHBvcnRlZCBTbGljZSBDb3VudCAlZFxuIiwgbWluX3Ns aWNlX2NvdW50KTsKQEAgLTYwMywxMSArNjMwLDE1IEBAIGludGVsX2RwX21vZGVfdmFsaWQoc3Ry dWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAlpbnQgbWF4X2RvdGNsazsKIAl1MTYgZHNj X21heF9vdXRwdXRfYnBwID0gMDsKIAl1OCBkc2Nfc2xpY2VfY291bnQgPSAwOworCWJvb2wgZHNj ID0gZmFsc2UsIGJpZ2pvaW5lciA9IGZhbHNlOwogCiAJaWYgKG1vZGUtPmZsYWdzICYgRFJNX01P REVfRkxBR19EQkxTQ0FOKQogCQlyZXR1cm4gTU9ERV9OT19EQkxFU0NBTjsKIAotCW1heF9kb3Rj bGsgPSBpbnRlbF9kcF9kb3duc3RyZWFtX21heF9kb3RjbG9jayhpbnRlbF9kcCk7CisJaWYgKG1v ZGUtPmZsYWdzICYgRFJNX01PREVfRkxBR19EQkxDTEspCisJCXJldHVybiBNT0RFX0hfSUxMRUdB TDsKKworCW1heF9kb3RjbGsgPSBpbnRlbF9kcF9kb3duc3RyZWFtX21heF9kb3RjbG9jayhpbnRl bF9kcCwgZmFsc2UpOwogCiAJaWYgKGludGVsX2RwX2lzX2VkcChpbnRlbF9kcCkgJiYgZml4ZWRf bW9kZSkgewogCQlpZiAobW9kZS0+aGRpc3BsYXkgPiBmaXhlZF9tb2RlLT5oZGlzcGxheSkKQEAg LTYxOSw2ICs2NTAsMTggQEAgaW50ZWxfZHBfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqY29ubmVjdG9yLAogCQl0YXJnZXRfY2xvY2sgPSBmaXhlZF9tb2RlLT5jbG9jazsKIAl9CiAK KwlpZiAobW9kZS0+Y2xvY2sgPCAxMDAwMCkKKwkJcmV0dXJuIE1PREVfQ0xPQ0tfTE9XOworCisJ aWYgKHRhcmdldF9jbG9jayA+IG1heF9kb3RjbGspIHsKKwkJbWF4X2RvdGNsayA9IGludGVsX2Rw X2Rvd25zdHJlYW1fbWF4X2RvdGNsb2NrKGludGVsX2RwLCB0cnVlKTsKKworCQlpZiAodGFyZ2V0 X2Nsb2NrID4gbWF4X2RvdGNsaykKKwkJCXJldHVybiBNT0RFX0NMT0NLX0hJR0g7CisKKwkJYmln am9pbmVyID0gdHJ1ZTsKKwl9CisKIAltYXhfbGlua19jbG9jayA9IGludGVsX2RwX21heF9saW5r X3JhdGUoaW50ZWxfZHApOwogCW1heF9sYW5lcyA9IGludGVsX2RwX21heF9sYW5lX2NvdW50KGlu dGVsX2RwKTsKIApAQCAtNjM5LDI2ICs2ODIsMzIgQEAgaW50ZWxfZHBfbW9kZV92YWxpZChzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJCQkJCQl0cnVlKTsKIAkJfSBlbHNlIGlm IChkcm1fZHBfc2lua19zdXBwb3J0c19mZWMoaW50ZWxfZHAtPmZlY19jYXBhYmxlKSkgewogCQkJ ZHNjX21heF9vdXRwdXRfYnBwID0KLQkJCQlpbnRlbF9kcF9kc2NfZ2V0X291dHB1dF9icHAobWF4 X2xpbmtfY2xvY2ssCisJCQkJaW50ZWxfZHBfZHNjX2dldF9vdXRwdXRfYnBwKGRldl9wcml2LAor CQkJCQkJCSAgICBtYXhfbGlua19jbG9jaywKIAkJCQkJCQkgICAgbWF4X2xhbmVzLAogCQkJCQkJ CSAgICB0YXJnZXRfY2xvY2ssCi0JCQkJCQkJICAgIG1vZGUtPmhkaXNwbGF5KSA+PiA0OworCQkJ CQkJCSAgICBtb2RlLT5oZGlzcGxheSwKKwkJCQkJCQkgICAgYmlnam9pbmVyKSA+PiA0OwogCQkJ ZHNjX3NsaWNlX2NvdW50ID0KIAkJCQlpbnRlbF9kcF9kc2NfZ2V0X3NsaWNlX2NvdW50KGludGVs X2RwLAogCQkJCQkJCSAgICAgdGFyZ2V0X2Nsb2NrLAotCQkJCQkJCSAgICAgbW9kZS0+aGRpc3Bs YXkpOworCQkJCQkJCSAgICAgbW9kZS0+aGRpc3BsYXksCisJCQkJCQkJICAgICBiaWdqb2luZXIp OwogCQl9CisKKwkJZHNjID0gZHNjX21heF9vdXRwdXRfYnBwICYmIGRzY19zbGljZV9jb3VudDsK IAl9CiAKLQlpZiAoKG1vZGVfcmF0ZSA+IG1heF9yYXRlICYmICEoZHNjX21heF9vdXRwdXRfYnBw ICYmIGRzY19zbGljZV9jb3VudCkpIHx8Ci0JICAgIHRhcmdldF9jbG9jayA+IG1heF9kb3RjbGsp CisJLyogYmlnIGpvaW5lciBjb25maWd1cmF0aW9uIG5lZWRzIERTQyAqLworCWlmIChiaWdqb2lu ZXIgJiYgIWRzYykgeworCQlEUk1fREVCVUdfS01TKCJMaW5rIGNsb2NrIG5lZWRzIGJpZ2pvaW5l ciwgYnV0IERTQyBvciBGRUMgbm90IGF2YWlsYWJsZVxuIik7CiAJCXJldHVybiBNT0RFX0NMT0NL X0hJR0g7CisJfQogCi0JaWYgKG1vZGUtPmNsb2NrIDwgMTAwMDApCi0JCXJldHVybiBNT0RFX0NM T0NLX0xPVzsKLQotCWlmIChtb2RlLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfREJMQ0xLKQotCQly ZXR1cm4gTU9ERV9IX0lMTEVHQUw7CisJaWYgKG1vZGVfcmF0ZSA+IG1heF9yYXRlICYmICFkc2Mp IHsKKwkJRFJNX0RFQlVHX0tNUygiQ2Fubm90IGRyaXZlIHdpdGhvdXQgRFNDXG4iKTsKKwkJcmV0 dXJuIE1PREVfQ0xPQ0tfSElHSDsKKwl9CiAKIAlyZXR1cm4gaW50ZWxfbW9kZV92YWxpZF9tYXhf cGxhbmVfc2l6ZShkZXZfcHJpdiwgbW9kZSk7CiB9CkBAIC0yMDY4LDE0ICsyMTE3LDE3IEBAIHN0 YXRpYyBpbnQgaW50ZWxfZHBfZHNjX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHAsCiAJCXU4IGRzY19kcF9zbGljZV9jb3VudDsKIAogCQlkc2NfbWF4X291dHB1dF9icHAg PQotCQkJaW50ZWxfZHBfZHNjX2dldF9vdXRwdXRfYnBwKHBpcGVfY29uZmlnLT5wb3J0X2Nsb2Nr LAorCQkJaW50ZWxfZHBfZHNjX2dldF9vdXRwdXRfYnBwKGRldl9wcml2LAorCQkJCQkJICAgIHBp cGVfY29uZmlnLT5wb3J0X2Nsb2NrLAogCQkJCQkJICAgIHBpcGVfY29uZmlnLT5sYW5lX2NvdW50 LAogCQkJCQkJICAgIGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2ssCi0JCQkJCQkgICAgYWRqdXN0 ZWRfbW9kZS0+Y3J0Y19oZGlzcGxheSk7CisJCQkJCQkgICAgYWRqdXN0ZWRfbW9kZS0+Y3J0Y19o ZGlzcGxheSwKKwkJCQkJCSAgICBmYWxzZSk7CiAJCWRzY19kcF9zbGljZV9jb3VudCA9CiAJCQlp bnRlbF9kcF9kc2NfZ2V0X3NsaWNlX2NvdW50KGludGVsX2RwLAogCQkJCQkJICAgICBhZGp1c3Rl ZF9tb2RlLT5jcnRjX2Nsb2NrLAotCQkJCQkJICAgICBhZGp1c3RlZF9tb2RlLT5jcnRjX2hkaXNw bGF5KTsKKwkJCQkJCSAgICAgYWRqdXN0ZWRfbW9kZS0+Y3J0Y19oZGlzcGxheSwKKwkJCQkJCSAg ICAgZmFsc2UpOwogCQlpZiAoIWRzY19tYXhfb3V0cHV0X2JwcCB8fCAhZHNjX2RwX3NsaWNlX2Nv dW50KSB7CiAJCQlEUk1fREVCVUdfS01TKCJDb21wcmVzc2VkIEJQUC9TbGljZSBDb3VudCBub3Qg c3VwcG9ydGVkXG4iKTsKIAkJCXJldHVybiAtRUlOVkFMOwotLSAKMi4yMC4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=