From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 15/29] drm/i915: Parametrize MOCS registers Date: Wed, 4 Nov 2015 23:20:03 +0200 Message-ID: <1446672017-24497-16-git-send-email-ville.syrjala@linux.intel.com> References: <1446672017-24497-1-git-send-email-ville.syrjala@linux.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 32A6572122 for ; Wed, 4 Nov 2015 13:21:10 -0800 (PST) In-Reply-To: <1446672017-24497-1-git-send-email-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNj OiBGcmFuY2lzY28gSmVyZXogPGN1cnJvamVyZXpAcmlzZXVwLm5ldD4KU2lnbmVkLW9mZi1ieTog VmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgfCAxMiArKysrKystLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX21vY3MuYyB8IDQxICsrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAxNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCAwYjAxN2JkLi4wNTEwY2ExIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTgxNDEsMTIgKzgxNDEsMTIgQEAgZW51bSBza2xf ZGlzcF9wb3dlcl93ZWxscyB7CiAjZGVmaW5lIF9QQUxFVFRFX0IgKGRldl9wcml2LT5pbmZvLmRp c3BsYXlfbW1pb19vZmZzZXQgKyAweGE4MDApCiAKIC8qIE1PQ1MgKE1lbW9yeSBPYmplY3QgQ29u dHJvbCBTdGF0ZSkgcmVnaXN0ZXJzICovCi0jZGVmaW5lIEdFTjlfTE5DRkNNT0NTMAkJMHhiMDIw CS8qIEwzIENhY2hlIENvbnRyb2wgYmFzZSAqLworI2RlZmluZSBHRU45X0xOQ0ZDTU9DUyhpKQko MHhiMDIwICsgKGkpICogNCkJLyogTDMgQ2FjaGUgQ29udHJvbCAqLwogCi0jZGVmaW5lIEdFTjlf R0ZYX01PQ1NfMAkJMHhjODAwCS8qIEdyYXBoaWNzIE1PQ1MgYmFzZSByZWdpc3RlciovCi0jZGVm aW5lIEdFTjlfTUZYMF9NT0NTXzAJMHhjOTAwCS8qIE1lZGlhIDAgTU9DUyBiYXNlIHJlZ2lzdGVy Ki8KLSNkZWZpbmUgR0VOOV9NRlgxX01PQ1NfMAkweGNhMDAJLyogTWVkaWEgMSBNT0NTIGJhc2Ug cmVnaXN0ZXIqLwotI2RlZmluZSBHRU45X1ZFQk9YX01PQ1NfMAkweGNiMDAJLyogVmlkZW8gTU9D UyBiYXNlIHJlZ2lzdGVyKi8KLSNkZWZpbmUgR0VOOV9CTFRfTU9DU18wCQkweGNjMDAJLyogQmxp dHRlciBNT0NTIGJhc2UgcmVnaXN0ZXIqLworI2RlZmluZSBHRU45X0dGWF9NT0NTKGkpCSgweGM4 MDAgKyAoaSkgKiA0KQkvKiBHcmFwaGljcyBNT0NTIHJlZ2lzdGVycyAqLworI2RlZmluZSBHRU45 X01GWDBfTU9DUyhpKQkoMHhjOTAwICsgKGkpICogNCkJLyogTWVkaWEgMCBNT0NTIHJlZ2lzdGVy cyAqLworI2RlZmluZSBHRU45X01GWDFfTU9DUyhpKQkoMHhjYTAwICsgKGkpICogNCkJLyogTWVk aWEgMSBNT0NTIHJlZ2lzdGVycyAqLworI2RlZmluZSBHRU45X1ZFQk9YX01PQ1MoaSkJKDB4Y2Iw MCArIChpKSAqIDQpCS8qIFZpZGVvIE1PQ1MgcmVnaXN0ZXJzICovCisjZGVmaW5lIEdFTjlfQkxU X01PQ1MoaSkJKDB4Y2MwMCArIChpKSAqIDQpCS8qIEJsaXR0ZXIgTU9DUyByZWdpc3RlcnMgKi8K IAogI2VuZGlmIC8qIF9JOTE1X1JFR19IXyAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbW9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jCmlu ZGV4IGIyNThhMmEuLjhiOGFlYzU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9tb2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jCkBAIC0x NTksMTEgKzE1OSwzMCBAQCBzdGF0aWMgYm9vbCBnZXRfbW9jc19zZXR0aW5ncyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCXJldHVybiByZXN1bHQ7CiB9CiAKK3N0YXRpYyB1aW50MzJfdCBtb2Nz X3JlZ2lzdGVyKGVudW0gaW50ZWxfcmluZ19pZCByaW5nLCBpbnQgaW5kZXgpCit7CisJc3dpdGNo IChyaW5nKSB7CisJY2FzZSBSQ1M6CisJCXJldHVybiBHRU45X0dGWF9NT0NTKGluZGV4KTsKKwlj YXNlIFZDUzoKKwkJcmV0dXJuIEdFTjlfTUZYMF9NT0NTKGluZGV4KTsKKwljYXNlIEJDUzoKKwkJ cmV0dXJuIEdFTjlfQkxUX01PQ1MoaW5kZXgpOworCWNhc2UgVkVDUzoKKwkJcmV0dXJuIEdFTjlf VkVCT1hfTU9DUyhpbmRleCk7CisJY2FzZSBWQ1MyOgorCQlyZXR1cm4gR0VOOV9NRlgxX01PQ1Mo aW5kZXgpOworCWRlZmF1bHQ6CisJCU1JU1NJTkdfQ0FTRShyaW5nKTsKKwkJcmV0dXJuIDA7CisJ fQorfQorCiAvKioKICAqIGVtaXRfbW9jc19jb250cm9sX3RhYmxlKCkgLSBlbWl0IHRoZSBtb2Nz IGNvbnRyb2wgdGFibGUKICAqIEByZXE6CVJlcXVlc3QgdG8gc2V0IHVwIHRoZSBNT0NTIHRhYmxl IGZvci4KICAqIEB0YWJsZToJVGhlIHZhbHVlcyB0byBwcm9ncmFtIGludG8gdGhlIGNvbnRyb2wg cmVncy4KLSAqIEByZWdfYmFzZToJVGhlIGJhc2UgZm9yIHRoZSBlbmdpbmUgdGhhdCBuZWVkcyB0 byBiZSBwcm9ncmFtbWVkLgorICogQHJpbmc6CVRoZSBlbmdpbmUgZm9yIHdob20gdG8gZW1pdCB0 aGUgcmVnaXN0ZXJzLgogICoKICAqIFRoaXMgZnVuY3Rpb24gc2ltcGx5IGVtaXRzIGEgTUlfTE9B RF9SRUdJU1RFUl9JTU0gY29tbWFuZCBmb3IgdGhlCiAgKiBnaXZlbiB0YWJsZSBzdGFydGluZyBh dCB0aGUgZ2l2ZW4gYWRkcmVzcy4KQEAgLTE3Miw3ICsxOTEsNyBAQCBzdGF0aWMgYm9vbCBnZXRf bW9jc19zZXR0aW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogICovCiBzdGF0aWMgaW50IGVt aXRfbW9jc19jb250cm9sX3RhYmxlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAog CQkJCSAgIGNvbnN0IHN0cnVjdCBkcm1faTkxNV9tb2NzX3RhYmxlICp0YWJsZSwKLQkJCQkgICB1 MzIgcmVnX2Jhc2UpCisJCQkJICAgZW51bSBpbnRlbF9yaW5nX2lkIHJpbmcpCiB7CiAJc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSByZXEtPnJpbmdidWY7CiAJdW5zaWduZWQgaW50 IGluZGV4OwpAQCAtMTkxLDcgKzIxMCw3IEBAIHN0YXRpYyBpbnQgZW1pdF9tb2NzX2NvbnRyb2xf dGFibGUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQkJTUlfTE9BRF9SRUdJ U1RFUl9JTU0oR0VOOV9OVU1fTU9DU19FTlRSSUVTKSk7CiAKIAlmb3IgKGluZGV4ID0gMDsgaW5k ZXggPCB0YWJsZS0+c2l6ZTsgaW5kZXgrKykgewotCQlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChy aW5nYnVmLCByZWdfYmFzZSArIGluZGV4ICogNCk7CisJCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0 KHJpbmdidWYsIG1vY3NfcmVnaXN0ZXIocmluZywgaW5kZXgpKTsKIAkJaW50ZWxfbG9naWNhbF9y aW5nX2VtaXQocmluZ2J1ZiwKIAkJCQkJdGFibGUtPnRhYmxlW2luZGV4XS5jb250cm9sX3ZhbHVl KTsKIAl9CkBAIC0yMDUsNyArMjI0LDcgQEAgc3RhdGljIGludCBlbWl0X21vY3NfY29udHJvbF90 YWJsZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkgKiB0aGF0IHZhbHVlIHRv IGFsbCB0aGUgdXNlZCBlbnRyaWVzLgogCSAqLwogCWZvciAoOyBpbmRleCA8IEdFTjlfTlVNX01P Q1NfRU5UUklFUzsgaW5kZXgrKykgewotCQlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVm LCByZWdfYmFzZSArIGluZGV4ICogNCk7CisJCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdi dWYsIG1vY3NfcmVnaXN0ZXIocmluZywgaW5kZXgpKTsKIAkJaW50ZWxfbG9naWNhbF9yaW5nX2Vt aXQocmluZ2J1ZiwgdGFibGUtPnRhYmxlWzBdLmNvbnRyb2xfdmFsdWUpOwogCX0KIApAQCAtMjUz LDcgKzI3Miw3IEBAIHN0YXRpYyBpbnQgZW1pdF9tb2NzX2wzY2NfdGFibGUoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCXZhbHVlID0gKHRhYmxlLT50YWJsZVtjb3VudF0ubDNj Y192YWx1ZSAmIDB4ZmZmZikgfAogCQkJKCh0YWJsZS0+dGFibGVbY291bnQgKyAxXS5sM2NjX3Zh bHVlICYgMHhmZmZmKSA8PCAxNik7CiAKLQkJaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQocmluZ2J1 ZiwgR0VOOV9MTkNGQ01PQ1MwICsgaSAqIDQpOworCQlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChy aW5nYnVmLCBHRU45X0xOQ0ZDTU9DUyhpKSk7CiAJCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJp bmdidWYsIHZhbHVlKTsKIAl9CiAKQEAgLTI3MCw3ICsyODksNyBAQCBzdGF0aWMgaW50IGVtaXRf bW9jc19sM2NjX3RhYmxlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCSAqIHRo ZXkgYXJlIHJlc2VydmVkIGJ5IHRoZSBoYXJkd2FyZS4KIAkgKi8KIAlmb3IgKDsgaSA8IEdFTjlf TlVNX01PQ1NfRU5UUklFUyAvIDI7IGkrKykgewotCQlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChy aW5nYnVmLCBHRU45X0xOQ0ZDTU9DUzAgKyBpICogNCk7CisJCWludGVsX2xvZ2ljYWxfcmluZ19l bWl0KHJpbmdidWYsIEdFTjlfTE5DRkNNT0NTKGkpKTsKIAkJaW50ZWxfbG9naWNhbF9yaW5nX2Vt aXQocmluZ2J1ZiwgdmFsdWUpOwogCiAJCXZhbHVlID0gZmlsbGVyOwpAQCAtMzA1LDIzICszMjQs MjMgQEAgaW50IGludGVsX3Jjc19jb250ZXh0X2luaXRfbW9jcyhzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSkKIAogCWlmIChnZXRfbW9jc19zZXR0aW5ncyhyZXEtPnJpbmctPmRldiwg JnQpKSB7CiAJCS8qIFByb2dyYW0gdGhlIGNvbnRyb2wgcmVnaXN0ZXJzICovCi0JCXJldCA9IGVt aXRfbW9jc19jb250cm9sX3RhYmxlKHJlcSwgJnQsIEdFTjlfR0ZYX01PQ1NfMCk7CisJCXJldCA9 IGVtaXRfbW9jc19jb250cm9sX3RhYmxlKHJlcSwgJnQsIFJDUyk7CiAJCWlmIChyZXQpCiAJCQly ZXR1cm4gcmV0OwogCi0JCXJldCA9IGVtaXRfbW9jc19jb250cm9sX3RhYmxlKHJlcSwgJnQsIEdF TjlfTUZYMF9NT0NTXzApOworCQlyZXQgPSBlbWl0X21vY3NfY29udHJvbF90YWJsZShyZXEsICZ0 LCBWQ1MpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAotCQlyZXQgPSBlbWl0X21vY3Nf Y29udHJvbF90YWJsZShyZXEsICZ0LCBHRU45X01GWDFfTU9DU18wKTsKKwkJcmV0ID0gZW1pdF9t b2NzX2NvbnRyb2xfdGFibGUocmVxLCAmdCwgVkNTMik7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4g cmV0OwogCi0JCXJldCA9IGVtaXRfbW9jc19jb250cm9sX3RhYmxlKHJlcSwgJnQsIEdFTjlfVkVC T1hfTU9DU18wKTsKKwkJcmV0ID0gZW1pdF9tb2NzX2NvbnRyb2xfdGFibGUocmVxLCAmdCwgVkVD Uyk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCi0JCXJldCA9IGVtaXRfbW9jc19jb250 cm9sX3RhYmxlKHJlcSwgJnQsIEdFTjlfQkxUX01PQ1NfMCk7CisJCXJldCA9IGVtaXRfbW9jc19j b250cm9sX3RhYmxlKHJlcSwgJnQsIEJDUyk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0Owog Ci0tIAoyLjQuMTAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==