From: Peter Antoine Subject: [PATCH] drm/i915/mocs: Program MOCS for all engines on init Date: Thu, 10 Mar 2016 15:32:25 +0000 Message-ID: <1457623945-17950-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 20C8F6E9AE for ; Thu, 10 Mar 2016 15:32:44 +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 fCAgIDMgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jIHwgMTM4ICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9tb2NzLmggfCAgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCAxMzAgaW5zZXJ0aW9ucygrKSwgMTIg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggYjg1NGFmMi4uMDVjOWZj YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAi aTkxNV92Z3B1LmgiCiAjaW5jbHVkZSAiaTkxNV90cmFjZS5oIgogI2luY2x1ZGUgImludGVsX2Ry di5oIgorI2luY2x1ZGUgImludGVsX21vY3MuaCIKICNpbmNsdWRlIDxsaW51eC9zaG1lbV9mcy5o PgogI2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4KICNpbmNsdWRlIDxsaW51eC9zd2FwLmg+CkBAIC00 ODgyLDYgKzQ4ODMsOCBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCQlnb3RvIG91dDsKIAl9CiAKKwlpbnRlbF9wcm9ncmFtX21vY3NfZW5naW5lcyhkZXYpOwor CiAJLyogV2UgY2FuJ3QgZW5hYmxlIGNvbnRleHRzIHVudGlsIGFsbCBmaXJtd2FyZSBpcyBsb2Fk ZWQgKi8KIAlpZiAoSEFTX0dVQ19VQ09ERShkZXYpKSB7CiAJCXJldCA9IGludGVsX2d1Y191Y29k ZV9sb2FkKGRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tb2Nz LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tb2NzLmMKaW5kZXggZmVkN2JlYS4uY2Qw MTY4MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX21vY3MuYwpAQCAtMTI4LDkgKzEyOCw5IEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfbW9jc19lbnRyeSBicm94dG9uX21vY3NfdGFibGVb XSA9IHsKIAogLyoqCiAgKiBnZXRfbW9jc19zZXR0aW5ncygpCi0gKiBAZGV2OiAgICAgICAgRFJN IGRldmljZS4KKyAqIEBkZXY6CURSTSBkZXZpY2UuCiAgKiBAdGFibGU6ICAgICAgT3V0cHV0IHRh YmxlIHRoYXQgd2lsbCBiZSBtYWRlIHRvIHBvaW50IGF0IGFwcHJvcHJpYXRlCi0gKiAgICAgICAg ICAgICAgTU9DUyB2YWx1ZXMgZm9yIHRoZSBkZXZpY2UuCisgKgkgICAgICBNT0NTIHZhbHVlcyBm b3IgdGhlIGRldmljZS4KICAqCiAgKiBUaGlzIGZ1bmN0aW9uIHdpbGwgcmV0dXJuIHRoZSB2YWx1 ZXMgb2YgdGhlIE1PQ1MgdGFibGUgdGhhdCBuZWVkcyB0bwogICogYmUgcHJvZ3JhbW1lZCBmb3Ig dGhlIHBsYXRmb3JtLiBJdCB3aWxsIHJldHVybiB0aGUgdmFsdWVzIHRoYXQgbmVlZApAQCAtMTc5 LDYgKzE3OSw0OCBAQCBzdGF0aWMgaTkxNV9yZWdfdCBtb2NzX3JlZ2lzdGVyKGVudW0gaW50ZWxf cmluZ19pZCByaW5nLCBpbnQgaW5kZXgpCiB9CiAKIC8qKgorICogcHJvZ3JhbV9tb2NzX2NvbnRy b2xfdGFibGUoKSAtIGVtaXQgdGhlIG1vY3MgY29udHJvbCB0YWJsZQorICogQHJlcToJUmVxdWVz dCB0byBzZXQgdXAgdGhlIE1PQ1MgdGFibGUgZm9yLgorICogQHRhYmxlOglUaGUgdmFsdWVzIHRv IHByb2dyYW0gaW50byB0aGUgY29udHJvbCByZWdzLgorICogQHJpbmc6CVRoZSBlbmdpbmUgZm9y IHdob20gdG8gZW1pdCB0aGUgcmVnaXN0ZXJzLgorICoKKyAqIFRoaXMgZnVuY3Rpb24gc2ltcGx5 IGVtaXRzIGEgTUlfTE9BRF9SRUdJU1RFUl9JTU0gY29tbWFuZCBmb3IgdGhlCisgKiBnaXZlbiB0 YWJsZSBzdGFydGluZyBhdCB0aGUgZ2l2ZW4gYWRkcmVzcy4KKyAqCisgKiBSZXR1cm46IDAgb24g c3VjY2Vzcywgb3RoZXJ3aXNlIHRoZSBlcnJvciBzdGF0dXMuCisgKi8KK3N0YXRpYyBpbnQgcHJv Z3JhbV9tb2NzX2NvbnRyb2xfdGFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkgICBj b25zdCBzdHJ1Y3QgZHJtX2k5MTVfbW9jc190YWJsZSAqdGFibGUsCisJCQkJICAgZW51bSBpbnRl bF9yaW5nX2lkIHJpbmcpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKKwl1bnNpZ25lZCBpbnQgaW5kZXg7CisKKwlpZiAoV0FSTl9PTih0 YWJsZS0+c2l6ZSA+IEdFTjlfTlVNX01PQ1NfRU5UUklFUykpCisJCXJldHVybiAtRU5PREVWOwor CisJZm9yIChpbmRleCA9IDA7IGluZGV4IDwgdGFibGUtPnNpemU7IGluZGV4KyspIHsKKwkJSTkx NV9XUklURShtb2NzX3JlZ2lzdGVyKHJpbmcsIGluZGV4KSwKKwkJCXRhYmxlLT50YWJsZVtpbmRl eF0uY29udHJvbF92YWx1ZSk7CisJfQorCisJLyoKKwkgKiBPaywgbm93IHNldCB0aGUgdW51c2Vk IGVudHJpZXMgdG8gdW5jYWNoZWQuIFRoZXNlIGVudHJpZXMKKwkgKiBhcmUgb2ZmaWNpYWxseSB1 bmRlZmluZWQgYW5kIG5vIGNvbnRyYWN0IGZvciB0aGUgY29udGVudHMKKwkgKiBhbmQgc2V0dGlu Z3MgaXMgZ2l2ZW4gZm9yIHRoZXNlIGVudHJpZXMuCisJICoKKwkgKiBFbnRyeSAwIGluIHRoZSB0 YWJsZSBpcyB1bmNhY2hlZCAtIHNvIHdlIGFyZSBqdXN0IHdyaXRpbmcKKwkgKiB0aGF0IHZhbHVl IHRvIGFsbCB0aGUgdXNlZCBlbnRyaWVzLgorCSAqLworCWZvciAoOyBpbmRleCA8IEdFTjlfTlVN X01PQ1NfRU5UUklFUzsgaW5kZXgrKykgeworCQlJOTE1X1dSSVRFKG1vY3NfcmVnaXN0ZXIocmlu ZywgaW5kZXgpLAorCQkJCQl0YWJsZS0+dGFibGVbMF0uY29udHJvbF92YWx1ZSk7CisJfQorCisJ cmV0dXJuIDA7Cit9CisKKy8qKgogICogZW1pdF9tb2NzX2NvbnRyb2xfdGFibGUoKSAtIGVtaXQg dGhlIG1vY3MgY29udHJvbCB0YWJsZQogICogQHJlcToJUmVxdWVzdCB0byBzZXQgdXAgdGhlIE1P Q1MgdGFibGUgZm9yLgogICogQHRhYmxlOglUaGUgdmFsdWVzIHRvIHByb2dyYW0gaW50byB0aGUg Y29udHJvbCByZWdzLgpAQCAtMzAyLDYgKzM0NCw4NCBAQCBzdGF0aWMgaW50IGVtaXRfbW9jc19s M2NjX3RhYmxlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogfQogCiAvKioKKyAq IHByb2dyYW1fbW9jc19sM2NjX3RhYmxlKCkgLSBwcm9ncmFtIHRoZSBtb2NzIGNvbnRyb2wgdGFi bGUKKyAqIEBkZXY6ICAgICAgVGhlIHRoZSBkZXZpY2UgdG8gYmUgcHJvZ3JhbW1lZC4KKyAqIEB0 YWJsZTogICAgVGhlIHZhbHVlcyB0byBwcm9ncmFtIGludG8gdGhlIGNvbnRyb2wgcmVncy4KKyAq CisgKiBUaGlzIGZ1bmN0aW9uIHNpbXBseSBwcm9ncmFtcyB0aGUgbW9jcyByZWdpc3RlcnMgZm9y IHRoZSBnaXZlbiB0YWJsZQorICogc3RhcnRpbmcgYXQgdGhlIGdpdmVuIGFkZHJlc3MuIFRoaXMg cmVnaXN0ZXIgc2V0IGlzICBwcm9ncmFtbWVkIGluIHBhaXJzLgorICoKKyAqIFRoZXNlIHJlZ2lz dGVycyBtYXkgZ2V0IHByb2dyYW1tZWQgbW9yZSB0aGFuIG9uY2UsIGl0IGlzIHNpbXBsZXIgdG8K KyAqIHJlLXByb2dyYW0gMzIgcmVnaXN0ZXJzIHRoYW4gbWFpbnRhaW4gdGhlIHN0YXRlIG9mIHdo ZW4gdGhleSB3ZXJlIHByb2dyYW1tZWQuCisgKiBXZSBhcmUgYWx3YXlzIHJlcHJvZ3JhbW1pbmcg d2l0aCB0aGUgc2FtZSB2YWx1ZXMgYW5kIHRoaXMgb25seSBvbiBjb250ZXh0CisgKiBzdGFydC4K KyAqCisgKiBSZXR1cm46IE5vdGhpbmcuCisgKi8KK3N0YXRpYyB2b2lkIHByb2dyYW1fbW9jc19s M2NjX3RhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkgICAgICBzdHJ1Y3QgZHJtX2k5 MTVfbW9jc190YWJsZSAqdGFibGUpCit7CisJdW5zaWduZWQgaW50IGNvdW50OworCXVuc2lnbmVk IGludCBpOworCXUzMiB2YWx1ZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOworCXUzMiBmaWxsZXIgPSAodGFibGUtPnRhYmxlWzBdLmwzY2Nf dmFsdWUgJiAweGZmZmYpIHwKKwkJCSgodGFibGUtPnRhYmxlWzBdLmwzY2NfdmFsdWUgJiAweGZm ZmYpIDw8IDE2KTsKKworCWZvciAoaSA9IDAsIGNvdW50ID0gMDsgaSA8IHRhYmxlLT5zaXplIC8g MjsgaSsrLCBjb3VudCArPSAyKSB7CisJCXZhbHVlID0gKHRhYmxlLT50YWJsZVtjb3VudF0ubDNj Y192YWx1ZSAmIDB4ZmZmZikgfAorCQkJKCh0YWJsZS0+dGFibGVbY291bnQgKyAxXS5sM2NjX3Zh bHVlICYgMHhmZmZmKSA8PCAxNik7CisKKwkJSTkxNV9XUklURShHRU45X0xOQ0ZDTU9DUyhpKSwg dmFsdWUpOworCX0KKworCWlmICh0YWJsZS0+c2l6ZSAmIDB4MDEpIHsKKwkJLyogT2RkIHRhYmxl IHNpemUgLSAxIGxlZnQgb3ZlciAqLworCQl2YWx1ZSA9ICh0YWJsZS0+dGFibGVbY291bnRdLmwz Y2NfdmFsdWUgJiAweGZmZmYpIHwKKwkJCSgodGFibGUtPnRhYmxlWzBdLmwzY2NfdmFsdWUgJiAw eGZmZmYpIDw8IDE2KTsKKwl9IGVsc2UKKwkJdmFsdWUgPSBmaWxsZXI7CisKKwkvKgorCSAqIE5v dyBzZXQgdGhlIHJlc3Qgb2YgdGhlIHRhYmxlIHRvIHVuY2FjaGVkIC0gdXNlIGVudHJ5IDAgYXMg dGhpcworCSAqIHdpbGwgYmUgdW5jYWNoZWQuIExlYXZlIHRoZSBsYXN0IHBhaXIgYXMgaW5pdGlh bGlzZWQgYXMgdGhleSBhcmUKKwkgKiByZXNlcnZlZCBieSB0aGUgaGFyZHdhcmUuCisJICovCisJ Zm9yICg7IGkgPCAoR0VOOV9OVU1fTU9DU19FTlRSSUVTIC8gMik7IGkrKykgeworCQlJOTE1X1dS SVRFKEdFTjlfTE5DRkNNT0NTKGkpLCB2YWx1ZSk7CisJCXZhbHVlID0gZmlsbGVyOworCX0KK30K KworLyoKKyAqIGludGVsX3Byb2dyYW1fbW9jc19lbmdpbmVzKCkgLSBwcm9ncmFtIGFsbCB0aGUg TU9DUyByZWdpc3Rlci4KKyAqCisgKiBUaGlzIGZ1bmN0aW9uIHdpbGwgcHJvZ3JhbSB0aGUgTU9D UyByZWdpc3RlcnMgd2l0aCB0aGUgY29ycmVjdCB2YWx1ZXMuCisgKiBGb3IgdGhlIGluaXRpYWxp c2VkIGVuZ2luZXMsIHRoaXMgbWVhbnMgdGhhdCBzb21lIG9mIHRoZSBNT0NTIGh3IHJlZ2lzdGVy cworICogd2lsbCBiZSBsZWZ0IGF0IHRoZSBoYXJkd2FyZSBkZWZhdWx0cy4KKyAqCisgKiBSZXR1 cm46IE5vdGhpbmcuCisgKi8KK3ZvaWQgaW50ZWxfcHJvZ3JhbV9tb2NzX2VuZ2luZXMoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfbW9jc190YWJsZSB0OworCisJ aWYgKGdldF9tb2NzX3NldHRpbmdzKGRldiwgJnQpKSB7CisJCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmc7CisJCWVudW0gaW50ZWxfcmluZ19pZCByaW5nX2lkOworCisJCS8qIFByb2dyYW0g dGhlIGNvbnRyb2wgcmVnaXN0ZXJzICovCisJCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYs IHJpbmdfaWQpIHsKKwkJCXByb2dyYW1fbW9jc19jb250cm9sX3RhYmxlKGRldiwgJnQsIHJpbmdf aWQpOworCQl9CisKKwkJLyogTm93IHByb2dyYW0gdGhlIGwzY2MgcmVnaXN0ZXJzICovCisJCXBy b2dyYW1fbW9jc19sM2NjX3RhYmxlKGRldiwgJnQpOworCX0KK30KKworLyoqCiAgKiBpbnRlbF9y Y3NfY29udGV4dF9pbml0X21vY3MoKSAtIHByb2dyYW0gdGhlIE1PQ1MgcmVnaXN0ZXIuCiAgKiBA cmVxOglSZXF1ZXN0IHRvIHNldCB1cCB0aGUgTU9DUyB0YWJsZXMgZm9yLgogICoKQEAgLTMyMywx NiArNDQzLDEwIEBAIGludCBpbnRlbF9yY3NfY29udGV4dF9pbml0X21vY3Moc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJaW50IHJldDsKIAogCWlmIChnZXRfbW9jc19zZXR0aW5n cyhyZXEtPnJpbmctPmRldiwgJnQpKSB7Ci0JCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHJlcS0+aTkxNTsKLQkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKLQkJZW51 bSBpbnRlbF9yaW5nX2lkIHJpbmdfaWQ7Ci0KLQkJLyogUHJvZ3JhbSB0aGUgY29udHJvbCByZWdp c3RlcnMgKi8KLQkJZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgcmluZ19pZCkgewotCQkJ cmV0ID0gZW1pdF9tb2NzX2NvbnRyb2xfdGFibGUocmVxLCAmdCwgcmluZ19pZCk7Ci0JCQlpZiAo cmV0KQotCQkJCXJldHVybiByZXQ7Ci0JCX0KKwkJLyogUHJvZ3JhbSB0aGUgUkNTIGNvbnRyb2wg cmVnaXN0ZXJzICovCisJCXJldCA9IGVtaXRfbW9jc19jb250cm9sX3RhYmxlKHJlcSwgJnQsIFJD Uyk7CisJCWlmIChyZXQpCisJCQlyZXR1cm4gcmV0OwogCiAJCS8qIE5vdyBwcm9ncmFtIHRoZSBs M2NjIHJlZ2lzdGVycyAqLwogCQlyZXQgPSBlbWl0X21vY3NfbDNjY190YWJsZShyZXEsICZ0KTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX21vY3MuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX21vY3MuaAppbmRleCA3NmU0NWIxLi5kMjBlMTZkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tb2NzLmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbW9jcy5oCkBAIC01Myw1ICs1Myw2IEBACiAjaW5jbHVkZSAiaTkxNV9k cnYuaCIKIAogaW50IGludGVsX3Jjc19jb250ZXh0X2luaXRfbW9jcyhzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSk7Cit2b2lkIGludGVsX3Byb2dyYW1fbW9jc19lbmdpbmVzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpOwogCiAjZW5kaWYKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK