From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas De Marchi Subject: [CI 1/2] drm/i915/skl: Rework MOCS tables to keep common part in a define Date: Fri, 30 Nov 2018 13:33:03 -0800 Message-ID: <20181130213304.17329-1-lucas.demarchi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id BEE646E681 for ; Fri, 30 Nov 2018 21:33:27 +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 RnJvbTogVG9tYXN6IExpcyA8dG9tYXN6Lmxpc0BpbnRlbC5jb20+CgpUaGUgTU9DUyB0YWJsZXMg YXJlIGdvaW5nIHRvIGJlIHZlcnkgc2ltaWxhciBhY3Jvc3MgcGxhdGZvcm1zLgoKVG8gcmVkdWNl IHRoZSBhbW91bnQgb2YgY29waWVkIGNvZGUsIHRoaXMgcGF0Y2ggcmlwcyB0aGUgY29tbW9uIHBh cnQgYW5kCnB1dHMgaXQgaW50byBhIGRlZmluaXRpb24gdmFsaWQgZm9yIGFsbCBnZW45IHBsYXRm b3Jtcy4KCnYyOiBNYWRlIGRlZmluZXMgZm9yIG9yLWluZyBmbGFncy4gUmVuYW1lZCBtYWNyb3Mg ZnJvbSBNT0NTX1RBQkxFCiAgICB0byBNT0NTX0VOVFJJRVMuIChKb29uYXMpCgpTaWduZWQtb2Zm LWJ5OiBUb21hc3ogTGlzIDx0b21hc3oubGlzQGludGVsLmNvbT4KU3VnZ2VzdGVkLWJ5OiBMdWNh cyBEZSBNYXJjaGkgPGx1Y2FzLmRlbWFyY2hpQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEx1Y2Fz IERlIE1hcmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tPiAodjEpCkNjOiBKb29uYXMgTGFo dGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRh bmllbGUuY2VyYW9sb3NwdXJpb0BpbnRlbC5jb20+CkNjOiBMdWNhcyBEZSBNYXJjaGkgPGx1Y2Fz LmRlbWFyY2hpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tb2Nz LmMgfCA4NiArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MzYgaW5zZXJ0aW9ucygrKSwgNTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9j cy5jCmluZGV4IDc3ZTk4NzFhOGM5YS4uOGQwOGE3YjdkNTM0IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9tb2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbW9jcy5jCkBAIC05Niw3MSArOTYsNTcgQEAgc3RydWN0IGRybV9pOTE1X21vY3NfdGFibGUg ewogICogICAgICAgbWF5IG9ubHkgYmUgdXBkYXRlZCBpbmNyZW1lbnRhbGx5IGJ5IGFkZGluZyBl bnRyaWVzIGF0IHRoZQogICogICAgICAgZW5kLgogICovCi1zdGF0aWMgY29uc3Qgc3RydWN0IGRy bV9pOTE1X21vY3NfZW50cnkgc2t5bGFrZV9tb2NzX3RhYmxlW10gPSB7Ci0JW0k5MTVfTU9DU19V TkNBQ0hFRF0gPSB7Ci0JICAvKiAweDAwMDAwMDA5ICovCi0JICAuY29udHJvbF92YWx1ZSA9IExF X0NBQ0hFQUJJTElUWShMRV9VQykgfAotCQkJICAgTEVfVEdUX0NBQ0hFKExFX1RDX0xMQ19FTExD KSB8Ci0JCQkgICBMRV9MUlVNKDApIHwgTEVfQU9NKDApIHwgTEVfUlNDKDApIHwgTEVfU0NDKDAp IHwKLQkJCSAgIExFX1BGTSgwKSB8IExFX1NDRigwKSwKLQotCSAgLyogMHgwMDEwICovCi0JICAu bDNjY192YWx1ZSA9ICAgIEwzX0VTQygwKSB8IEwzX1NDQygwKSB8IEwzX0NBQ0hFQUJJTElUWShM M19VQyksCi0JfSwKLQlbSTkxNV9NT0NTX1BURV0gPSB7Ci0JICAvKiAweDAwMDAwMDM4ICovCi0J ICAuY29udHJvbF92YWx1ZSA9IExFX0NBQ0hFQUJJTElUWShMRV9QQUdFVEFCTEUpIHwKLQkJCSAg IExFX1RHVF9DQUNIRShMRV9UQ19MTENfRUxMQykgfAotCQkJICAgTEVfTFJVTSgzKSB8IExFX0FP TSgwKSB8IExFX1JTQygwKSB8IExFX1NDQygwKSB8Ci0JCQkgICBMRV9QRk0oMCkgfCBMRV9TQ0Yo MCksCi0JICAvKiAweDAwMzAgKi8KLQkgIC5sM2NjX3ZhbHVlID0gICAgTDNfRVNDKDApIHwgTDNf U0NDKDApIHwgTDNfQ0FDSEVBQklMSVRZKEwzX1dCKSwKKworI2RlZmluZSBNT0NTX0NPTlRST0xf VkFMVUUobGVjYywgdGMsIGxydW0sIGRhb20sIGVyc2MsIHNjYywgcGZtLCBzY2YpIFwKKwkoTEVf Q0FDSEVBQklMSVRZKGxlY2MpIHwgTEVfVEdUX0NBQ0hFKHRjKSB8IFwKKwlMRV9MUlVNKGxydW0p IHwgTEVfQU9NKGRhb20pIHwgTEVfUlNDKGVyc2MpIHwgTEVfU0NDKHNjYykgfCBcCisJTEVfUEZN KHBmbSkgfCBMRV9TQ0Yoc2NmKSkKKworI2RlZmluZSBNT0NTX0wzQ0NfVkFMVUUoZXNjLCBzY2Ms IGwzY2MpIFwKKwkoTDNfRVNDKGVzYykgfCBMM19TQ0Moc2NjKSB8IEwzX0NBQ0hFQUJJTElUWShs M2NjKSkKKworI2RlZmluZSBHRU45X01PQ1NfRU5UUklFUyBcCisJW0k5MTVfTU9DU19VTkNBQ0hF RF0gPSB7IFwKKwkgIC8qIDB4MDAwMDAwMDkgKi8gXAorCSAgLmNvbnRyb2xfdmFsdWUgPSBNT0NT X0NPTlRST0xfVkFMVUUoTEVfVUMsIExFX1RDX0xMQ19FTExDLCBcCisJCQkJCSAgICAgIDAsIDAs IDAsIDAsIDAsIDApLCBcCisJICAvKiAweDAwMTAgKi8gXAorCSAgLmwzY2NfdmFsdWUgPSBNT0NT X0wzQ0NfVkFMVUUoMCwgMCwgTDNfVUMpLCBcCisJfSwgXAorCVtJOTE1X01PQ1NfUFRFXSA9IHsg XAorCSAgLyogMHgwMDAwMDAzOCAqLyBcCisJICAuY29udHJvbF92YWx1ZSA9IE1PQ1NfQ09OVFJP TF9WQUxVRShMRV9QQUdFVEFCTEUsIExFX1RDX0xMQ19FTExDLCBcCisJCQkJCSAgICAgIDMsIDAs IDAsIDAsIDAsIDApLCBcCisJICAvKiAweDAwMzAgKi8gXAorCSAgLmwzY2NfdmFsdWUgPSBNT0NT X0wzQ0NfVkFMVUUoMCwgMCwgTDNfV0IpLCBcCiAJfSwKKworc3RhdGljIGNvbnN0IHN0cnVjdCBk cm1faTkxNV9tb2NzX2VudHJ5IHNreWxha2VfbW9jc190YWJsZVtdID0geworCUdFTjlfTU9DU19F TlRSSUVTCiAJW0k5MTVfTU9DU19DQUNIRURdID0gewogCSAgLyogMHgwMDAwMDAzYiAqLwotCSAg LmNvbnRyb2xfdmFsdWUgPSBMRV9DQUNIRUFCSUxJVFkoTEVfV0IpIHwKLQkJCSAgIExFX1RHVF9D QUNIRShMRV9UQ19MTENfRUxMQykgfAotCQkJICAgTEVfTFJVTSgzKSB8IExFX0FPTSgwKSB8IExF X1JTQygwKSB8IExFX1NDQygwKSB8Ci0JCQkgICBMRV9QRk0oMCkgfCBMRV9TQ0YoMCksCisJICAu Y29udHJvbF92YWx1ZSA9IE1PQ1NfQ09OVFJPTF9WQUxVRShMRV9XQiwgTEVfVENfTExDX0VMTEMs CisJCQkJCSAgICAgIDMsIDAsIDAsIDAsIDAsIDApLAogCSAgLyogMHgwMDMwICovCi0JICAubDNj Y192YWx1ZSA9ICAgTDNfRVNDKDApIHwgTDNfU0NDKDApIHwgTDNfQ0FDSEVBQklMSVRZKEwzX1dC KSwKKwkgIC5sM2NjX3ZhbHVlID0gTU9DU19MM0NDX1ZBTFVFKDAsIDAsIEwzX1dCKSwKIAl9LAog fTsKIAogLyogTk9URTogdGhlIExFX1RHVF9DQUNIRSBpcyBub3QgdXNlZCBvbiBCcm94dG9uICov CiBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9pOTE1X21vY3NfZW50cnkgYnJveHRvbl9tb2NzX3Rh YmxlW10gPSB7Ci0JW0k5MTVfTU9DU19VTkNBQ0hFRF0gPSB7Ci0JICAvKiAweDAwMDAwMDA5ICov Ci0JICAuY29udHJvbF92YWx1ZSA9IExFX0NBQ0hFQUJJTElUWShMRV9VQykgfAotCQkJICAgTEVf VEdUX0NBQ0hFKExFX1RDX0xMQ19FTExDKSB8Ci0JCQkgICBMRV9MUlVNKDApIHwgTEVfQU9NKDAp IHwgTEVfUlNDKDApIHwgTEVfU0NDKDApIHwKLQkJCSAgIExFX1BGTSgwKSB8IExFX1NDRigwKSwK LQotCSAgLyogMHgwMDEwICovCi0JICAubDNjY192YWx1ZSA9ICAgIEwzX0VTQygwKSB8IEwzX1ND QygwKSB8IEwzX0NBQ0hFQUJJTElUWShMM19VQyksCi0JfSwKLQlbSTkxNV9NT0NTX1BURV0gPSB7 Ci0JICAvKiAweDAwMDAwMDM4ICovCi0JICAuY29udHJvbF92YWx1ZSA9IExFX0NBQ0hFQUJJTElU WShMRV9QQUdFVEFCTEUpIHwKLQkJCSAgIExFX1RHVF9DQUNIRShMRV9UQ19MTENfRUxMQykgfAot CQkJICAgTEVfTFJVTSgzKSB8IExFX0FPTSgwKSB8IExFX1JTQygwKSB8IExFX1NDQygwKSB8Ci0J CQkgICBMRV9QRk0oMCkgfCBMRV9TQ0YoMCksCi0KLQkgIC8qIDB4MDAzMCAqLwotCSAgLmwzY2Nf dmFsdWUgPSAgICBMM19FU0MoMCkgfCBMM19TQ0MoMCkgfCBMM19DQUNIRUFCSUxJVFkoTDNfV0Ip LAotCX0sCisJR0VOOV9NT0NTX0VOVFJJRVMKIAlbSTkxNV9NT0NTX0NBQ0hFRF0gPSB7CiAJICAv KiAweDAwMDAwMDM5ICovCi0JICAuY29udHJvbF92YWx1ZSA9IExFX0NBQ0hFQUJJTElUWShMRV9V QykgfAotCQkJICAgTEVfVEdUX0NBQ0hFKExFX1RDX0xMQ19FTExDKSB8Ci0JCQkgICBMRV9MUlVN KDMpIHwgTEVfQU9NKDApIHwgTEVfUlNDKDApIHwgTEVfU0NDKDApIHwKLQkJCSAgIExFX1BGTSgw KSB8IExFX1NDRigwKSwKLQorCSAgLmNvbnRyb2xfdmFsdWUgPSBNT0NTX0NPTlRST0xfVkFMVUUo TEVfVUMsIExFX1RDX0xMQ19FTExDLAorCQkJCQkgICAgICAzLCAwLCAwLCAwLCAwLCAwKSwKIAkg IC8qIDB4MDAzMCAqLwotCSAgLmwzY2NfdmFsdWUgPSAgICBMM19FU0MoMCkgfCBMM19TQ0MoMCkg fCBMM19DQUNIRUFCSUxJVFkoTDNfV0IpLAorCSAgLmwzY2NfdmFsdWUgPSBNT0NTX0wzQ0NfVkFM VUUoMCwgMCwgTDNfV0IpLAogCX0sCiB9OwogCisjdW5kZWYgTU9DU19DT05UUk9MX1ZBTFVFCisj dW5kZWYgTU9DU19MM0NDX1ZBTFVFCisKIC8qKgogICogZ2V0X21vY3Nfc2V0dGluZ3MoKQogICog QGRldl9wcml2OglpOTE1IGRldmljZS4KLS0gCjIuMTkuMS4xLmc1NmM0NjgzZTY4CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK