From: Jani Nikula Subject: [PATCH 2/2] drm/i915: Detect USB-C specific dongles before reducing M and N Date: Thu, 11 May 2017 12:57:21 +0300 Message-ID: <20170511095721.7392-2-jani.nikula@intel.com> References: <20170511095721.7392-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170511095721.7392-1-jani.nikula@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, dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, ajax@redhat.com, dhinakaran.pandiyan@intel.com, harry.wentland@amd.com List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2xpbnQgVGF5bG9yIDxjbGludG9uLmEudGF5bG9yQGludGVsLmNvbT4KClRoZSBBbmFs b2dpeCA3NzM3IERQIHRvIEhETUkgY29udmVydGVyIHJlcXVpcmVzIHJlZHVjZWQgTSBhbmQgTiB2 YWx1ZXMKd2hlbiB0byBvcGVyYXRlIGNvcnJlY3RseSBhdCBIQlIyLiBEZXRlY3QgdGhpcyBJQyBi eSBpdHMgT1VJIHZhbHVlIG9mCjB4MDAyMkI5IHZpYSB0aGUgRFBDRCBxdWlyayBsaXN0LgoKdjIg YnkgSmFuaTogUmViYXNlZCBvbiB0aGUgRFAgcXVpcmsgZGF0YWJhc2UKCkZpeGVzOiA5YTg2Y2Rh MDdhZjIgKCJkcm0vaTkxNS9kcDogcmVkdWNlIGxpbmsgTS9OIHBhcmFtZXRlcnMiKQpCdWd6aWxs YTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM1NzgKQnVn emlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDc1 NQpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KQ2M6IERoaW5ha2FyYW4g UGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFuZGl5YW5AaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOk bMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQ2xpbnQg VGF5bG9yIDxjbGludG9uLmEudGF5bG9yQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuaSBO aWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oICAgICAgfCAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyB8IDIyICsrKysrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMgICAgICB8IDE1ICsrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHBfbXN0LmMgIHwgIDQgKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmggICAgIHwgIDIgKysKIDUgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMTQgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZmYzNTc0YTU2ODEyLi5kMzQ0 MTI2NzNkNjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNTYzLDcgKzU2Myw4IEBAIHN0 cnVjdCBpbnRlbF9saW5rX21fbiB7CiAKIHZvaWQgaW50ZWxfbGlua19jb21wdXRlX21fbihpbnQg YnBwLCBpbnQgbmxhbmVzLAogCQkJICAgIGludCBwaXhlbF9jbG9jaywgaW50IGxpbmtfY2xvY2ss Ci0JCQkgICAgc3RydWN0IGludGVsX2xpbmtfbV9uICptX24pOworCQkJICAgIHN0cnVjdCBpbnRl bF9saW5rX21fbiAqbV9uLAorCQkJICAgIGJvb2wgcmVkdWNlX21fbik7CiAKIC8qIEludGVyZmFj ZSBoaXN0b3J5OgogICoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBiZjkw MjBkYThiODAuLjQ2YWM0NmNhOTc2YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtNjExNiw3ICs2MTE2LDcgQEAgc3RhdGljIGludCBpcm9ubGFrZV9mZGlfY29tcHV0ZV9j b25maWcoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJcGlwZV9jb25maWctPmZkaV9s YW5lcyA9IGxhbmU7CiAKIAlpbnRlbF9saW5rX2NvbXB1dGVfbV9uKHBpcGVfY29uZmlnLT5waXBl X2JwcCwgbGFuZSwgZmRpX2RvdGNsb2NrLAotCQkJICAgICAgIGxpbmtfYncsICZwaXBlX2NvbmZp Zy0+ZmRpX21fbik7CisJCQkgICAgICAgbGlua19idywgJnBpcGVfY29uZmlnLT5mZGlfbV9uLCBm YWxzZSk7CiAKIAlyZXQgPSBpcm9ubGFrZV9jaGVja19mZGlfbGFuZXMoZGV2LCBpbnRlbF9jcnRj LT5waXBlLCBwaXBlX2NvbmZpZyk7CiAJaWYgKHJldCA9PSAtRUlOVkFMICYmIHBpcGVfY29uZmln LT5waXBlX2JwcCA+IDYqMykgewpAQCAtNjI5Miw3ICs2MjkyLDggQEAgaW50ZWxfcmVkdWNlX21f bl9yYXRpbyh1aW50MzJfdCAqbnVtLCB1aW50MzJfdCAqZGVuKQogfQogCiBzdGF0aWMgdm9pZCBj b21wdXRlX21fbih1bnNpZ25lZCBpbnQgbSwgdW5zaWduZWQgaW50IG4sCi0JCQl1aW50MzJfdCAq cmV0X20sIHVpbnQzMl90ICpyZXRfbikKKwkJCXVpbnQzMl90ICpyZXRfbSwgdWludDMyX3QgKnJl dF9uLAorCQkJYm9vbCByZWR1Y2VfbV9uKQogewogCS8qCiAJICogUmVkdWNlIE0vTiBhcyBtdWNo IGFzIHBvc3NpYmxlIHdpdGhvdXQgbG9zcyBpbiBwcmVjaXNpb24uIFNldmVyYWwgRFAKQEAgLTYz MDAsOSArNjMwMSwxMSBAQCBzdGF0aWMgdm9pZCBjb21wdXRlX21fbih1bnNpZ25lZCBpbnQgbSwg dW5zaWduZWQgaW50IG4sCiAJICogdmFsdWVzLiBUaGUgcGFzc2VkIGluIHZhbHVlcyBhcmUgbW9y ZSBsaWtlbHkgdG8gaGF2ZSB0aGUgbGVhc3QKIAkgKiBzaWduaWZpY2FudCBiaXRzIHplcm8gdGhh biBNIGFmdGVyIHJvdW5kaW5nIGJlbG93LCBzbyBkbyB0aGlzIGZpcnN0LgogCSAqLwotCXdoaWxl ICgobSAmIDEpID09IDAgJiYgKG4gJiAxKSA9PSAwKSB7Ci0JCW0gPj49IDE7Ci0JCW4gPj49IDE7 CisJaWYgKHJlZHVjZV9tX24pIHsKKwkJd2hpbGUgKChtICYgMSkgPT0gMCAmJiAobiAmIDEpID09 IDApIHsKKwkJCW0gPj49IDE7CisJCQluID4+PSAxOworCQl9CiAJfQogCiAJKnJldF9uID0gbWlu X3QodW5zaWduZWQgaW50LCByb3VuZHVwX3Bvd19vZl90d28obiksIERBVEFfTElOS19OX01BWCk7 CkBAIC02MzEzLDE2ICs2MzE2LDE5IEBAIHN0YXRpYyB2b2lkIGNvbXB1dGVfbV9uKHVuc2lnbmVk IGludCBtLCB1bnNpZ25lZCBpbnQgbiwKIHZvaWQKIGludGVsX2xpbmtfY29tcHV0ZV9tX24oaW50 IGJpdHNfcGVyX3BpeGVsLCBpbnQgbmxhbmVzLAogCQkgICAgICAgaW50IHBpeGVsX2Nsb2NrLCBp bnQgbGlua19jbG9jaywKLQkJICAgICAgIHN0cnVjdCBpbnRlbF9saW5rX21fbiAqbV9uKQorCQkg ICAgICAgc3RydWN0IGludGVsX2xpbmtfbV9uICptX24sCisJCSAgICAgICBib29sIHJlZHVjZV9t X24pCiB7CiAJbV9uLT50dSA9IDY0OwogCiAJY29tcHV0ZV9tX24oYml0c19wZXJfcGl4ZWwgKiBw aXhlbF9jbG9jaywKIAkJICAgIGxpbmtfY2xvY2sgKiBubGFuZXMgKiA4LAotCQkgICAgJm1fbi0+ Z21jaF9tLCAmbV9uLT5nbWNoX24pOworCQkgICAgJm1fbi0+Z21jaF9tLCAmbV9uLT5nbWNoX24s CisJCSAgICByZWR1Y2VfbV9uKTsKIAogCWNvbXB1dGVfbV9uKHBpeGVsX2Nsb2NrLCBsaW5rX2Ns b2NrLAotCQkgICAgJm1fbi0+bGlua19tLCAmbV9uLT5saW5rX24pOworCQkgICAgJm1fbi0+bGlu a19tLCAmbV9uLT5saW5rX24sCisJCSAgICByZWR1Y2VfbV9uKTsKIH0KIAogc3RhdGljIGlubGlu ZSBib29sIGludGVsX3BhbmVsX3VzZV9zc2Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggNGE2ZmViNmE2OWJkLi41OWYzZGJiMjQy YTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMTU2OCwxMyArMTU2OCwxNyBAQCBib29s IGludGVsX2RwX3JlYWRfZGVzYyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCWlmICghX19p bnRlbF9kcF9yZWFkX2Rlc2MoaW50ZWxfZHAsIGRlc2MpKQogCQlyZXR1cm4gZmFsc2U7CiAKKwlp bnRlbF9kcC0+cXVpcmtzID0gZHJtX2RwX2dldF9xdWlya3MoZGVzYy0+b3VpLCBzaXplb2YoZGVz Yy0+b3VpKSwKKwkJCQkJICAgICBkcm1fZHBfaXNfYnJhbmNoKGludGVsX2RwLT5kcGNkKSk7CisK IAlkZXZfaWRfbGVuID0gc3RybmxlbihkZXNjLT5kZXZpY2VfaWQsIHNpemVvZihkZXNjLT5kZXZp Y2VfaWQpKTsKLQlEUk1fREVCVUdfS01TKCJEUCAlczogT1VJICUqcGhEJXMgZGV2LUlEICUqcEUg SFctcmV2ICVkLiVkIFNXLXJldiAlZC4lZFxuIiwKKwlEUk1fREVCVUdfS01TKCJEUCAlczogT1VJ ICUqcGhEJXMgZGV2LUlEICUqcEUgSFctcmV2ICVkLiVkIFNXLXJldiAlZC4lZCBxdWlya3MgMHgl MDR4XG4iLAogCQkgICAgICBkcm1fZHBfaXNfYnJhbmNoKGludGVsX2RwLT5kcGNkKSA/ICJicmFu Y2giIDogInNpbmsiLAogCQkgICAgICAoaW50KXNpemVvZihkZXNjLT5vdWkpLCBkZXNjLT5vdWks IG91aV9zdXAgPyAiIiA6ICIoTlMpIiwKIAkJICAgICAgZGV2X2lkX2xlbiwgZGVzYy0+ZGV2aWNl X2lkLAogCQkgICAgICBkZXNjLT5od19yZXYgPj4gNCwgZGVzYy0+aHdfcmV2ICYgMHhmLAotCQkg ICAgICBkZXNjLT5zd19tYWpvcl9yZXYsIGRlc2MtPnN3X21pbm9yX3Jldik7CisJCSAgICAgIGRl c2MtPnN3X21ham9yX3JldiwgZGVzYy0+c3dfbWlub3JfcmV2LAorCQkgICAgICBpbnRlbF9kcC0+ cXVpcmtzKTsKIAogCXJldHVybiB0cnVlOwogfQpAQCAtMTY1OCw2ICsxNjYyLDcgQEAgaW50ZWxf ZHBfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJaW50IGxp bmtfYXZhaWwsIGxpbmtfY2xvY2s7CiAJaW50IGNvbW1vbl9sZW47CiAJdWludDhfdCBsaW5rX2J3 LCByYXRlX3NlbGVjdDsKKwlib29sIHJlZHVjZV9tX24gPSBpbnRlbF9kcC0+cXVpcmtzICYgRFBf RFBDRF9RVUlSS19MSU1JVEVEX01fTjsKIAogCWNvbW1vbl9sZW4gPSBpbnRlbF9kcF9jb21tb25f bGVuX3JhdGVfbGltaXQoaW50ZWxfZHAsCiAJCQkJCQkgICAgaW50ZWxfZHAtPm1heF9saW5rX3Jh dGUpOwpAQCAtMTc5MCw3ICsxNzk1LDggQEAgaW50ZWxfZHBfY29tcHV0ZV9jb25maWcoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJaW50ZWxfbGlua19jb21wdXRlX21fbihicHAsIGxh bmVfY291bnQsCiAJCQkgICAgICAgYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jaywKIAkJCSAgICAg ICBwaXBlX2NvbmZpZy0+cG9ydF9jbG9jaywKLQkJCSAgICAgICAmcGlwZV9jb25maWctPmRwX21f bik7CisJCQkgICAgICAgJnBpcGVfY29uZmlnLT5kcF9tX24sCisJCQkgICAgICAgcmVkdWNlX21f bik7CiAKIAlpZiAoaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5kb3duY2xvY2tfbW9kZSAhPSBOVUxM ICYmCiAJCWRldl9wcml2LT5kcnJzLnR5cGUgPT0gU0VBTUxFU1NfRFJSU19TVVBQT1JUKSB7CkBA IC0xNzk4LDcgKzE4MDQsOCBAQCBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlciwKIAkJCWludGVsX2xpbmtfY29tcHV0ZV9tX24oYnBwLCBsYW5lX2Nv dW50LAogCQkJCWludGVsX2Nvbm5lY3Rvci0+cGFuZWwuZG93bmNsb2NrX21vZGUtPmNsb2NrLAog CQkJCXBpcGVfY29uZmlnLT5wb3J0X2Nsb2NrLAotCQkJCSZwaXBlX2NvbmZpZy0+ZHBfbTJfbjIp OworCQkJCSZwaXBlX2NvbmZpZy0+ZHBfbTJfbjIsCisJCQkJcmVkdWNlX21fbik7CiAJfQogCiAJ LyoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKaW5kZXggNjhjNzg4ZWIwYjk1Li43NjNk NDkwZWVjYTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCkBAIC00NCw2ICs0NCw3 IEBAIHN0YXRpYyBib29sIGludGVsX2RwX21zdF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlciwKIAlpbnQgbGFuZV9jb3VudCwgc2xvdHM7CiAJY29uc3Qgc3RydWN0 IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPSAmcGlwZV9jb25maWctPmJhc2UuYWRq dXN0ZWRfbW9kZTsKIAlpbnQgbXN0X3BibjsKKwlib29sIHJlZHVjZV9tX24gPSBpbnRlbF9kcC0+ cXVpcmtzICYgRFBfRFBDRF9RVUlSS19MSU1JVEVEX01fTjsKIAogCXBpcGVfY29uZmlnLT5oYXNf cGNoX2VuY29kZXIgPSBmYWxzZTsKIAlicHAgPSAyNDsKQEAgLTc5LDcgKzgwLDggQEAgc3RhdGlj IGJvb2wgaW50ZWxfZHBfbXN0X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyLAogCWludGVsX2xpbmtfY29tcHV0ZV9tX24oYnBwLCBsYW5lX2NvdW50LAogCQkJICAg ICAgIGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2ssCiAJCQkgICAgICAgcGlwZV9jb25maWctPnBv cnRfY2xvY2ssCi0JCQkgICAgICAgJnBpcGVfY29uZmlnLT5kcF9tX24pOworCQkJICAgICAgICZw aXBlX2NvbmZpZy0+ZHBfbV9uLAorCQkJICAgICAgIHJlZHVjZV9tX24pOwogCiAJcGlwZV9jb25m aWctPmRwX21fbi50dSA9IHNsb3RzOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGJk NTAwOTc3YjNmYy4uNjY0MTU2YWNmZjBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAt OTk3LDYgKzk5Nyw4IEBAIHN0cnVjdCBpbnRlbF9kcCB7CiAJaW50IG1heF9saW5rX3JhdGU7CiAJ Lyogc2luayBvciBicmFuY2ggZGVzY3JpcHRvciAqLwogCXN0cnVjdCBpbnRlbF9kcF9kZXNjIGRl c2M7CisJLyogUXVpcmtzIGFzIHJldHVybmVkIGJ5IGRybV9kcF9nZXRfcXVpcmtzKCkgKi8KKwl1 MzIgcXVpcmtzOwogCXN0cnVjdCBkcm1fZHBfYXV4IGF1eDsKIAllbnVtIGludGVsX2Rpc3BsYXlf cG93ZXJfZG9tYWluIGF1eF9wb3dlcl9kb21haW47CiAJdWludDhfdCB0cmFpbl9zZXRbNF07Ci0t IAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=