From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [RFC 10/28] drm/i915: Convert intel_mocs_init_l3cc_table to intel_gt Date: Thu, 13 Jun 2019 14:35:21 +0100 Message-ID: <20190613133539.12620-11-tvrtko.ursulin@linux.intel.com> References: <20190613133539.12620-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6429289A91 for ; Thu, 13 Jun 2019 13:38:59 +0000 (UTC) In-Reply-To: <20190613133539.12620-1-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1vcmUgcmVt b3ZhbCBvZiBpbXBsaWNpdCBkZXZfcHJpdiBmcm9tIHVzaW5nIG9sZCBtbWlvIGFjY2Vzc29ycy4K ClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfbW9jcy5jIHwgNTIgKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfbW9jcy5o IHwgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICB8ICAyICstCiAz IGZpbGVzIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX21vY3MuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2d0L2ludGVsX21vY3MuYwppbmRleCA3OWRmNjYwMjJkM2EuLmFlZjhhYTViMGI0 ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfbW9jcy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX21vY3MuYwpAQCAtMjMsNiArMjMsNyBAQAog I2luY2x1ZGUgImk5MTVfZHJ2LmgiCiAKICNpbmNsdWRlICJpbnRlbF9lbmdpbmUuaCIKKyNpbmNs dWRlICJpbnRlbF9ndC5oIgogI2luY2x1ZGUgImludGVsX21vY3MuaCIKICNpbmNsdWRlICJpbnRl bF9scmMuaCIKIApAQCAtMjM5LDcgKzI0MCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2k5 MTVfbW9jc19lbnRyeSBpY2VsYWtlX21vY3NfdGFibGVbXSA9IHsKIAogLyoqCiAgKiBnZXRfbW9j c19zZXR0aW5ncygpCi0gKiBAZGV2X3ByaXY6CWk5MTUgZGV2aWNlLgorICogQGd0OgkJZ3QgZGV2 aWNlCiAgKiBAdGFibGU6ICAgICAgT3V0cHV0IHRhYmxlIHRoYXQgd2lsbCBiZSBtYWRlIHRvIHBv aW50IGF0IGFwcHJvcHJpYXRlCiAgKgkgICAgICBNT0NTIHZhbHVlcyBmb3IgdGhlIGRldmljZS4K ICAqCkBAIC0yNDksMzMgKzI1MCwzNCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9pOTE1X21v Y3NfZW50cnkgaWNlbGFrZV9tb2NzX3RhYmxlW10gPSB7CiAgKgogICogUmV0dXJuOiB0cnVlIGlm IHRoZXJlIGFyZSBhcHBsaWNhYmxlIE1PQ1Mgc2V0dGluZ3MgZm9yIHRoZSBkZXZpY2UuCiAgKi8K LXN0YXRpYyBib29sIGdldF9tb2NzX3NldHRpbmdzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKK3N0YXRpYyBib29sIGdldF9tb2NzX3NldHRpbmdzKHN0cnVjdCBpbnRlbF9ndCAq Z3QsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX2k5MTVfbW9jc190YWJsZSAqdGFibGUpCiB7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSBndC0+aTkxNTsKIAlib29sIHJlc3VsdCA9IGZh bHNlOwogCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpIHsKKwlpZiAoSU5URUxfR0VO KGk5MTUpID49IDExKSB7CiAJCXRhYmxlLT5zaXplICA9IEFSUkFZX1NJWkUoaWNlbGFrZV9tb2Nz X3RhYmxlKTsKIAkJdGFibGUtPnRhYmxlID0gaWNlbGFrZV9tb2NzX3RhYmxlOwogCQl0YWJsZS0+ bl9lbnRyaWVzID0gR0VOMTFfTlVNX01PQ1NfRU5UUklFUzsKIAkJcmVzdWx0ID0gdHJ1ZTsKLQl9 IGVsc2UgaWYgKElTX0dFTjlfQkMoZGV2X3ByaXYpIHx8IElTX0NBTk5PTkxBS0UoZGV2X3ByaXYp KSB7CisJfSBlbHNlIGlmIChJU19HRU45X0JDKGk5MTUpIHx8IElTX0NBTk5PTkxBS0UoaTkxNSkp IHsKIAkJdGFibGUtPnNpemUgID0gQVJSQVlfU0laRShza3lsYWtlX21vY3NfdGFibGUpOwogCQl0 YWJsZS0+bl9lbnRyaWVzID0gR0VOOV9OVU1fTU9DU19FTlRSSUVTOwogCQl0YWJsZS0+dGFibGUg PSBza3lsYWtlX21vY3NfdGFibGU7CiAJCXJlc3VsdCA9IHRydWU7Ci0JfSBlbHNlIGlmIChJU19H RU45X0xQKGRldl9wcml2KSkgeworCX0gZWxzZSBpZiAoSVNfR0VOOV9MUChpOTE1KSkgewogCQl0 YWJsZS0+c2l6ZSAgPSBBUlJBWV9TSVpFKGJyb3h0b25fbW9jc190YWJsZSk7CiAJCXRhYmxlLT5u X2VudHJpZXMgPSBHRU45X05VTV9NT0NTX0VOVFJJRVM7CiAJCXRhYmxlLT50YWJsZSA9IGJyb3h0 b25fbW9jc190YWJsZTsKIAkJcmVzdWx0ID0gdHJ1ZTsKIAl9IGVsc2UgewotCQlXQVJOX09OQ0Uo SU5URUxfR0VOKGRldl9wcml2KSA+PSA5LAorCQlXQVJOX09OQ0UoSU5URUxfR0VOKGk5MTUpID49 IDksCiAJCQkgICJQbGF0Zm9ybSB0aGF0IHNob3VsZCBoYXZlIGEgTU9DUyB0YWJsZSBkb2VzIG5v dC5cbiIpOwogCX0KIAogCS8qIFdhRGlzYWJsZVNraXBDYWNoaW5nOnNrbCxieHQsa2JsLGdsayAq LwotCWlmIChJU19HRU4oZGV2X3ByaXYsIDkpKSB7CisJaWYgKElTX0dFTihpOTE1LCA5KSkgewog CQlpbnQgaTsKIAogCQlmb3IgKGkgPSAwOyBpIDwgdGFibGUtPnNpemU7IGkrKykKQEAgLTMzMCwx MiArMzMyLDEzIEBAIHN0YXRpYyB1MzIgZ2V0X2VudHJ5X2NvbnRyb2woY29uc3Qgc3RydWN0IGRy bV9pOTE1X21vY3NfdGFibGUgKnRhYmxlLAogICovCiB2b2lkIGludGVsX21vY3NfaW5pdF9lbmdp bmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsKKwlzdHJ1Y3QgaW50ZWxfZ3QgKmd0ID0g ZW5naW5lLT5ndDsKKwlzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUgPSBndC0+dW5jb3JlOwog CXN0cnVjdCBkcm1faTkxNV9tb2NzX3RhYmxlIHRhYmxlOwogCXVuc2lnbmVkIGludCBpbmRleDsK IAl1MzIgdW51c2VkX3ZhbHVlOwogCi0JaWYgKCFnZXRfbW9jc19zZXR0aW5ncyhkZXZfcHJpdiwg JnRhYmxlKSkKKwlpZiAoIWdldF9tb2NzX3NldHRpbmdzKGd0LCAmdGFibGUpKQogCQlyZXR1cm47 CiAKIAkvKiBTZXQgdW51c2VkIHZhbHVlcyB0byBQVEUgKi8KQEAgLTM0NCwxMiArMzQ3LDE2IEBA IHZvaWQgaW50ZWxfbW9jc19pbml0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiAJZm9yIChpbmRleCA9IDA7IGluZGV4IDwgdGFibGUuc2l6ZTsgaW5kZXgrKykgewogCQl1 MzIgdmFsdWUgPSBnZXRfZW50cnlfY29udHJvbCgmdGFibGUsIGluZGV4KTsKIAotCQlJOTE1X1dS SVRFKG1vY3NfcmVnaXN0ZXIoZW5naW5lLT5pZCwgaW5kZXgpLCB2YWx1ZSk7CisJCWludGVsX3Vu Y29yZV93cml0ZSh1bmNvcmUsCisJCQkJICAgbW9jc19yZWdpc3RlcihlbmdpbmUtPmlkLCBpbmRl eCksCisJCQkJICAgdmFsdWUpOwogCX0KIAogCS8qIEFsbCByZW1haW5pbmcgZW50cmllcyBhcmUg YWxzbyB1bnVzZWQgKi8KIAlmb3IgKDsgaW5kZXggPCB0YWJsZS5uX2VudHJpZXM7IGluZGV4Kysp Ci0JCUk5MTVfV1JJVEUobW9jc19yZWdpc3RlcihlbmdpbmUtPmlkLCBpbmRleCksIHVudXNlZF92 YWx1ZSk7CisJCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsCisJCQkJICAgbW9jc19yZWdpc3Rl cihlbmdpbmUtPmlkLCBpbmRleCksCisJCQkJICAgdW51c2VkX3ZhbHVlKTsKIH0KIAogLyoqCkBA IC00OTQsMTMgKzUwMSwxNCBAQCBzdGF0aWMgaW50IGVtaXRfbW9jc19sM2NjX3RhYmxlKHN0cnVj dCBpOTE1X3JlcXVlc3QgKnJxLAogICoKICAqIFJldHVybjogTm90aGluZy4KICAqLwotdm9pZCBp bnRlbF9tb2NzX2luaXRfbDNjY190YWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCit2b2lkIGludGVsX21vY3NfaW5pdF9sM2NjX3RhYmxlKHN0cnVjdCBpbnRlbF9ndCAqZ3Qp CiB7CisJc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3JlID0gZ3QtPnVuY29yZTsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfbW9jc190YWJsZSB0YWJsZTsKIAl1bnNpZ25lZCBpbnQgaTsKIAl1MTYgdW51c2Vk X3ZhbHVlOwogCi0JaWYgKCFnZXRfbW9jc19zZXR0aW5ncyhkZXZfcHJpdiwgJnRhYmxlKSkKKwlp ZiAoIWdldF9tb2NzX3NldHRpbmdzKGd0LCAmdGFibGUpKQogCQlyZXR1cm47CiAKIAkvKiBTZXQg dW51c2VkIHZhbHVlcyB0byBQVEUgKi8KQEAgLTUxMCwyMyArNTE4LDI3IEBAIHZvaWQgaW50ZWxf bW9jc19pbml0X2wzY2NfdGFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CQl1MTYgbG93ID0gZ2V0X2VudHJ5X2wzY2MoJnRhYmxlLCAyICogaSk7CiAJCXUxNiBoaWdoID0g Z2V0X2VudHJ5X2wzY2MoJnRhYmxlLCAyICogaSArIDEpOwogCi0JCUk5MTVfV1JJVEUoR0VOOV9M TkNGQ01PQ1MoaSksCi0JCQkgICBsM2NjX2NvbWJpbmUoJnRhYmxlLCBsb3csIGhpZ2gpKTsKKwkJ aW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwKKwkJCQkgICBHRU45X0xOQ0ZDTU9DUyhpKSwKKwkJ CQkgICBsM2NjX2NvbWJpbmUoJnRhYmxlLCBsb3csIGhpZ2gpKTsKIAl9CiAKIAkvKiBPZGQgdGFi bGUgc2l6ZSAtIDEgbGVmdCBvdmVyICovCiAJaWYgKHRhYmxlLnNpemUgJiAweDAxKSB7CiAJCXUx NiBsb3cgPSBnZXRfZW50cnlfbDNjYygmdGFibGUsIDIgKiBpKTsKIAotCQlJOTE1X1dSSVRFKEdF TjlfTE5DRkNNT0NTKGkpLAotCQkJICAgbDNjY19jb21iaW5lKCZ0YWJsZSwgbG93LCB1bnVzZWRf dmFsdWUpKTsKKwkJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwKKwkJCQkgICBHRU45X0xOQ0ZD TU9DUyhpKSwKKwkJCQkgICBsM2NjX2NvbWJpbmUoJnRhYmxlLCBsb3csIHVudXNlZF92YWx1ZSkp OwogCQlpKys7CiAJfQogCiAJLyogQWxsIHJlbWFpbmluZyBlbnRyaWVzIGFyZSBhbHNvIHVudXNl ZCAqLwogCWZvciAoOyBpIDwgdGFibGUubl9lbnRyaWVzIC8gMjsgaSsrKQotCQlJOTE1X1dSSVRF KEdFTjlfTE5DRkNNT0NTKGkpLAotCQkJICAgbDNjY19jb21iaW5lKCZ0YWJsZSwgdW51c2VkX3Zh bHVlLCB1bnVzZWRfdmFsdWUpKTsKKwkJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwKKwkJCQkg ICBHRU45X0xOQ0ZDTU9DUyhpKSwKKwkJCQkgICBsM2NjX2NvbWJpbmUoJnRhYmxlLCB1bnVzZWRf dmFsdWUsCisJCQkJCQl1bnVzZWRfdmFsdWUpKTsKIH0KIAogLyoqCkBAIC01NTAsNyArNTYyLDcg QEAgaW50IGludGVsX3Jjc19jb250ZXh0X2luaXRfbW9jcyhzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpy cSkKIAlzdHJ1Y3QgZHJtX2k5MTVfbW9jc190YWJsZSB0OwogCWludCByZXQ7CiAKLQlpZiAoZ2V0 X21vY3Nfc2V0dGluZ3MocnEtPmk5MTUsICZ0KSkgeworCWlmIChnZXRfbW9jc19zZXR0aW5ncyhy cS0+ZW5naW5lLT5ndCwgJnQpKSB7CiAJCS8qIFByb2dyYW0gdGhlIFJDUyBjb250cm9sIHJlZ2lz dGVycyAqLwogCQlyZXQgPSBlbWl0X21vY3NfY29udHJvbF90YWJsZShycSwgJnQpOwogCQlpZiAo cmV0KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfbW9jcy5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfbW9jcy5oCmluZGV4IDA5MTM3MDRhMWFmMi4u OGI5ODEzZTZmOWFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9t b2NzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfbW9jcy5oCkBAIC01Miw5 ICs1MiwxMCBAQAogc3RydWN0IGRybV9pOTE1X3ByaXZhdGU7CiBzdHJ1Y3QgaTkxNV9yZXF1ZXN0 Owogc3RydWN0IGludGVsX2VuZ2luZV9jczsKK3N0cnVjdCBpbnRlbF9ndDsKIAogaW50IGludGVs X3Jjc19jb250ZXh0X2luaXRfbW9jcyhzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSk7Ci12b2lkIGlu dGVsX21vY3NfaW5pdF9sM2NjX3RhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dik7Cit2b2lkIGludGVsX21vY3NfaW5pdF9sM2NjX3RhYmxlKHN0cnVjdCBpbnRlbF9ndCAqZ3Qp Owogdm9pZCBpbnRlbF9tb2NzX2luaXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSk7CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMjdkOTNmYzhkMjBi Li40OWM3YzdiODdiZGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMTI4OSw3ICsxMjg5 LDcgQEAgaW50IGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCQlnb3RvIG91dDsKIAl9CiAKLQlpbnRlbF9tb2NzX2luaXRfbDNjY190YWJsZShkZXZf cHJpdik7CisJaW50ZWxfbW9jc19pbml0X2wzY2NfdGFibGUoJmRldl9wcml2LT5ndCk7CiAKIAkv KiBPbmx5IHdoZW4gdGhlIEhXIGlzIHJlLWluaXRpYWxpc2VkLCBjYW4gd2UgcmVwbGF5IHRoZSBy ZXF1ZXN0cyAqLwogCXJldCA9IGludGVsX2VuZ2luZXNfcmVzdW1lKGRldl9wcml2KTsKLS0gCjIu MjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4