From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v6] drm/i915/skl+: Add and enable DP AUX CH mutex Date: Tue, 6 Mar 2018 12:11:03 -0800 Message-ID: <20180306201103.13041-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 252B46E31B for ; Tue, 6 Mar 2018 20:12:55 +0000 (UTC) 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 Cc: Dhinakaran Pandiyan , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org V2hlbiBQU1IvUFNSMi9HVEMgaXMgZW5hYmxlZCBoYXJkd2FyZSBjYW4gZG8gQVVYIHRyYW5zYWN0 aW9ucyBieSBpdApzZWxmLCBzbyBsZXRzIHVzZSB0aGUgbXV0ZXggcmVnaXN0ZXIgdGhhdCBpcyBh dmFpbGFibGUgaW4gZ2VuOSsgdG8KYXZvaWQgY29uY3VycmVudCBhY2Nlc3MgYnkgaGFyZHdhcmUg YW5kIGRyaXZlci4KT2xkZXIgZ2VuIGhhbmRsaW5nIHdpbGwgYmUgZG9uZSBzZXBhcmF0ZWQuCgpS ZWZlcmVuY2U6IGh0dHBzOi8vMDEub3JnL3NpdGVzL2RlZmF1bHQvZmlsZXMvZG9jdW1lbnRhdGlv bi9pbnRlbC1nZngtcHJtLW9zcmMtc2tsLXZvbDEyLWRpc3BsYXkucGRmClBhZ2UgMTk4IC0gQVVY IHByb2dyYW1taW5nIHNlcXVlbmNlCgpDYzogRGhpbmFrYXJhbiBQYW5kaXlhbiA8ZGhpbmFrYXJh bi5wYW5kaXlhbkBpbnRlbC5jb20+CkNjOiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRl bC5jb20+CkNjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgpDYzog VmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9m Zi1ieTogSm9zw6kgUm9iZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+Ci0tLQoK Q2hhbmdlbG9nOgp2MgotIHJlbW92ZWQgdGhlIFBTUiBkZXBlbmRlbmN5LCBub3cgZ2V0dGluZyBs b2NrIGFsbCB0aGUgdGltZXMgd2hlbiBhdmFpbGFibGUKLSByZW5hbWVkIGZ1bmN0aW9ucyB0byBh dm9pZCBuZXN0ZWQgY2FsbHMKLSBtb3ZlZCByZWdpc3RlciBiaXRzIHJpZ2h0IGFmdGVyIHRoZSBE UF9BVVhfQ0hfTVVURVgoKQotIHJlbW92ZWQgJ2RybS9pOTE1OiBrZWVwIEFVWCBwb3dlcmVkIHdo aWxlIFBTUiBpcyBlbmFibGVkJyBEaGluYWthcmFuIFBhbmRpeWFuIHdpbGwgc2VudCBhIGJldHRl ciBhbmQgZmluYWwgdmVyc2lvbgp2MwotIHJlYmFzZWQgb24gdG9wIG9mIFZpbGxlJ3MgQVVYIHNl cmllcwotIG1vdmVkIHBvcnQgcmVnaXN0ZXJzIHRvIGFib3ZlIERQX0FVWF9DSF9NVVRFWCgpCi0g dXNpbmcgaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoKSBpbnN0ZWFkIG9mIHRoZSBpbnRlcm5hbCB2 ZXJzaW9uCnY0Ci0gcmVtb3ZlZCB2aXJ0dWFsIGZ1bmN0aW9uIHRvIGdldCBtdXRleCByZWdpc3Rl ciBhZGRyZXNzCi0gZW5hYmxpbmcgdGhlIG11dGV4IGJhY2sgb25seSBvbiBhdXggY2hhbm5lbCBp bml0Ci0gYWRkZWQgdGhlIGF1eCBjaGFubmVsIG5hbWUgdG8gdGhlIHRpbWVvdXQgZGVidWcgbWVz c2FnZQp2NQotIHJlbmFtZWQgRFBfQVVYX0NIX01VVEVYKCkgcGFyYW1ldGVyIHRvIGF1eF9jaAot IHJlbmFtZWQgZ290byBsYWJlbCB3aGVuIGludGVsX2RwX2F1eF9jaF90cnlsb2NrKCkgZmFpbHMK djYKLSBlbmFibGluZyBtdXRleCBpbiB0aGUgZmlyc3QgdHJ5bG9jayB0byBjb3ZlciBhbGwgcG93 ZXIgbWFuYWdlbWVudCBjYXNlcwotIHNhdmluZyBhbmQgcmVzdG9yaW5nIHJlc2VydmVkIGJpdHMg aW4gdGhlIG11dGV4IHJlZ2lzdGVyCgogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCB8 ICA5ICsrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgfCA1OCArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA2NyBp bnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggMjU4ZTg2ZWIzN2Q1Li5k YTFkY2VmMjRlYmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtNTM4OCw2ICs1Mzg4LDE1 IEBAIGVudW0gewogI2RlZmluZSAgIERQX0FVWF9DSF9DVExfRldfU1lOQ19QVUxTRV9TS0woYykg KCgoYykgLSAxKSA8PCA1KQogI2RlZmluZSAgIERQX0FVWF9DSF9DVExfU1lOQ19QVUxTRV9TS0wo YykgICAoKGMpIC0gMSkKIAorI2RlZmluZSBfRFBBX0FVWF9DSF9NVVRFWAkoZGV2X3ByaXYtPmlu Zm8uZGlzcGxheV9tbWlvX29mZnNldCArIDB4NjQwMkMpCisjZGVmaW5lIF9EUEJfQVVYX0NIX01V VEVYCShkZXZfcHJpdi0+aW5mby5kaXNwbGF5X21taW9fb2Zmc2V0ICsgMHg2NDEyQykKKyNkZWZp bmUgX0RQQ19BVVhfQ0hfTVVURVgJKGRldl9wcml2LT5pbmZvLmRpc3BsYXlfbW1pb19vZmZzZXQg KyAweDY0MjJDKQorI2RlZmluZSBfRFBEX0FVWF9DSF9NVVRFWAkoZGV2X3ByaXYtPmluZm8uZGlz cGxheV9tbWlvX29mZnNldCArIDB4NjQzMkMpCisjZGVmaW5lIF9EUEZfQVVYX0NIX01VVEVYCShk ZXZfcHJpdi0+aW5mby5kaXNwbGF5X21taW9fb2Zmc2V0ICsgMHg2NDUyQykKKyNkZWZpbmUgRFBf QVVYX0NIX01VVEVYKGF1eF9jaCkJX01NSU9fUE9SVChhdXhfY2gsIF9EUEFfQVVYX0NIX01VVEVY LCBfRFBCX0FVWF9DSF9NVVRFWCkKKyNkZWZpbmUgICBEUF9BVVhfQ0hfTVVURVhfRU5BQkxFCQko MSA8PCAzMSkKKyNkZWZpbmUgICBEUF9BVVhfQ0hfTVVURVhfU1RBVFVTCQkoMSA8PCAzMCkKKwog LyoKICAqIENvbXB1dGluZyBHTUNIIE0gYW5kIE4gdmFsdWVzIGZvciB0aGUgRGlzcGxheSBQb3J0 IGxpbmsKICAqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCBjNzIyYTY3NTBlOTAuLmI4ZmY1 ZmE0MWI3MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0xMDY1LDYgKzEwNjUsNTcgQEAg c3RhdGljIHVpbnQzMl90IHNrbF9nZXRfYXV4X3NlbmRfY3RsKHN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHAsCiAJICAgICAgIERQX0FVWF9DSF9DVExfU1lOQ19QVUxTRV9TS0woMzIpOwogfQogCitz dGF0aWMgYm9vbCBpbnRlbF9kcF9hdXhfY2hfdHJ5bG9jayhzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQoreworCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0gZHBf dG9fZGlnX3BvcnQoaW50ZWxfZHApOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9CisJCQl0b19pOTE1KGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuZGV2KTsKKwl1MzIgdmFs OworCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA5KQorCQlyZXR1cm4gdHJ1ZTsKKworCS8q IEEgcmVhZCB0byBtdXRleCByZWdpc3RlciB3aWxsIHJlcXVlc3QgdGhlIGxvY2sgaWYgbXV0ZXgg aXMgZW5hYmxlZCAqLworCXZhbCA9IEk5MTVfUkVBRChEUF9BVVhfQ0hfTVVURVgoaW50ZWxfZHAt PmF1eF9jaCkpOworCWlmICgodmFsICYgRFBfQVVYX0NIX01VVEVYX0VOQUJMRSkgPT0gMCkgewor CQkvKiBNdXRleCBpcyBkaXNhYmxlZCwgZW5hYmxlcyBpdCAqLworCQlJOTE1X1dSSVRFKERQX0FV WF9DSF9NVVRFWChpbnRlbF9kcC0+YXV4X2NoKSwKKwkJCSAgIHZhbCB8IERQX0FVWF9DSF9NVVRF WF9FTkFCTEUpOworCQkvKiBOb3cgdGhhdCB0aGUgbXV0ZXggaXMgZW5hYmxlZCwgcmVxdWVzdCB0 aGUgbG9jayAqLworCQl2YWwgPSBJOTE1X1JFQUQoRFBfQVVYX0NIX01VVEVYKGludGVsX2RwLT5h dXhfY2gpKTsKKwl9CisKKwkvKiBMb2NrIGlzIGFjcXVpcmVkIHdoZW4gc3RhdHVzIGJpdCBpcyB1 bnNldCAqLworCWlmICgodmFsICYgRFBfQVVYX0NIX01VVEVYX1NUQVRVUykgPT0gMCkKKwkJcmV0 dXJuIHRydWU7CisKKwkvKiBUcnkgdG8gZ2V0IHRoZSBsb2NrIGZvciAybXNlYygrLTQgYXV4IHRy YW5zYWN0aW9ucykgYmVmb3JlIGdpdmUgdXAgKi8KKwlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0 ZXIoZGV2X3ByaXYsIERQX0FVWF9DSF9NVVRFWChpbnRlbF9kcC0+YXV4X2NoKSwKKwkJCQkgICAg RFBfQVVYX0NIX01VVEVYX1NUQVRVUywgMCwgMikpIHsKKwkJRFJNX0RFQlVHX0tNUygiYXV4IGNo YW5uZWwgJWMgbG9ja2VkIGZvciAybXNlYywgdGltaW5nIG91dFxuIiwKKwkJCSAgICAgIGF1eF9j aF9uYW1lKGludGVsX2RwLT5hdXhfY2gpKTsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCXJldHVy biB0cnVlOworfQorCitzdGF0aWMgdm9pZCBpbnRlbF9kcF9hdXhfY2hfdW5sb2NrKHN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHApCit7CisJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxf ZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0KKwkJCXRvX2k5MTUoaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5k ZXYpOworCXUzMiB2YWw7CisKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDkpCisJCXJldHVy bjsKKworCS8qIFNldCB0aGUgc3RhdHVzIGJpdCByZWxlYXNlcyB0aGUgbXV0ZXggKi8KKwl2YWwg PSBJOTE1X1JFQUQoRFBfQVVYX0NIX01VVEVYKGludGVsX2RwLT5hdXhfY2gpKTsKKwl2YWwgfD0g RFBfQVVYX0NIX01VVEVYX1NUQVRVUzsKKwlJOTE1X1dSSVRFKERQX0FVWF9DSF9NVVRFWChpbnRl bF9kcC0+YXV4X2NoKSwgdmFsKTsKK30KKwogc3RhdGljIGludAogaW50ZWxfZHBfYXV4X3hmZXIo c3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAkJICBjb25zdCB1aW50OF90ICpzZW5kLCBpbnQg c2VuZF9ieXRlcywKQEAgLTExMDQsNiArMTE1NSwxMSBAQCBpbnRlbF9kcF9hdXhfeGZlcihzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCiAJaW50ZWxfZHBfY2hlY2tfZWRwKGludGVsX2RwKTsK IAorCWlmICghaW50ZWxfZHBfYXV4X2NoX3RyeWxvY2soaW50ZWxfZHApKSB7CisJCXJldCA9IC1F QlVTWTsKKwkJZ290byBvdXRfYXV4X2NoX3VubG9ja2VkOworCX0KKwogCS8qIFRyeSB0byB3YWl0 IGZvciBhbnkgcHJldmlvdXMgQVVYIGNoYW5uZWwgYWN0aXZpdHkgKi8KIAlmb3IgKHRyeSA9IDA7 IHRyeSA8IDM7IHRyeSsrKSB7CiAJCXN0YXR1cyA9IEk5MTVfUkVBRF9OT1RSQUNFKGNoX2N0bCk7 CkBAIC0xMjI2LDYgKzEyODIsOCBAQCBpbnRlbF9kcF9hdXhfeGZlcihzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwLAogCiAJcmV0ID0gcmVjdl9ieXRlczsKIG91dDoKKwlpbnRlbF9kcF9hdXhfY2hf dW5sb2NrKGludGVsX2RwKTsKK291dF9hdXhfY2hfdW5sb2NrZWQ6CiAJcG1fcW9zX3VwZGF0ZV9y ZXF1ZXN0KCZkZXZfcHJpdi0+cG1fcW9zLCBQTV9RT1NfREVGQVVMVF9WQUxVRSk7CiAKIAlpZiAo dmRkKQotLSAKMi4xNi4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK