From: Ben Widawsky Subject: [PATCH 1/1] drm/i915: Version the MOCS settings Date: Thu, 6 Jul 2017 16:27:01 -0700 Message-ID: <20170706232703.14229-2-ben@bwidawsk.net> References: <20170706232703.14229-1-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170706232703.14229-1-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel GFX , mesa-dev Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpTdGFydGlu ZyB3aXRoIEdFTjksIE1lbW9yeSBPYmplY3QgQ29udHJvbCBTdGF0ZSAoTU9DUykgYmVjb21lcyBh biBpbmRleAppbnRvIGEgdGFibGUgYXMgb3Bwb3NlZCB0byB0aGUgZGlyZWN0IHByb2dyYW1taW5n IHdpdGhpbiB0aGUgY29tbWFuZC4KVGhlIHRhYmxlIGhhcyA2MiB1c2FibGUgZW50cmllcyAoaWUg NiBiaXRzIGNhbiByZXByZXNlbnQgYWxsIHNldHRpbmdzKSwKYW5kIGVhY2ggYnVmZmVyIHR5cGUg bWF5IHVzZSBvbmUgb2YgdGhlc2UgNjIgZW50cmllcyB0byBkZXNjcmliZQpjYWNoZWFiaWxpdHkg dHlwZSwgYW5kIGFnZSAoYW5kIHNvbWUgb3RoZXIgbGVzcyB1c2VmdWwgZmllbGRzKS4KCkJlY2F1 c2Ugd2UgaGFkbid0IGRlYWx0IHdpdGggTU9DUyBzZXR0aW5ncyBsaWtlIHRoaXMsIHdlIGRpZG4n dCB0aGluawphaGVhZCB0b28gd2VsbCBhbmQgaGF2ZSBlbmRlZCB1cCB3aXRoIGEgbWVzcyBmb3Ig R0VOOSAoYW5kIHNvb24gR0VOMTApCnBsYXRmb3JtLiBUaGUgcGxhbiBmb3IgZm9yIGZ1dHVyZSBw bGF0Zm9ybXMgaXMgdGhhdCB0aGUgaWRlYWwgTU9DUwpzZXR0aW5ncyB3aWxsIGJlIGRldGVybWlu ZWQsIGRlZmluZWQsIGFuZCB3cml0dGVuIGluIHRoZSBwdWJsaWMgUFJNcy4KQWZ0ZXIgdGhpcyBw b2ludCwgdGhlIGk5MTUua28gd2lsbCBhYnNvcmIgdGhlc2Ugc2V0dGluZ3MgYW5kIHNvbWV0aW1l CmFmdGVyd2FyZHMgZmxpcCB0aGUgYWxwaGEgc3dpdGNoLiBBbGwgZHJpdmVyIHJlbGVhc2VzIHdp dGhvdXQgdGhlIGZpbmFsCk1PQ1MgdGFibGUgbXVzdCBiZSBjb25zaWRlcmVkIGFscGhhLiBIZXJl IG9uLCB1c2Vyc3BhY2UgY2FuIGFzc3VtZSB0aGUKTU9DUyB0YWJsZSBpcyBkZWZpbml0aXZlbHkg ZG9uZS4gVGhlcmUgd2lsbCBiZSBzb21lIHJlc2VydmVkIGVudHJpZXMgZm9yCidvaCBzaGl0JyBz Y2VuYXJpb3MuIFRoaXMgYXZvaWRzIHZlcnNpb25pbmcgdGhlIE1PQ1MgdGFibGUgd2hpY2ggbGVh dmVzCnNvbWV3aGF0IG9mIGEgbWVzcyBpbiB1c2Vyc3BhY2UgdHJ5aW5nIHRvIGhhbmRsZSBhcmJp dHJhcmlseSBtYW55IE1PQ1MKdmVyc2lvbnMuCgpCdXQgd2UgZG8gaGF2ZSBhIG1lc3Mgb24gR0VO OS4gSW4gdGhlIGJlZ2lubmluZywgdGhlIE1PQ1MgdGFibGUgZW50cmllcwp3ZXJlIHByZS1wb3B1 bGF0ZWQgYnkgdGhlIGhhcmR3YXJlIGJhc2VkIG9uIGVzdGltYXRpb25zIG1hZGUgcHJpb3IgdG8K dGFwZW91dCBhbmQgd2UgY291bGQganVzdCB1c2UgdGhhdC4gU3Vic2VxdWVudGx5IG11Y2ggcGVy Zm9ybWFuY2UgdHVuaW5nCndhcyBkb25lIHRvIGRldGVybWluZSBvcHRpbWFsIHNldHRpbmdzIHRo YXQgdGhlIGk5MTUgZHJpdmVyIHNob3VsZCBsb2FkCm9uIHRvcCBvZiB0aGUgaGFyZHdhcmUgZGVm YXVsdHMuIFRoYXQgd2FzIHBvc3RlZCBsYXN0IGFzIHY2IG9mIHRoZQpvcmlnaW5hbCBwZXItZW5n aW5lIE1PQ1Mgc2V0dGluZ3M6Cmh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRj aC81MzIzNy8uIFNpbmNlIHRoZSBNT0NTIHRhYmxlIGlzCm5vdCBjb250ZXh0IHNhdmVkL3Jlc3Rv cmVkLCBpdCBpc24ndCBmZWFzaWJsZSB0byBsZXQgdXNlcnNwYWNlIHVwbG9hZAppdHMgb3duIE1P Q1MgdGFibGUuIEFmdGVyIGEgZ29vZCBhbW91bnQgb2YgZGViYXRlLCBpdCB3YXMgZGVjaWRlZCB0 aGF0CndlJ2QgdXRpbGl6ZSBvbmx5IHRoZSBtaW5pbWFsIHNldCBvZiBlbnRpcmVzIGluIG1lc2Eg YW55d2F5LCBhbmQgc28gd2UKdG9vayBvbmx5IHRob3NlIGVudHJpZXMgZm9yIG91ciBNT0NTIGVu dHJpZXMuCgpOb3cgd2UndmUgY29tZSB0byB0aGUgcmVhbGl6YXRpb24gdGhhdCBpbmRlZWQgdGhl cmUgYXJlIG90aGVyIE1PQ1MKZW50cmllcyB3aGljaCBhcmUgbW9yZSBvcHRpbWFsIGZvciB2YXJp b3VzIGJ1ZmZlciB0eXBlcyBhbmQgd29ya2xvYWRzLgpUaGUgcHJvYmxlbSBpcyB0aGF0IHRoZSBt ZWFuaW5nIG9mIHRoZSBpbmRpY2VzIGlzIEFCSSAod2UgYXNzdW1lIGluZGV4IDAKaXMgdGhlIHVu Y2FjaGVkIGVudHJ5LCBhbmQgdGhhdCB0aGVyZSBhcmUgb25seSAzIGVudHJpZXMgdG90YWwpLgoK V2hhdCB0aGlzIHBhdGNoIFtzaW1wbHldIGFpbXMgdG8gZG8gaXMgZXhwb3NlIGEgcGFyYW1ldGVy IHRvIGluZm9ybQp1c2Vyc3BhY2Ugd2hpY2ggInZlcnNpb24iIG9mIHRoZSB0YWJsZSB3YXMgbG9h ZGVkIGJ5IGk5MTUuIFVwb24Kc3VmZmljaWVudCBkYXRhLCBuZXcgZW50cmllcyBjYW4gYmUgYWRk ZWQsIGFuZCB0aGUgdmVyc2lvbiBjYW4gYmUKYnVtcGVkLiBGb3IgZXhhbXBsZSwgZnJvbSBteSBv cmlnaW5hbCBtZXNhIG1vY3MgYnJhbmNoOgoKY29tbWl0IGM5YjA0ODFiY2UyNGFmMDMyMzg2NzAx ZGUwMjY2ZWI1YmMyNGU5ODgKQXV0aG9yOiBCZW4gV2lkYXdza3kgPGJlbmphbWluLndpZGF3c2t5 QGludGVsLmNvbT4KRGF0ZTogICBGcmkgQXByIDggMTA6MjE6MTYgMjAxNiAtMDcwMAoKICAgIGk5 NjU6IFVzZSBQVEUgbW9jcwoKICAgIFNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuamFt aW4ud2lkYXdza3lAaW50ZWwuY29tPgoKZGlmZiAtLWdpdCBhL3NyYy9tZXNhL2RyaXZlcnMvZHJp L2k5NjUvYnJ3X21vY3MuYyBiL3NyYy9tZXNhL2RyaXZlcnMvZHJpL2k5NjUvYnJ3X21vY3MuYwpp bmRleCA1ZGYxNTRlYjg2Li5iN2JmZGFiNjcxIDEwMDY0NAotLS0gYS9zcmMvbWVzYS9kcml2ZXJz L2RyaS9pOTY1L2Jyd19tb2NzLmMKKysrIGIvc3JjL21lc2EvZHJpdmVycy9kcmkvaTk2NS9icndf bW9jcy5jCkBAIC0xNCw2ICsxNCw5IEBACiAvKiBTa3lsYWtlOiBNT0NTIGlzIG5vdyBhbiBpbmRl eCBpbnRvIGFuIGFycmF5IG9mIDYyIGRpZmZlcmVudCBjYWNoaW5nCiAgKiBjb25maWd1cmF0aW9u cyBwcm9ncmFtbWVkIGJ5IHRoZSBrZXJuZWwuCiAgKi8KKworLyogVEM9UFRFLCBMZUNDPVBURSwg TFJVTT0zLCBMM0NDPVdCICovCisjZGVmaW5lIFNLTF9NT0NTX1BURV9QVEUgKDMgPDwgMSkKIC8q IFRDPUxMQy9lTExDLCBMZUNDPVdCLCBMUlVNPTMsIEwzQ0M9V0IgKi8KICNkZWZpbmUgU0tMX01P Q1NfV0IgICgyIDw8IDEpCiAvKiBUQz1MTEMvZUxMQywgTGVDQz1QVEUsIExSVU09MywgTDNDQz1X QiAqLwpAQCAtMjYsNiArMjksOSBAQCBicndfbW9jc19nZXRfY29udHJvbF9zdGF0ZShjb25zdCBz dHJ1Y3QgYnJ3X2NvbnRleHQgKmJydywKICAgIHN3aXRjaCAoYnJ3LT5nZW4pIHsKICAgIGRlZmF1 bHQ6CiAgICBjYXNlIDk6CisgICAgICBpZiAoYnJ3LT5pbnRlbFNjcmVlbi0+bW9jc192ZXJzaW9u ID4gMSkKKyAgICAgICAgIHJldHVybiBTS0xfTU9DU19QVEVfUFRFOworCiAgICAgICByZXR1cm4g dHlwZSA9PSBJTlRFTF9NT0NTX1BURSA/IFNLTF9NT0NTX1BURSA6IFNLTF9NT0NTX1dCOwogICAg Y2FzZSA4OgogICAgICAgcmV0dXJuIHR5cGUgPT0gSU5URUxfTU9DU19QVEUgPyBCRFdfTU9DU19Q VEUgOiBCRFdfTU9DU19XQjsKCnRsO2RyOiBBIHZlcnNpb25lZCBNT0NTIHRhYmxlIHdpbGwgYWxs b3cgdXNlcnNwYWNlIHRvIGJlIGF3YXJlIG9mIG5ldwphbmQgcG90ZW50aWFsbHkgaW50ZXJlc3Rp bmcgY2FjaGVhYmlsaXR5IHNldHRpbmdzLiBOZXh0IEdFTiBwbGF0Zm9ybXMKd2lsbCBub3QgYmUg Y29uc2lkZXJlZCBwcm9kdWN0aW9uIHdvcnRoeSB1bnRpbCB0aGUgTU9DUyB0YWJsZSBpcwpmaW5h bGl6ZWQuCgp2MjogVXBkYXRlIDEuNSB5ZWFyIG9sZCBwYXRjaC4gQWRkIGNvbW1lbnRzLiBVcGRh dGUgY29tbWl0IG1lc3NhZ2UuCgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbmphbWlu LndpZGF3c2t5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j IHwgIDMgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgIDIgKysKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcGNpLmMgfCAxMyArKysrKysrKystLS0tCiBpbmNsdWRlL3Vh cGkvZHJtL2k5MTVfZHJtLmggICAgIHwgIDggKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgMjIg aW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRl eCA5MTY3YTczZjNjNjkuLjI2YzI3YjZhZTgxNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBA IC00MDEsNiArNDAxLDkgQEAgc3RhdGljIGludCBpOTE1X2dldHBhcmFtKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCWlmICghdmFsdWUpCiAJCQlyZXR1cm4gLUVOT0RFVjsK IAkJYnJlYWs7CisJY2FzZSBJOTE1X1BBUkFNX01PQ1NfVEFCTEVfVkVSU0lPTjoKKwkJdmFsdWUg PSBJTlRFTF9JTkZPKGRldl9wcml2KS0+bW9jc192ZXJzaW9uOworCQlicmVhazsKIAlkZWZhdWx0 OgogCQlEUk1fREVCVUcoIlVua25vd24gcGFyYW1ldGVyICVkXG4iLCBwYXJhbS0+cGFyYW0pOwog CQlyZXR1cm4gLUVJTlZBTDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGVmZmJlNGY3MmE2 NC4uOWIzMGY2ZTZlZjliIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTg1OSw2ICs4NTks OCBAQCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gewogCQl1MTYgZGVnYW1tYV9sdXRfc2l6ZTsK IAkJdTE2IGdhbW1hX2x1dF9zaXplOwogCX0gY29sb3I7CisKKwl1OCBtb2NzX3ZlcnNpb247CiB9 OwogCiBzdHJ1Y3QgaW50ZWxfZGlzcGxheV9lcnJvcl9zdGF0ZTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcGNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bj aS5jCmluZGV4IDA0YWFmNTUzZTNmYS4uOTY5N2ViOTFkOTcyIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cGNpLmMKQEAgLTM1Niw3ICszNTYsOCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2Rldmlj ZV9pbmZvIGludGVsX2NoZXJyeXZpZXdfaW5mbyA9IHsKIAkucGxhdGZvcm0gPSBJTlRFTF9TS1lM QUtFLCBcCiAJLmhhc19jc3IgPSAxLCBcCiAJLmhhc19ndWMgPSAxLCBcCi0JLmRkYl9zaXplID0g ODk2CisJLmRkYl9zaXplID0gODk2LCBcCisJLm1vY3NfdmVyc2lvbiA9IE1PQ1NfVEFCTEVfVkVS U0lPTgogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX3NreWxh a2VfaW5mbyA9IHsKIAlTS0xfUExBVEZPUk0sCkBAIC0zOTAsNiArMzkxLDcgQEAgc3RhdGljIGNv bnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9za3lsYWtlX2d0M19pbmZvID0gewog CS5oYXNfZnVsbF9wcGd0dCA9IDEsIFwKIAkuaGFzX2Z1bGxfNDhiaXRfcHBndHQgPSAxLCBcCiAJ Lmhhc19yZXNldF9lbmdpbmUgPSAxLCBcCisJLm1vY3NfdmVyc2lvbiA9IE1PQ1NfVEFCTEVfVkVS U0lPTiwgXAogCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLCBcCiAJSVZCX0NVUlNPUl9PRkZTRVRT LCBcCiAJQkRXX0NPTE9SUwpAQCAtNDEzLDcgKzQxNSw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg aW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfZ2VtaW5pbGFrZV9pbmZvID0gewogCS5wbGF0Zm9ybSA9 IElOVEVMX0tBQllMQUtFLCBcCiAJLmhhc19jc3IgPSAxLCBcCiAJLmhhc19ndWMgPSAxLCBcCi0J LmRkYl9zaXplID0gODk2CisJLmRkYl9zaXplID0gODk2LCBcCisJLm1vY3NfdmVyc2lvbiA9IE1P Q1NfVEFCTEVfVkVSU0lPTgogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZv IGludGVsX2thYnlsYWtlX2luZm8gPSB7CiAJS0JMX1BMQVRGT1JNLApAQCAtNDMxLDcgKzQzNCw4 IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfa2FieWxha2Vf Z3QzX2luZm8gPSB7CiAJLnBsYXRmb3JtID0gSU5URUxfQ09GRkVFTEFLRSwgXAogCS5oYXNfY3Ny ID0gMSwgXAogCS5oYXNfZ3VjID0gMSwgXAotCS5kZGJfc2l6ZSA9IDg5NgorCS5kZGJfc2l6ZSA9 IDg5NiwgXAorCS5tb2NzX3ZlcnNpb24gPSBNT0NTX1RBQkxFX1ZFUlNJT04KIAogc3RhdGljIGNv bnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9jb2ZmZWVsYWtlX2luZm8gPSB7CiAJ Q0ZMX1BMQVRGT1JNLApAQCAtNDQ4LDcgKzQ1Miw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50 ZWxfZGV2aWNlX2luZm8gaW50ZWxfY2Fubm9ubGFrZV9pbmZvID0gewogCS5wbGF0Zm9ybSA9IElO VEVMX0NBTk5PTkxBS0UsCiAJLmdlbiA9IDEwLAogCS5kZGJfc2l6ZSA9IDEwMjQsCi0JLmhhc19j c3IgPSAxLAorCS5oYXNfY3NyID0gMSwgXAorCS5tb2NzX3ZlcnNpb24gPSBNT0NTX1RBQkxFX1ZF UlNJT04KIH07CiAKIC8qCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgg Yi9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgKaW5kZXggN2NjYmQ2YTJiYmUwLi4yZTM3MGM0 MGU0OGQgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaAorKysgYi9pbmNs dWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgKQEAgLTQzMSw2ICs0MzEsMTQgQEAgdHlwZWRlZiBzdHJ1 Y3QgZHJtX2k5MTVfaXJxX3dhaXQgewogICovCiAjZGVmaW5lIEk5MTVfUEFSQU1fSEFTX0VYRUNf QkFUQ0hfRklSU1QJIDQ4CiAKKy8qIFdoYXQgdmVyc2lvbiBvZiB0aGUgTU9DUyB0YWJsZSB3ZSBo YXZlLiBGb3IgR0VOOSBHUFVzLCB0aGUgUFJNIGRlZmluZWQKKyAqIG5vbi1vcHRpbWFsIHNldHRp bmdzIGZvciB0aGUgTU9DUyB0YWJsZS4gQXMgYSByZXN1bHQsIHdlIHdlcmUgcmVxdWlyZWQgdG8g dXNlIGEKKyAqIHNtYWxsIHN1YnNldCwgYW5kIGxhdGVyIGFkZCBuZXcgc2V0dGluZ3MuIFRoaXMg cGFyYW0gYWxsb3dzIHVzZXJzcGFjZSB0bworICogZGV0ZXJtaW5lIHdoaWNoIHNldHRpbmdzIGFy ZSB0aGVyZS4KKyAqLworI2RlZmluZSBNT0NTX1RBQkxFX1ZFUlNJT04JCSAgMSAvKiBCdWlsZCB0 aW1lIE1PQ1MgdGFibGUgdmVyc2lvbiAqLworI2RlZmluZSBJOTE1X1BBUkFNX01PQ1NfVEFCTEVf VkVSU0lPTgkgNDkKKwogdHlwZWRlZiBzdHJ1Y3QgZHJtX2k5MTVfZ2V0cGFyYW0gewogCV9fczMy IHBhcmFtOwogCS8qCi0tIAoyLjEzLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=