From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 12/33] drm/i915: Convert intel_mocs_init_l3cc_table to intel_gt Date: Tue, 18 Jun 2019 14:03:24 +0100 Message-ID: <20190618130345.6135-13-tvrtko.ursulin@linux.intel.com> References: <20190618130345.6135-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 D75D16E172 for ; Tue, 18 Jun 2019 13:04:06 +0000 (UTC) In-Reply-To: <20190618130345.6135-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+ ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9tb2NzLmMgfCA1MiArKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9tb2NzLmggfCAg MyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgIHwgIDIgKy0KIDMgZmls ZXMgY2hhbmdlZCwgMzUgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfbW9jcy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvZ3QvaW50ZWxfbW9jcy5jCmluZGV4IDFmOWRiNTBiMTg2OS4uZDA4YjhmNDcyNjliIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9tb2NzLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfbW9jcy5jCkBAIC0yMyw2ICsyMyw3IEBACiAjaW5j bHVkZSAiaTkxNV9kcnYuaCIKIAogI2luY2x1ZGUgImludGVsX2VuZ2luZS5oIgorI2luY2x1ZGUg ImludGVsX2d0LmgiCiAjaW5jbHVkZSAiaW50ZWxfbW9jcy5oIgogI2luY2x1ZGUgImludGVsX2xy Yy5oIgogCkBAIC0yNDcsNyArMjQ4LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1faTkxNV9t b2NzX2VudHJ5IGljZWxha2VfbW9jc190YWJsZVtdID0gewogCiAvKioKICAqIGdldF9tb2NzX3Nl dHRpbmdzKCkKLSAqIEBkZXZfcHJpdjoJaTkxNSBkZXZpY2UuCisgKiBAZ3Q6CQlndCBkZXZpY2UK ICAqIEB0YWJsZTogICAgICBPdXRwdXQgdGFibGUgdGhhdCB3aWxsIGJlIG1hZGUgdG8gcG9pbnQg YXQgYXBwcm9wcmlhdGUKICAqCSAgICAgIE1PQ1MgdmFsdWVzIGZvciB0aGUgZGV2aWNlLgogICoK QEAgLTI1NywzMyArMjU4LDM0IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfbW9jc19l bnRyeSBpY2VsYWtlX21vY3NfdGFibGVbXSA9IHsKICAqCiAgKiBSZXR1cm46IHRydWUgaWYgdGhl cmUgYXJlIGFwcGxpY2FibGUgTU9DUyBzZXR0aW5ncyBmb3IgdGhlIGRldmljZS4KICAqLwotc3Rh dGljIGJvb2wgZ2V0X21vY3Nfc2V0dGluZ3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAorc3RhdGljIGJvb2wgZ2V0X21vY3Nfc2V0dGluZ3Moc3RydWN0IGludGVsX2d0ICpndCwK IAkJCSAgICAgIHN0cnVjdCBkcm1faTkxNV9tb2NzX3RhYmxlICp0YWJsZSkKIHsKKwlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IGd0LT5pOTE1OwogCWJvb2wgcmVzdWx0ID0gZmFsc2U7 CiAKLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkgeworCWlmIChJTlRFTF9HRU4oaTkx NSkgPj0gMTEpIHsKIAkJdGFibGUtPnNpemUgID0gQVJSQVlfU0laRShpY2VsYWtlX21vY3NfdGFi bGUpOwogCQl0YWJsZS0+dGFibGUgPSBpY2VsYWtlX21vY3NfdGFibGU7CiAJCXRhYmxlLT5uX2Vu dHJpZXMgPSBHRU4xMV9OVU1fTU9DU19FTlRSSUVTOwogCQlyZXN1bHQgPSB0cnVlOwotCX0gZWxz ZSBpZiAoSVNfR0VOOV9CQyhkZXZfcHJpdikgfHwgSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikpIHsK Kwl9IGVsc2UgaWYgKElTX0dFTjlfQkMoaTkxNSkgfHwgSVNfQ0FOTk9OTEFLRShpOTE1KSkgewog CQl0YWJsZS0+c2l6ZSAgPSBBUlJBWV9TSVpFKHNreWxha2VfbW9jc190YWJsZSk7CiAJCXRhYmxl LT5uX2VudHJpZXMgPSBHRU45X05VTV9NT0NTX0VOVFJJRVM7CiAJCXRhYmxlLT50YWJsZSA9IHNr eWxha2VfbW9jc190YWJsZTsKIAkJcmVzdWx0ID0gdHJ1ZTsKLQl9IGVsc2UgaWYgKElTX0dFTjlf TFAoZGV2X3ByaXYpKSB7CisJfSBlbHNlIGlmIChJU19HRU45X0xQKGk5MTUpKSB7CiAJCXRhYmxl LT5zaXplICA9IEFSUkFZX1NJWkUoYnJveHRvbl9tb2NzX3RhYmxlKTsKIAkJdGFibGUtPm5fZW50 cmllcyA9IEdFTjlfTlVNX01PQ1NfRU5UUklFUzsKIAkJdGFibGUtPnRhYmxlID0gYnJveHRvbl9t b2NzX3RhYmxlOwogCQlyZXN1bHQgPSB0cnVlOwogCX0gZWxzZSB7Ci0JCVdBUk5fT05DRShJTlRF TF9HRU4oZGV2X3ByaXYpID49IDksCisJCVdBUk5fT05DRShJTlRFTF9HRU4oaTkxNSkgPj0gOSwK IAkJCSAgIlBsYXRmb3JtIHRoYXQgc2hvdWxkIGhhdmUgYSBNT0NTIHRhYmxlIGRvZXMgbm90Llxu Iik7CiAJfQogCiAJLyogV2FEaXNhYmxlU2tpcENhY2hpbmc6c2tsLGJ4dCxrYmwsZ2xrICovCi0J aWYgKElTX0dFTihkZXZfcHJpdiwgOSkpIHsKKwlpZiAoSVNfR0VOKGk5MTUsIDkpKSB7CiAJCWlu dCBpOwogCiAJCWZvciAoaSA9IDA7IGkgPCB0YWJsZS0+c2l6ZTsgaSsrKQpAQCAtMzM4LDEyICsz NDAsMTMgQEAgc3RhdGljIHUzMiBnZXRfZW50cnlfY29udHJvbChjb25zdCBzdHJ1Y3QgZHJtX2k5 MTVfbW9jc190YWJsZSAqdGFibGUsCiAgKi8KIHZvaWQgaW50ZWxfbW9jc19pbml0X2VuZ2luZShz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OworCXN0cnVjdCBpbnRlbF9ndCAqZ3QgPSBlbmdp bmUtPmd0OworCXN0cnVjdCBpbnRlbF91bmNvcmUgKnVuY29yZSA9IGd0LT51bmNvcmU7CiAJc3Ry dWN0IGRybV9pOTE1X21vY3NfdGFibGUgdGFibGU7CiAJdW5zaWduZWQgaW50IGluZGV4OwogCXUz MiB1bnVzZWRfdmFsdWU7CiAKLQlpZiAoIWdldF9tb2NzX3NldHRpbmdzKGRldl9wcml2LCAmdGFi bGUpKQorCWlmICghZ2V0X21vY3Nfc2V0dGluZ3MoZ3QsICZ0YWJsZSkpCiAJCXJldHVybjsKIAog CS8qIFNldCB1bnVzZWQgdmFsdWVzIHRvIFBURSAqLwpAQCAtMzUyLDEyICszNTUsMTYgQEAgdm9p ZCBpbnRlbF9tb2NzX2luaXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK IAlmb3IgKGluZGV4ID0gMDsgaW5kZXggPCB0YWJsZS5zaXplOyBpbmRleCsrKSB7CiAJCXUzMiB2 YWx1ZSA9IGdldF9lbnRyeV9jb250cm9sKCZ0YWJsZSwgaW5kZXgpOwogCi0JCUk5MTVfV1JJVEUo bW9jc19yZWdpc3RlcihlbmdpbmUtPmlkLCBpbmRleCksIHZhbHVlKTsKKwkJaW50ZWxfdW5jb3Jl X3dyaXRlKHVuY29yZSwKKwkJCQkgICBtb2NzX3JlZ2lzdGVyKGVuZ2luZS0+aWQsIGluZGV4KSwK KwkJCQkgICB2YWx1ZSk7CiAJfQogCiAJLyogQWxsIHJlbWFpbmluZyBlbnRyaWVzIGFyZSBhbHNv IHVudXNlZCAqLwogCWZvciAoOyBpbmRleCA8IHRhYmxlLm5fZW50cmllczsgaW5kZXgrKykKLQkJ STkxNV9XUklURShtb2NzX3JlZ2lzdGVyKGVuZ2luZS0+aWQsIGluZGV4KSwgdW51c2VkX3ZhbHVl KTsKKwkJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwKKwkJCQkgICBtb2NzX3JlZ2lzdGVyKGVu Z2luZS0+aWQsIGluZGV4KSwKKwkJCQkgICB1bnVzZWRfdmFsdWUpOwogfQogCiAvKioKQEAgLTUw MiwxMyArNTA5LDE0IEBAIHN0YXRpYyBpbnQgZW1pdF9tb2NzX2wzY2NfdGFibGUoc3RydWN0IGk5 MTVfcmVxdWVzdCAqcnEsCiAgKgogICogUmV0dXJuOiBOb3RoaW5nLgogICovCi12b2lkIGludGVs X21vY3NfaW5pdF9sM2NjX3RhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK K3ZvaWQgaW50ZWxfbW9jc19pbml0X2wzY2NfdGFibGUoc3RydWN0IGludGVsX2d0ICpndCkKIHsK KwlzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUgPSBndC0+dW5jb3JlOwogCXN0cnVjdCBkcm1f aTkxNV9tb2NzX3RhYmxlIHRhYmxlOwogCXVuc2lnbmVkIGludCBpOwogCXUxNiB1bnVzZWRfdmFs dWU7CiAKLQlpZiAoIWdldF9tb2NzX3NldHRpbmdzKGRldl9wcml2LCAmdGFibGUpKQorCWlmICgh Z2V0X21vY3Nfc2V0dGluZ3MoZ3QsICZ0YWJsZSkpCiAJCXJldHVybjsKIAogCS8qIFNldCB1bnVz ZWQgdmFsdWVzIHRvIFBURSAqLwpAQCAtNTE4LDIzICs1MjYsMjcgQEAgdm9pZCBpbnRlbF9tb2Nz X2luaXRfbDNjY190YWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXUx NiBsb3cgPSBnZXRfZW50cnlfbDNjYygmdGFibGUsIDIgKiBpKTsKIAkJdTE2IGhpZ2ggPSBnZXRf ZW50cnlfbDNjYygmdGFibGUsIDIgKiBpICsgMSk7CiAKLQkJSTkxNV9XUklURShHRU45X0xOQ0ZD TU9DUyhpKSwKLQkJCSAgIGwzY2NfY29tYmluZSgmdGFibGUsIGxvdywgaGlnaCkpOworCQlpbnRl bF91bmNvcmVfd3JpdGUodW5jb3JlLAorCQkJCSAgIEdFTjlfTE5DRkNNT0NTKGkpLAorCQkJCSAg IGwzY2NfY29tYmluZSgmdGFibGUsIGxvdywgaGlnaCkpOwogCX0KIAogCS8qIE9kZCB0YWJsZSBz aXplIC0gMSBsZWZ0IG92ZXIgKi8KIAlpZiAodGFibGUuc2l6ZSAmIDB4MDEpIHsKIAkJdTE2IGxv dyA9IGdldF9lbnRyeV9sM2NjKCZ0YWJsZSwgMiAqIGkpOwogCi0JCUk5MTVfV1JJVEUoR0VOOV9M TkNGQ01PQ1MoaSksCi0JCQkgICBsM2NjX2NvbWJpbmUoJnRhYmxlLCBsb3csIHVudXNlZF92YWx1 ZSkpOworCQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAorCQkJCSAgIEdFTjlfTE5DRkNNT0NT KGkpLAorCQkJCSAgIGwzY2NfY29tYmluZSgmdGFibGUsIGxvdywgdW51c2VkX3ZhbHVlKSk7CiAJ CWkrKzsKIAl9CiAKIAkvKiBBbGwgcmVtYWluaW5nIGVudHJpZXMgYXJlIGFsc28gdW51c2VkICov CiAJZm9yICg7IGkgPCB0YWJsZS5uX2VudHJpZXMgLyAyOyBpKyspCi0JCUk5MTVfV1JJVEUoR0VO OV9MTkNGQ01PQ1MoaSksCi0JCQkgICBsM2NjX2NvbWJpbmUoJnRhYmxlLCB1bnVzZWRfdmFsdWUs IHVudXNlZF92YWx1ZSkpOworCQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAorCQkJCSAgIEdF TjlfTE5DRkNNT0NTKGkpLAorCQkJCSAgIGwzY2NfY29tYmluZSgmdGFibGUsIHVudXNlZF92YWx1 ZSwKKwkJCQkJCXVudXNlZF92YWx1ZSkpOwogfQogCiAvKioKQEAgLTU1OCw3ICs1NzAsNyBAQCBp bnQgaW50ZWxfcmNzX2NvbnRleHRfaW5pdF9tb2NzKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxKQog CXN0cnVjdCBkcm1faTkxNV9tb2NzX3RhYmxlIHQ7CiAJaW50IHJldDsKIAotCWlmIChnZXRfbW9j c19zZXR0aW5ncyhycS0+aTkxNSwgJnQpKSB7CisJaWYgKGdldF9tb2NzX3NldHRpbmdzKHJxLT5l bmdpbmUtPmd0LCAmdCkpIHsKIAkJLyogUHJvZ3JhbSB0aGUgUkNTIGNvbnRyb2wgcmVnaXN0ZXJz ICovCiAJCXJldCA9IGVtaXRfbW9jc19jb250cm9sX3RhYmxlKHJxLCAmdCk7CiAJCWlmIChyZXQp CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9tb2NzLmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9tb2NzLmgKaW5kZXggMDkxMzcwNGExYWYyLi44Yjk4 MTNlNmY5YWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX21vY3Mu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9tb2NzLmgKQEAgLTUyLDkgKzUy LDEwIEBACiBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZTsKIHN0cnVjdCBpOTE1X3JlcXVlc3Q7CiBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzOworc3RydWN0IGludGVsX2d0OwogCiBpbnQgaW50ZWxfcmNz X2NvbnRleHRfaW5pdF9tb2NzKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxKTsKLXZvaWQgaW50ZWxf bW9jc19pbml0X2wzY2NfdGFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsK K3ZvaWQgaW50ZWxfbW9jc19pbml0X2wzY2NfdGFibGUoc3RydWN0IGludGVsX2d0ICpndCk7CiB2 b2lkIGludGVsX21vY3NfaW5pdF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KTsKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAwYTMxMzI4OWY5ODQuLjI2 Y2FhMGI1YjVkNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xMjg2LDcgKzEyODYsNyBA QCBpbnQgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJCWdvdG8gb3V0OwogCX0KIAotCWludGVsX21vY3NfaW5pdF9sM2NjX3RhYmxlKGRldl9wcml2 KTsKKwlpbnRlbF9tb2NzX2luaXRfbDNjY190YWJsZSgmZGV2X3ByaXYtPmd0KTsKIAogCS8qIE9u bHkgd2hlbiB0aGUgSFcgaXMgcmUtaW5pdGlhbGlzZWQsIGNhbiB3ZSByZXBsYXkgdGhlIHJlcXVl c3RzICovCiAJcmV0ID0gaW50ZWxfZW5naW5lc19yZXN1bWUoZGV2X3ByaXYpOwotLSAKMi4yMC4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=