From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH 3/4] drm/i915/icl: Only grab TC ports when using it Date: Fri, 2 Nov 2018 13:39:23 -0700 Message-ID: <20181102203924.10870-3-jose.souza@intel.com> References: <20181102203924.10870-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 67FC36E5D9 for ; Fri, 2 Nov 2018 20:39:33 +0000 (UTC) In-Reply-To: <20181102203924.10870-1-jose.souza@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 V2hlbiBzdXNwZW5kaW5nIG9yIHVubG9hZGluZyB0aGUgZHJpdmVyLCBpdCBuZWVkcyB0byByZWxl YXNlIHRoZQpUQyBwb3J0cyBzbyBIVyBjYW4gY2hhbmdlIGl0IHN0YXRlIHdpdGhvdXQgd2FpdCBm b3IgZHJpdmVyIGhhbmRzaGFrZS4KU3BlYyBhbHNvIHN0YXRlIHRoYXQgaWYgdGhlIHBvcnQgaXMg bm90IHVzZWQgYnkgZHJpdmVyIGl0IHNob3VsZApyZWxlYXNlIFRDIGFjY2Vzcywgc28gaGVyZSBv bmx5IGdyYWJiaW5nIGNvbnRyb2wgb2YgdGhlIFRDIHBvcnRzIGFuZAptYXJraW5nIGFzIHVuc2Fm ZSB3aGVuIGF1eCBwb3dlciBpcyBuZWVkZWQgYXMgaGF2ZSBhdXggcG93ZXIgd2VsbCBpcwphIHJl cXVpcmVtZW50IHRvIGhhdmUgRERJIGVuYWJsZWQgaW4gVEMgcG9ydHMsIHRoZSBwcmVfcGxsX2Vu YWJsZSBhbmQKcG9zdF9wbGxfZGlzYWJsZSBob29rcyB0YWtlcyBjYXJlIG9mIGdldHRpbmcgYW5k IHJlbGVhc2luZyBpdC4KCkJTcGVjOiAyMTc1MAoKQ2M6IEltcmUgRGVhayA8aW1yZS5kZWFrQGlu dGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j b20+ClNpZ25lZC1vZmYtYnk6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpvc2Uuc291emFAaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAgICB8IDI4 IC0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyB8 IDU1ICsrKysrKysrKysrKysrKysrKysrKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0 aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggNTJh NTRlZjc0NmFmLi5kOTc4MTI3ZTcyMDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtNTAx MywxNiArNTAxMyw2IEBAIHN0YXRpYyBib29sIGljbF90Y19waHlfY29ubmVjdChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXJldHVybiBmYWxzZTsKIAl9CiAKLQkvKgotCSAq IFRoaXMgZnVuY3Rpb24gbWF5IGJlIGNhbGxlZCBtYW55IHRpbWVzIGluIGEgcm93IHdpdGhvdXQg YW4gSFBEIGV2ZW50Ci0JICogaW4gYmV0d2Vlbiwgc28gdHJ5IHRvIGF2b2lkIHRoZSB3cml0ZSB3 aGVuIHdlIGNhbi4KLQkgKi8KLQl2YWwgPSBJOTE1X1JFQUQoUE9SVF9UWF9ERkxFWERQQ1NTUyk7 Ci0JaWYgKCEodmFsICYgRFBfUEhZX01PREVfU1RBVFVTX05PVF9TQUZFKHRjX3BvcnQpKSkgewot CQl2YWwgfD0gRFBfUEhZX01PREVfU1RBVFVTX05PVF9TQUZFKHRjX3BvcnQpOwotCQlJOTE1X1dS SVRFKFBPUlRfVFhfREZMRVhEUENTU1MsIHZhbCk7Ci0JfQotCiAJLyoKIAkgKiBOb3cgd2UgaGF2 ZSB0byByZS1jaGVjayB0aGUgbGl2ZSBzdGF0ZSwgaW4gY2FzZSB0aGUgcG9ydCByZWNlbnRseQog CSAqIGJlY2FtZSBkaXNjb25uZWN0ZWQuIE5vdCBuZWNlc3NhcnkgZm9yIGxlZ2FjeSBtb2RlLgpA QCAtNTA0NCwyNCArNTAzNCw2IEBAIHN0YXRpYyBib29sIGljbF90Y19waHlfY29ubmVjdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgdm9pZCBpY2xfdGNfcGh5X2Rp c2Nvbm5lY3Qoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgc3RydWN0 IGludGVsX2RpZ2l0YWxfcG9ydCAqZGlnX3BvcnQpCiB7Ci0JZW51bSB0Y19wb3J0IHRjX3BvcnQg PSBpbnRlbF9wb3J0X3RvX3RjKGRldl9wcml2LCBkaWdfcG9ydC0+YmFzZS5wb3J0KTsKLQotCWlm IChkaWdfcG9ydC0+dGNfdHlwZSA9PSBUQ19QT1JUX1VOS05PV04pCi0JCXJldHVybjsKLQotCS8q Ci0JICogVEJUIGRpc2Nvbm5lY3Rpb24gZmxvdyBpcyByZWFkIHRoZSBsaXZlIHN0YXR1cywgd2hh dCB3YXMgZG9uZSBpbgotCSAqIGNhbGxlci4KLQkgKi8KLQlpZiAoZGlnX3BvcnQtPnRjX3R5cGUg PT0gVENfUE9SVF9UWVBFQyB8fAotCSAgICBkaWdfcG9ydC0+dGNfdHlwZSA9PSBUQ19QT1JUX0xF R0FDWSkgewotCQl1MzIgdmFsOwotCi0JCXZhbCA9IEk5MTVfUkVBRChQT1JUX1RYX0RGTEVYRFBD U1NTKTsKLQkJdmFsICY9IH5EUF9QSFlfTU9ERV9TVEFUVVNfTk9UX1NBRkUodGNfcG9ydCk7Ci0J CUk5MTVfV1JJVEUoUE9SVF9UWF9ERkxFWERQQ1NTUywgdmFsKTsKLQl9Ci0KIAlkaWdfcG9ydC0+ dGNfdHlwZSA9IFRDX1BPUlRfVU5LTk9XTjsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cnVudGltZV9wbS5jCmluZGV4IDZjNDUzMzY2Y2QyNC4uZGFiNWY5MDY0NmM0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC00NjUsNiArNDY1LDQ4IEBAIGljbF9j b21ib19waHlfYXV4X3Bvd2VyX3dlbGxfZGlzYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJaHN3X3dhaXRfZm9yX3Bvd2VyX3dlbGxfZGlzYWJsZShkZXZfcHJpdiwgcG93 ZXJfd2VsbCk7CiB9CiAKK3N0YXRpYyB2b2lkIGljbF90Y19ncmFiX2NvbnRyb2woc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCWVudW0gYXV4X2NoIGF1eF9jaCwgYm9vbCBn cmFiKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRybTsKKwlzdHJ1 Y3QgZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXIgY29ubl9pdGVyOworCXN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3I7CisKKwlkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9iZWdpbihkZXYsICZj b25uX2l0ZXIpOworCWRybV9mb3JfZWFjaF9jb25uZWN0b3JfaXRlcihjb25uZWN0b3IsICZjb25u X2l0ZXIpIHsKKwkJc3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yOworCQlz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcjsKKwkJc3RydWN0IGludGVsX2RpZ2l0 YWxfcG9ydCAqZGlnX3BvcnQ7CisJCWVudW0gdGNfcG9ydCB0Y19wb3J0OworCisJCWludGVsX2Nv bm5lY3RvciA9IHRvX2ludGVsX2Nvbm5lY3Rvcihjb25uZWN0b3IpOworCQlpZiAoIWludGVsX2Nv bm5lY3Rvci0+ZW5jb2RlcikKKwkJCWNvbnRpbnVlOworCQlpbnRlbF9lbmNvZGVyID0gaW50ZWxf Y29ubmVjdG9yLT5lbmNvZGVyOworCQlkaWdfcG9ydCA9IGVuY190b19kaWdfcG9ydCgmaW50ZWxf ZW5jb2Rlci0+YmFzZSk7CisKKwkJaWYgKCFkaWdfcG9ydCB8fCBkaWdfcG9ydC0+YXV4X2NoICE9 IGF1eF9jaCkKKwkJCWNvbnRpbnVlOworCisJCXRjX3BvcnQgPSBpbnRlbF9wb3J0X3RvX3RjKGRl dl9wcml2LCBkaWdfcG9ydC0+YmFzZS5wb3J0KTsKKworCQlpZiAoZGlnX3BvcnQtPnRjX3R5cGUg PT0gVENfUE9SVF9UWVBFQyB8fAorCQkgICAgZGlnX3BvcnQtPnRjX3R5cGUgPT0gVENfUE9SVF9M RUdBQ1kpIHsKKwkJCXUzMiB2YWw7CisKKwkJCXZhbCA9IEk5MTVfUkVBRChQT1JUX1RYX0RGTEVY RFBDU1NTKTsKKwkJCWlmIChncmFiKQorCQkJCXZhbCB8PSBEUF9QSFlfTU9ERV9TVEFUVVNfTk9U X1NBRkUodGNfcG9ydCk7CisJCQllbHNlCisJCQkJdmFsICY9IH5EUF9QSFlfTU9ERV9TVEFUVVNf Tk9UX1NBRkUodGNfcG9ydCk7CisJCQlJOTE1X1dSSVRFKFBPUlRfVFhfREZMRVhEUENTU1MsIHZh bCk7CisJCX0KKworCQlicmVhazsKKwl9CisJZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXJfZW5kKCZj b25uX2l0ZXIpOworfQorCiAjZGVmaW5lIElDTF9BVVhfUFdfVE9fQ0gocHdfaWR4KQlcCiAJKChw d19pZHgpIC0gSUNMX1BXX0NUTF9JRFhfQVVYX0EgKyBBVVhfQ0hfQSkKIApAQCAtNDc1LDYgKzUx Nyw4IEBAIGljbF90Y19waHlfYXV4X3Bvd2VyX3dlbGxfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAllbnVtIGF1eF9jaCBhdXhfY2ggPSBJQ0xfQVVYX1BXX1RPX0NI KHBvd2VyX3dlbGwtPmRlc2MtPmhzdy5pZHgpOwogCXUzMiB2YWw7CiAKKwlpY2xfdGNfZ3JhYl9j b250cm9sKGRldl9wcml2LCBhdXhfY2gsIHRydWUpOworCiAJdmFsID0gSTkxNV9SRUFEKERQX0FV WF9DSF9DVEwoYXV4X2NoKSk7CiAJdmFsICY9IH5EUF9BVVhfQ0hfQ1RMX1RCVF9JTzsKIAlpZiAo cG93ZXJfd2VsbC0+ZGVzYy0+aHN3LmlzX3RjX3RidCkKQEAgLTQ4NCw2ICs1MjgsMTUgQEAgaWNs X3RjX3BoeV9hdXhfcG93ZXJfd2VsbF9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCWhzd19wb3dlcl93ZWxsX2VuYWJsZShkZXZfcHJpdiwgcG93ZXJfd2VsbCk7CiB9 CiAKK3N0YXRpYyB2b2lkIGljbF90Y19waHlfYXV4X3Bvd2VyX3dlbGxfZGlzYWJsZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCSAgICAgIHN0cnVjdCBpOTE1X3Bvd2Vy X3dlbGwgKnBvd2VyX3dlbGwpCit7CisJZW51bSBhdXhfY2ggYXV4X2NoID0gSUNMX0FVWF9QV19U T19DSChwb3dlcl93ZWxsLT5kZXNjLT5oc3cuaWR4KTsKKworCWljbF90Y19ncmFiX2NvbnRyb2wo ZGV2X3ByaXYsIGF1eF9jaCwgZmFsc2UpOworCWhzd19wb3dlcl93ZWxsX2Rpc2FibGUoZGV2X3By aXYsIHBvd2VyX3dlbGwpOworfQorCiAvKgogICogV2Ugc2hvdWxkIG9ubHkgdXNlIHRoZSBwb3dl ciB3ZWxsIGlmIHdlIGV4cGxpY2l0bHkgYXNrZWQgdGhlIGhhcmR3YXJlIHRvCiAgKiBlbmFibGUg aXQsIHNvIGNoZWNrIGlmIGl0J3MgZW5hYmxlZCBhbmQgYWxzbyBjaGVjayBpZiB3ZSd2ZSByZXF1 ZXN0ZWQgaXQgdG8KQEAgLTI3NTQsNyArMjgwNyw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaTkx NV9wb3dlcl93ZWxsX29wcyBpY2xfY29tYm9fcGh5X2F1eF9wb3dlcl93ZWxsX29wcyA9IHsKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgaTkxNV9wb3dlcl93ZWxsX29wcyBpY2xfdGNfcGh5X2F1eF9wb3dl cl93ZWxsX29wcyA9IHsKIAkuc3luY19odyA9IGhzd19wb3dlcl93ZWxsX3N5bmNfaHcsCiAJLmVu YWJsZSA9IGljbF90Y19waHlfYXV4X3Bvd2VyX3dlbGxfZW5hYmxlLAotCS5kaXNhYmxlID0gaHN3 X3Bvd2VyX3dlbGxfZGlzYWJsZSwKKwkuZGlzYWJsZSA9IGljbF90Y19waHlfYXV4X3Bvd2VyX3dl bGxfZGlzYWJsZSwKIAkuaXNfZW5hYmxlZCA9IGhzd19wb3dlcl93ZWxsX2VuYWJsZWQsCiB9Owog Ci0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=