From: Peter Antoine Subject: [PATCH] drm/i915/mocs: Program MOCS for all engines on init Date: Thu, 10 Mar 2016 15:27:00 +0000 Message-ID: <1457623620-17505-1-git-send-email-peter.antoine@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 ESMTP id A86CD6E9A6 for ; Thu, 10 Mar 2016 15:27:07 +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 List-Id: intel-gfx@lists.freedesktop.org QWxsb3cgZm9yIHRoZSBNT0NTIHRvIGJlIHByb2dyYW1tZWQgZm9yIGFsbCBlbmdpbmVzLgpDdXJy ZW50bHkgd2UgcHJvZ3JhbSB0aGUgTU9DUyB3aGVuIHRoZSBmaXJzdCByZW5kZXIgYmF0Y2gKZ29l cyB0aHJvdWdoLiBUaGlzIHdvcmtzIG9uIG1vc3QgcGxhdGZvcm1zIGJ1dCBmYWlscyBvbgpwbGF0 Zm9ybXMgdGhhdCBkbyBub3QgcnVuIGEgcmVuZGVyIGJhdGNoIGVhcmx5LAppLmUuIGhlYWRsZXNz IHNlcnZlcnMuIFRoZSBwYXRjaCBub3cgcHJvZ3JhbXMgYWxsIGluaXRpYWxpc2VkIGVuZ2luZXMK b24gaW5pdCBhbmQgdGhlIFJDUyBpcyBwcm9ncmFtbWVkIGFnYWluIHdpdGhpbiB0aGUgaW5pdGlh bCBiYXRjaC4gVGhpcwppcyBkb25lIGZvciBwcmVkaWN0YWJsZSBjb25zaXN0ZW5jeSB3aXRoIHJl Z2FyZHMgdG8gdGhlIGhhcmR3YXJlCmNvbnRleHQuCgpIYXJkd2FyZSBjb250ZXh0IGxvYWRpbmcg c2V0cyB0aGUgdmFsdWVzIG9mIHRoZSBNT0NTIGZvciBSQ1MKYW5kIEwzQ0MuIFByb2dyYW1taW5n IHRoZW0gZnJvbSB3aXRoaW4gdGhlIGJhdGNoIG1ha2VzIHN1cmUgdGhhdAp0aGUgcmVuZGVyIGNv bnRleHQgaXMgdmFsaWQsIG5vIG1hdHRlciB3aGF0IHRoZSBwcmV2aW91cyBzdGF0ZSBvZgp0aGUg c2F2ZWQtY29udGV4dCB3YXMuCgpTaWduZWQtb2ZmLWJ5OiBQZXRlciBBbnRvaW5lIDxwZXRlci5h bnRvaW5lQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAg fCAgIDcgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX21vY3MuYyB8IDEzNyArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbW9jcy5oIHwgICAxICsKIDMgZmlsZXMgY2hhbmdlZCwgMTMzIGluc2VydGlvbnMoKyksIDEy IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGI4NTRhZjIuLjBiYjZj NjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUg Imk5MTVfdmdwdS5oIgogI2luY2x1ZGUgImk5MTVfdHJhY2UuaCIKICNpbmNsdWRlICJpbnRlbF9k cnYuaCIKKyNpbmNsdWRlICJpbnRlbF9tb2NzLmgiCiAjaW5jbHVkZSA8bGludXgvc2htZW1fZnMu aD4KICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+CiAjaW5jbHVkZSA8bGludXgvc3dhcC5oPgpAQCAt NDg4Miw2ICs0ODgzLDEyIEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkJCWdvdG8gb3V0OwogCX0KIAorCS8qCisJICogbGV0cyBwcm9ncmFtIHRoZSBtb2NzIHZh bHVlcyBmb3IgYWxsIGVuZ2luZXMgdGhlIFJDUyB3aWxsCisJICogc2VuZCBhIGJhdGNoIG9uIGNv bnRleHQgc3RhcnQsIGJ1dCB0aGF0IHdpbGwgaGF2ZSB0byBoYXBwZW4KKwkgKi8KKwlpbnRlbF9w cm9ncmFtX21vY3NfYWxsX2VuZ2luZXMoZGV2KTsKKwogCS8qIFdlIGNhbid0IGVuYWJsZSBjb250 ZXh0cyB1bnRpbCBhbGwgZmlybXdhcmUgaXMgbG9hZGVkICovCiAJaWYgKEhBU19HVUNfVUNPREUo ZGV2KSkgewogCQlyZXQgPSBpbnRlbF9ndWNfdWNvZGVfbG9hZChkZXYpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbW9jcy5jCmluZGV4IGZlZDdiZWEuLjM5MzlhNTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX21vY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9tb2NzLmMKQEAgLTEyOCw5ICsxMjgsOSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9pOTE1 X21vY3NfZW50cnkgYnJveHRvbl9tb2NzX3RhYmxlW10gPSB7CiAKIC8qKgogICogZ2V0X21vY3Nf c2V0dGluZ3MoKQotICogQGRldjogICAgICAgIERSTSBkZXZpY2UuCisgKiBAZGV2OglEUk0gZGV2 aWNlLgogICogQHRhYmxlOiAgICAgIE91dHB1dCB0YWJsZSB0aGF0IHdpbGwgYmUgbWFkZSB0byBw b2ludCBhdCBhcHByb3ByaWF0ZQotICogICAgICAgICAgICAgIE1PQ1MgdmFsdWVzIGZvciB0aGUg ZGV2aWNlLgorICoJICAgICAgTU9DUyB2YWx1ZXMgZm9yIHRoZSBkZXZpY2UuCiAgKgogICogVGhp cyBmdW5jdGlvbiB3aWxsIHJldHVybiB0aGUgdmFsdWVzIG9mIHRoZSBNT0NTIHRhYmxlIHRoYXQg bmVlZHMgdG8KICAqIGJlIHByb2dyYW1tZWQgZm9yIHRoZSBwbGF0Zm9ybS4gSXQgd2lsbCByZXR1 cm4gdGhlIHZhbHVlcyB0aGF0IG5lZWQKQEAgLTE3OSw2ICsxNzksNDggQEAgc3RhdGljIGk5MTVf cmVnX3QgbW9jc19yZWdpc3RlcihlbnVtIGludGVsX3JpbmdfaWQgcmluZywgaW50IGluZGV4KQog fQogCiAvKioKKyAqIHByb2dyYW1fbW9jc19jb250cm9sX3RhYmxlKCkgLSBlbWl0IHRoZSBtb2Nz IGNvbnRyb2wgdGFibGUKKyAqIEByZXE6CVJlcXVlc3QgdG8gc2V0IHVwIHRoZSBNT0NTIHRhYmxl IGZvci4KKyAqIEB0YWJsZToJVGhlIHZhbHVlcyB0byBwcm9ncmFtIGludG8gdGhlIGNvbnRyb2wg cmVncy4KKyAqIEByaW5nOglUaGUgZW5naW5lIGZvciB3aG9tIHRvIGVtaXQgdGhlIHJlZ2lzdGVy cy4KKyAqCisgKiBUaGlzIGZ1bmN0aW9uIHNpbXBseSBlbWl0cyBhIE1JX0xPQURfUkVHSVNURVJf SU1NIGNvbW1hbmQgZm9yIHRoZQorICogZ2l2ZW4gdGFibGUgc3RhcnRpbmcgYXQgdGhlIGdpdmVu IGFkZHJlc3MuCisgKgorICogUmV0dXJuOiAwIG9uIHN1Y2Nlc3MsIG90aGVyd2lzZSB0aGUgZXJy b3Igc3RhdHVzLgorICovCitzdGF0aWMgaW50IHByb2dyYW1fbW9jc19jb250cm9sX3RhYmxlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkJICAgY29uc3Qgc3RydWN0IGRybV9pOTE1X21vY3Nf dGFibGUgKnRhYmxlLAorCQkJCSAgIGVudW0gaW50ZWxfcmluZ19pZCByaW5nKQoreworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJdW5zaWdu ZWQgaW50IGluZGV4OworCisJaWYgKFdBUk5fT04odGFibGUtPnNpemUgPiBHRU45X05VTV9NT0NT X0VOVFJJRVMpKQorCQlyZXR1cm4gLUVOT0RFVjsKKworCWZvciAoaW5kZXggPSAwOyBpbmRleCA8 IHRhYmxlLT5zaXplOyBpbmRleCsrKSB7CisJCUk5MTVfV1JJVEUobW9jc19yZWdpc3RlcihyaW5n LCBpbmRleCksCisJCQl0YWJsZS0+dGFibGVbaW5kZXhdLmNvbnRyb2xfdmFsdWUpOworCX0KKwor CS8qCisJICogT2ssIG5vdyBzZXQgdGhlIHVudXNlZCBlbnRyaWVzIHRvIHVuY2FjaGVkLiBUaGVz ZSBlbnRyaWVzCisJICogYXJlIG9mZmljaWFsbHkgdW5kZWZpbmVkIGFuZCBubyBjb250cmFjdCBm b3IgdGhlIGNvbnRlbnRzCisJICogYW5kIHNldHRpbmdzIGlzIGdpdmVuIGZvciB0aGVzZSBlbnRy aWVzLgorCSAqCisJICogRW50cnkgMCBpbiB0aGUgdGFibGUgaXMgdW5jYWNoZWQgLSBzbyB3ZSBh cmUganVzdCB3cml0aW5nCisJICogdGhhdCB2YWx1ZSB0byBhbGwgdGhlIHVzZWQgZW50cmllcy4K KwkgKi8KKwlmb3IgKDsgaW5kZXggPCBHRU45X05VTV9NT0NTX0VOVFJJRVM7IGluZGV4KyspIHsK KwkJSTkxNV9XUklURShtb2NzX3JlZ2lzdGVyKHJpbmcsIGluZGV4KSwKKwkJCQkJdGFibGUtPnRh YmxlWzBdLmNvbnRyb2xfdmFsdWUpOworCX0KKworCXJldHVybiAwOworfQorCisvKioKICAqIGVt aXRfbW9jc19jb250cm9sX3RhYmxlKCkgLSBlbWl0IHRoZSBtb2NzIGNvbnRyb2wgdGFibGUKICAq IEByZXE6CVJlcXVlc3QgdG8gc2V0IHVwIHRoZSBNT0NTIHRhYmxlIGZvci4KICAqIEB0YWJsZToJ VGhlIHZhbHVlcyB0byBwcm9ncmFtIGludG8gdGhlIGNvbnRyb2wgcmVncy4KQEAgLTMwMiw2ICsz NDQsODMgQEAgc3RhdGljIGludCBlbWl0X21vY3NfbDNjY190YWJsZShzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwKIH0KIAogLyoqCisgKiBwcm9ncmFtX21vY3NfbDNjY190YWJsZSgp IC0gcHJvZ3JhbSB0aGUgbW9jcyBjb250cm9sIHRhYmxlCisgKiBAZGV2OiAgICAgIFRoZSB0aGUg ZGV2aWNlIHRvIGJlIHByb2dyYW1tZWQuCisgKiBAdGFibGU6ICAgIFRoZSB2YWx1ZXMgdG8gcHJv Z3JhbSBpbnRvIHRoZSBjb250cm9sIHJlZ3MuCisgKgorICogVGhpcyBmdW5jdGlvbiBzaW1wbHkg cHJvZ3JhbXMgdGhlIG1vY3MgcmVnaXN0ZXJzIGZvciB0aGUgZ2l2ZW4gdGFibGUKKyAqIHN0YXJ0 aW5nIGF0IHRoZSBnaXZlbiBhZGRyZXNzLiBUaGlzIHJlZ2lzdGVyIHNldCBpcyAgcHJvZ3JhbW1l ZCBpbiBwYWlycy4KKyAqCisgKiBUaGVzZSByZWdpc3RlcnMgbWF5IGdldCBwcm9ncmFtbWVkIG1v cmUgdGhhbiBvbmNlLCBpdCBpcyBzaW1wbGVyIHRvCisgKiByZS1wcm9ncmFtIDMyIHJlZ2lzdGVy cyB0aGFuIG1haW50YWluIHRoZSBzdGF0ZSBvZiB3aGVuIHRoZXkgd2VyZSBwcm9ncmFtbWVkLgor ICogV2UgYXJlIGFsd2F5cyByZXByb2dyYW1taW5nIHdpdGggdGhlIHNhbWUgdmFsdWVzIGFuZCB0 aGlzIG9ubHkgb24gY29udGV4dAorICogc3RhcnQuCisgKgorICogUmV0dXJuOiBOb3RoaW5nLgor ICovCitzdGF0aWMgdm9pZCBwcm9ncmFtX21vY3NfbDNjY190YWJsZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAorCQkJICAgICAgc3RydWN0IGRybV9pOTE1X21vY3NfdGFibGUgKnRhYmxlKQorewor CXVuc2lnbmVkIGludCBjb3VudDsKKwl1bnNpZ25lZCBpbnQgaTsKKwl1MzIgdmFsdWU7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwl1MzIg ZmlsbGVyID0gKHRhYmxlLT50YWJsZVswXS5sM2NjX3ZhbHVlICYgMHhmZmZmKSB8CisJCQkoKHRh YmxlLT50YWJsZVswXS5sM2NjX3ZhbHVlICYgMHhmZmZmKSA8PCAxNik7CisKKwlmb3IgKGkgPSAw LCBjb3VudCA9IDA7IGkgPCB0YWJsZS0+c2l6ZSAvIDI7IGkrKywgY291bnQgKz0gMikgeworCQl2 YWx1ZSA9ICh0YWJsZS0+dGFibGVbY291bnRdLmwzY2NfdmFsdWUgJiAweGZmZmYpIHwKKwkJCSgo dGFibGUtPnRhYmxlW2NvdW50ICsgMV0ubDNjY192YWx1ZSAmIDB4ZmZmZikgPDwgMTYpOworCisJ CUk5MTVfV1JJVEUoR0VOOV9MTkNGQ01PQ1MoaSksIHZhbHVlKTsKKwl9CisKKwlpZiAodGFibGUt PnNpemUgJiAweDAxKSB7CisJCS8qIE9kZCB0YWJsZSBzaXplIC0gMSBsZWZ0IG92ZXIgKi8KKwkJ dmFsdWUgPSAodGFibGUtPnRhYmxlW2NvdW50XS5sM2NjX3ZhbHVlICYgMHhmZmZmKSB8CisJCQko KHRhYmxlLT50YWJsZVswXS5sM2NjX3ZhbHVlICYgMHhmZmZmKSA8PCAxNik7CisJfSBlbHNlCisJ CXZhbHVlID0gZmlsbGVyOworCisJLyoKKwkgKiBOb3cgc2V0IHRoZSByZXN0IG9mIHRoZSB0YWJs ZSB0byB1bmNhY2hlZCAtIHVzZSBlbnRyeSAwIGFzIHRoaXMKKwkgKiB3aWxsIGJlIHVuY2FjaGVk LiBMZWF2ZSB0aGUgbGFzdCBwYWlyIGFzIGluaXRpYWxpc2VkIGFzIHRoZXkgYXJlCisJICogcmVz ZXJ2ZWQgYnkgdGhlIGhhcmR3YXJlLgorCSAqLworCWZvciAoOyBpIDwgKEdFTjlfTlVNX01PQ1Nf RU5UUklFUyAvIDIpOyBpKyspIHsKKwkJSTkxNV9XUklURShHRU45X0xOQ0ZDTU9DUyhpKSwgdmFs dWUpOworCQl2YWx1ZSA9IGZpbGxlcjsKKwl9Cit9CisKKy8qCisgKiBpbnRlbF9wcm9ncmFtX21v Y3NfYWxsX2VuZ2luZXMoKSAtIHByb2dyYW0gYWxsIHRoZSBNT0NTIHJlZ2lzdGVyLgorICoKKyAq IFRoaXMgZnVuY3Rpb24gd2lsbCBwcm9ncmFtIHRoZSBNT0NTIHJlZ2lzdGVycyB3aXRoIHRoZSBj b3JyZWN0IHZhbHVlcy4KKyAqIEZvciBhbGwgZW5naW5lcy4KKyAqCisgKiBSZXR1cm46IE5vdGhp bmcuCisgKi8KK3ZvaWQgaW50ZWxfcHJvZ3JhbV9tb2NzX2FsbF9lbmdpbmVzKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9pOTE1X21vY3NfdGFibGUgdDsKKworCWlmIChn ZXRfbW9jc19zZXR0aW5ncyhkZXYsICZ0KSkgeworCQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nOworCQllbnVtIGludGVsX3JpbmdfaWQgcmluZ19pZDsKKworCQkvKiBQcm9ncmFtIHRoZSBj b250cm9sIHJlZ2lzdGVycyAqLworCQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCByaW5n X2lkKSB7CisJCQlwcm9ncmFtX21vY3NfY29udHJvbF90YWJsZShkZXYsICZ0LCByaW5nX2lkKTsK KwkJfQorCisJCS8qIE5vdyBwcm9ncmFtIHRoZSBsM2NjIHJlZ2lzdGVycyAqLworCQlwcm9ncmFt X21vY3NfbDNjY190YWJsZShkZXYsICZ0KTsKKwl9Cit9CisKKy8qKgogICogaW50ZWxfcmNzX2Nv bnRleHRfaW5pdF9tb2NzKCkgLSBwcm9ncmFtIHRoZSBNT0NTIHJlZ2lzdGVyLgogICogQHJlcToJ UmVxdWVzdCB0byBzZXQgdXAgdGhlIE1PQ1MgdGFibGVzIGZvci4KICAqCkBAIC0zMjMsMTYgKzQ0 MiwxMCBAQCBpbnQgaW50ZWxfcmNzX2NvbnRleHRfaW5pdF9tb2NzKHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxKQogCWludCByZXQ7CiAKIAlpZiAoZ2V0X21vY3Nfc2V0dGluZ3MocmVx LT5yaW5nLT5kZXYsICZ0KSkgewotCQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSByZXEtPmk5MTU7Ci0JCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0JCWVudW0gaW50 ZWxfcmluZ19pZCByaW5nX2lkOwotCi0JCS8qIFByb2dyYW0gdGhlIGNvbnRyb2wgcmVnaXN0ZXJz ICovCi0JCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIHJpbmdfaWQpIHsKLQkJCXJldCA9 IGVtaXRfbW9jc19jb250cm9sX3RhYmxlKHJlcSwgJnQsIHJpbmdfaWQpOwotCQkJaWYgKHJldCkK LQkJCQlyZXR1cm4gcmV0OwotCQl9CisJCS8qIFByb2dyYW0gdGhlIFJDUyBjb250cm9sIHJlZ2lz dGVycyAqLworCQlyZXQgPSBlbWl0X21vY3NfY29udHJvbF90YWJsZShyZXEsICZ0LCBSQ1MpOwor CQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKIAogCQkvKiBOb3cgcHJvZ3JhbSB0aGUgbDNjYyBy ZWdpc3RlcnMgKi8KIAkJcmV0ID0gZW1pdF9tb2NzX2wzY2NfdGFibGUocmVxLCAmdCk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tb2NzLmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9tb2NzLmgKaW5kZXggNzZlNDViMS4uNjg2OTMxNyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX21vY3MuaApAQCAtNTMsNSArNTMsNiBAQAogI2luY2x1ZGUgImk5MTVfZHJ2Lmgi CiAKIGludCBpbnRlbF9yY3NfY29udGV4dF9pbml0X21vY3Moc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXEpOwordm9pZCBpbnRlbF9wcm9ncmFtX21vY3NfYWxsX2VuZ2luZXMoc3RydWN0 IGRybV9kZXZpY2UgKmRldik7CiAKICNlbmRpZgotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=