From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oscar Mateo Subject: [PATCH 4/5] drm/i915: Split the engine info table in two levels, using class + instance Date: Fri, 7 Apr 2017 02:15:48 -0700 Message-ID: <1491556549-2261-5-git-send-email-oscar.mateo@intel.com> References: <1491556549-2261-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 855386EC0D for ; Fri, 7 Apr 2017 16:15:31 +0000 (UTC) In-Reply-To: <1491556549-2261-1-git-send-email-oscar.mateo@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 Cc: Paulo Zanoni , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org VGhlcmUgYXJlIHNvbWUgcHJvcGVydGllcyB0aGF0IGxvZ2ljYWxseSBiZWxvbmcgdG8gdGhlIGVu Z2luZSBjbGFzcywgYW5kIHNvbWUKdGhhdCBiZWxvbmcgdG8gdGhlIGVuZ2luZSBpbnN0YW5jZS4g TWFrZSBpdCBleHBsaWNpdC4KCnYyOiBDb21taXQgbWVzc2FnZSAoVHZydGtvKQoKdjM6CiAgLSBS ZWJhc2VkCiAgLSBFeGVjL3VhYmkgaWQgc2hvdWxkIGJlIHBlciBpbnN0YW5jZSAoQ2hyaXMpCgp2 NDoKICAtIFJlYmFzZWQKICAtIEF2b2lkIHJlLW9yZGVyaW5nIGZpZWxkcyBmb3Igc21hbGxlciBk aWZmIChUdnJ0a28pCiAgLSBCdWcgb24gb29iIGFjY2VzcyB0byB0aGUgY2xhc3MgYXJyYXkgKE1p Y2hhbCkKCkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzog UGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+CkNjOiBSb2RyaWdvIFZpdmkg PHJvZHJpZ28udml2aUBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KQ2M6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3Nw dXJpb0BpbnRlbC5jb20+CkNjOiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGlu dGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyB8IDY1ICsrKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MiBpbnNlcnRp b25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9lbmdpbmVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9j cy5jCmluZGV4IGU0MDM1NWMuLjRlMmI1ZGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Vu Z2luZV9jcy5jCkBAIC0yNiw3MSArMjYsODQgQEAKICNpbmNsdWRlICJpbnRlbF9yaW5nYnVmZmVy LmgiCiAjaW5jbHVkZSAiaW50ZWxfbHJjLmgiCiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5l X2luZm8geworc3RydWN0IGVuZ2luZV9jbGFzc19pbmZvIHsKIAljb25zdCBjaGFyICpuYW1lOwot CXVuc2lnbmVkIGludCBleGVjX2lkOworCWludCAoKmluaXRfbGVnYWN5KShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpOworCWludCAoKmluaXRfZXhlY2xpc3RzKShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpOworfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfY2xh c3NfaW5mbyBpbnRlbF9lbmdpbmVfY2xhc3Nlc1tdID0geworCVtSRU5ERVJfQ0xBU1NdID0gewor CQkubmFtZSA9ICJyY3MiLAorCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3JlbmRlcl9yaW5n X2luaXQsCisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyLAor CX0sCisJW0NPUFlfRU5HSU5FX0NMQVNTXSA9IHsKKwkJLm5hbWUgPSAiYmNzIiwKKwkJLmluaXRf ZXhlY2xpc3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAorCQkuaW5pdF9sZWdhY3kgPSBpbnRl bF9pbml0X2JsdF9yaW5nX2J1ZmZlciwKKwl9LAorCVtWSURFT19ERUNPREVfQ0xBU1NdID0gewor CQkubmFtZSA9ICJ2Y3MiLAorCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2lu aXQsCisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyLAorCX0sCisJ W1ZJREVPX0VOSEFOQ0VNRU5UX0NMQVNTXSA9IHsKKwkJLm5hbWUgPSAidmVjcyIsCisJCS5pbml0 X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKKwkJLmluaXRfbGVnYWN5ID0gaW50 ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlciwKKwl9LAorfTsKKworc3RydWN0IGVuZ2luZV9pbmZv IHsKIAl1bnNpZ25lZCBpbnQgaHdfaWQ7CisJdW5zaWduZWQgaW50IGV4ZWNfaWQ7CiAJdTggY2xh c3M7CiAJdTggaW5zdGFuY2U7CiAJdTMyIG1taW9fYmFzZTsKIAl1bnNpZ25lZCBpcnFfc2hpZnQ7 Ci0JaW50ICgqaW5pdF9sZWdhY3kpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci0J aW50ICgqaW5pdF9leGVjbGlzdHMpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci19 IGludGVsX2VuZ2luZXNbXSA9IHsKK307CisKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5lX2lu Zm8gaW50ZWxfZW5naW5lc1tdID0gewogCVtSQ1NdID0gewotCQkubmFtZSA9ICJyY3MiLAogCQku aHdfaWQgPSBSQ1NfSFcsCiAJCS5leGVjX2lkID0gSTkxNV9FWEVDX1JFTkRFUiwKIAkJLmNsYXNz ID0gUkVOREVSX0NMQVNTLAogCQkuaW5zdGFuY2UgPSAwLAogCQkubW1pb19iYXNlID0gUkVOREVS X1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfUkNTX0lSUV9TSElGVCwKLQkJLmluaXRf ZXhlY2xpc3RzID0gbG9naWNhbF9yZW5kZXJfcmluZ19pbml0LAotCQkuaW5pdF9sZWdhY3kgPSBp bnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlciwKIAl9LAogCVtCQ1NdID0gewotCQkubmFtZSA9 ICJiY3MiLAogCQkuaHdfaWQgPSBCQ1NfSFcsCiAJCS5leGVjX2lkID0gSTkxNV9FWEVDX0JMVCwK IAkJLmNsYXNzID0gQ09QWV9FTkdJTkVfQ0xBU1MsCiAJCS5pbnN0YW5jZSA9IDAsCiAJCS5tbWlv X2Jhc2UgPSBCTFRfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9CQ1NfSVJRX1NISUZU LAotCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCi0JCS5pbml0X2xl Z2FjeSA9IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyLAogCX0sCiAJW1ZDU10gPSB7Ci0JCS5u YW1lID0gInZjcyIsCiAJCS5od19pZCA9IFZDU19IVywKIAkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNf QlNELAogCQkuY2xhc3MgPSBWSURFT19ERUNPREVfQ0xBU1MsCiAJCS5pbnN0YW5jZSA9IDAsCiAJ CS5tbWlvX2Jhc2UgPSBHRU42X0JTRF9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X1ZD UzFfSVJRX1NISUZULAotCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQs Ci0JCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyLAogCX0sCiAJW1ZD UzJdID0gewotCQkubmFtZSA9ICJ2Y3MiLAogCQkuaHdfaWQgPSBWQ1MyX0hXLAogCQkuZXhlY19p ZCA9IEk5MTVfRVhFQ19CU0QsCiAJCS5jbGFzcyA9IFZJREVPX0RFQ09ERV9DTEFTUywKIAkJLmlu c3RhbmNlID0gMSwKIAkJLm1taW9fYmFzZSA9IEdFTjhfQlNEMl9SSU5HX0JBU0UsCiAJCS5pcnFf c2hpZnQgPSBHRU44X1ZDUzJfSVJRX1NISUZULAotCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2Fs X3hjc19yaW5nX2luaXQsCi0JCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfYnNkX3JpbmdfYnVm ZmVyLAogCX0sCiAJW1ZFQ1NdID0gewotCQkubmFtZSA9ICJ2ZWNzIiwKIAkJLmh3X2lkID0gVkVD U19IVywKIAkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfVkVCT1gsCiAJCS5jbGFzcyA9IFZJREVPX0VO SEFOQ0VNRU5UX0NMQVNTLAogCQkuaW5zdGFuY2UgPSAwLAogCQkubW1pb19iYXNlID0gVkVCT1hf UklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9WRUNTX0lSUV9TSElGVCwKLQkJLmluaXRf ZXhlY2xpc3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAotCQkuaW5pdF9sZWdhY3kgPSBpbnRl bF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyLAogCX0sCiB9OwogCkBAIC05OSw4ICsxMTIsMTIgQEAK IAkJICAgZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQpCiB7CiAJY29uc3Qgc3RydWN0IGVuZ2luZV9p bmZvICppbmZvID0gJmludGVsX2VuZ2luZXNbaWRdOworCWNvbnN0IHN0cnVjdCBlbmdpbmVfY2xh c3NfaW5mbyAqY2xhc3NfaW5mbzsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAK KwlHRU1fQlVHX09OKGluZm8tPmNsYXNzID4gQVJSQVlfU0laRShpbnRlbF9lbmdpbmVfY2xhc3Nl cykpOworCWNsYXNzX2luZm8gPSAmaW50ZWxfZW5naW5lX2NsYXNzZXNbaW5mby0+Y2xhc3NdOwor CiAJR0VNX0JVR19PTihkZXZfcHJpdi0+ZW5naW5lW2lkXSk7CiAJZW5naW5lID0ga3phbGxvYyhz aXplb2YoKmVuZ2luZSksIEdGUF9LRVJORUwpOwogCWlmICghZW5naW5lKQpAQCAtMTA5LDcgKzEy Niw3IEBACiAJZW5naW5lLT5pZCA9IGlkOwogCWVuZ2luZS0+aTkxNSA9IGRldl9wcml2OwogCVdB Uk5fT04oc25wcmludGYoZW5naW5lLT5uYW1lLCBzaXplb2YoZW5naW5lLT5uYW1lKSwgIiVzJXUi LAotCQkJIGluZm8tPm5hbWUsIGluZm8tPmluc3RhbmNlKSA+PSBzaXplb2YoZW5naW5lLT5uYW1l KSk7CisJCQkgY2xhc3NfaW5mby0+bmFtZSwgaW5mby0+aW5zdGFuY2UpID49IHNpemVvZihlbmdp bmUtPm5hbWUpKTsKIAllbmdpbmUtPmV4ZWNfaWQgPSBpbmZvLT5leGVjX2lkOwogCWVuZ2luZS0+ aHdfaWQgPSBlbmdpbmUtPmd1Y19pZCA9IGluZm8tPmh3X2lkOwogCWVuZ2luZS0+bW1pb19iYXNl ID0gaW5mby0+bW1pb19iYXNlOwpAQCAtMTkwLDEyICsyMDcsMTQgQEAgaW50IGludGVsX2VuZ2lu ZXNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaW50IGVyciA9IDA7 CiAKIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKKwkJY29uc3Qgc3Ry dWN0IGVuZ2luZV9jbGFzc19pbmZvICpjbGFzc19pbmZvID0KKwkJCQkJJmludGVsX2VuZ2luZV9j bGFzc2VzW2VuZ2luZS0+Y2xhc3NdOwogCQlpbnQgKCppbml0KShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpOwogCiAJCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpCi0JCQlpbml0ID0g aW50ZWxfZW5naW5lc1tpZF0uaW5pdF9leGVjbGlzdHM7CisJCQlpbml0ID0gY2xhc3NfaW5mby0+ aW5pdF9leGVjbGlzdHM7CiAJCWVsc2UKLQkJCWluaXQgPSBpbnRlbF9lbmdpbmVzW2lkXS5pbml0 X2xlZ2FjeTsKKwkJCWluaXQgPSBjbGFzc19pbmZvLT5pbml0X2xlZ2FjeTsKIAkJaWYgKCFpbml0 KSB7CiAJCQlrZnJlZShlbmdpbmUpOwogCQkJZGV2X3ByaXYtPmVuZ2luZVtpZF0gPSBOVUxMOwot LSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=