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: Thu, 6 Apr 2017 05:55:43 -0700 Message-ID: <1491483344-17133-5-git-send-email-oscar.mateo@intel.com> References: <1491483344-17133-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D89D6EA13 for ; Thu, 6 Apr 2017 19:55:28 +0000 (UTC) In-Reply-To: <1491483344-17133-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 TWFrZSBpdCBleHBsaWNpdC4KCnYyOiBDb21taXQgbWVzc2FnZSAoVHZydGtvKQoKQ2M6IFR2cnRr byBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBQYXVsbyBaYW5vbmkgPHBh dWxvLnIuemFub25pQGludGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGlu dGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzog RGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVsLmNvbT4K U2lnbmVkLW9mZi1ieTogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyB8IDcyICsrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCAy OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9l bmdpbmVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCmluZGV4 IDI0MDk5MDguLjUwNmVjOTUyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9lbmdpbmVfY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3Mu YwpAQCAtMjYsNzEgKzI2LDgzIEBACiAjaW5jbHVkZSAiaW50ZWxfcmluZ2J1ZmZlci5oIgogI2lu Y2x1ZGUgImludGVsX2xyYy5oIgogCi1zdGF0aWMgY29uc3Qgc3RydWN0IGVuZ2luZV9pbmZvIHsK K3N0cnVjdCBlbmdpbmVfY2xhc3NfaW5mbyB7CiAJY29uc3QgY2hhciAqbmFtZTsKIAl1bnNpZ25l ZCBpbnQgZXhlY19pZDsKKwlpbnQgKCppbml0X2xlZ2FjeSkoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKTsKKwlpbnQgKCppbml0X2V4ZWNsaXN0cykoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKTsKK307CisKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5lX2NsYXNzX2luZm8g aW50ZWxfZW5naW5lX2NsYXNzZXNbXSA9IHsKKwlbUkVOREVSX0NMQVNTXSA9IHsKKwkJLm5hbWUg PSAicmNzIiwKKwkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfUkVOREVSLAorCQkuaW5pdF9leGVjbGlz dHMgPSBsb2dpY2FsX3JlbmRlcl9yaW5nX2luaXQsCisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2lu aXRfcmVuZGVyX3JpbmdfYnVmZmVyLAorCX0sCisJW0NPUFlfRU5HSU5FX0NMQVNTXSA9IHsKKwkJ Lm5hbWUgPSAiYmNzIiwKKwkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfQkxULAorCQkuaW5pdF9leGVj bGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2lu aXRfYmx0X3JpbmdfYnVmZmVyLAorCX0sCisJW1ZJREVPX0RFQ09ERV9DTEFTU10gPSB7CisJCS5u YW1lID0gInZjcyIsCisJCS5leGVjX2lkID0gSTkxNV9FWEVDX0JTRCwKKwkJLmluaXRfZXhlY2xp c3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAorCQkuaW5pdF9sZWdhY3kgPSBpbnRlbF9pbml0 X2JzZF9yaW5nX2J1ZmZlciwKKwl9LAorCVtWSURFT19FTkhBTkNFTUVOVF9DTEFTU10gPSB7CisJ CS5uYW1lID0gInZlY3MiLAorCQkuZXhlY19pZCA9IEk5MTVfRVhFQ19WRUJPWCwKKwkJLmluaXRf ZXhlY2xpc3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAorCQkuaW5pdF9sZWdhY3kgPSBpbnRl bF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyLAorCX0sCit9OworCitzdHJ1Y3QgZW5naW5lX2luZm8g ewogCXVuc2lnbmVkIGludCBod19pZDsKIAllbnVtIGludGVsX2VuZ2luZV9jbGFzcyBjbGFzczsK IAl1OCBpbnN0YW5jZTsKIAl1MzIgbW1pb19iYXNlOwogCXVuc2lnbmVkIGlycV9zaGlmdDsKLQlp bnQgKCppbml0X2xlZ2FjeSkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKLQlpbnQg KCppbml0X2V4ZWNsaXN0cykoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKLX0gaW50 ZWxfZW5naW5lc1tdID0geworfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyBp bnRlbF9lbmdpbmVzW10gPSB7CiAJW1JDU10gPSB7Ci0JCS5uYW1lID0gInJjcyIsCiAJCS5od19p ZCA9IFJDU19IVywKLQkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfUkVOREVSLAogCQkuY2xhc3MgPSBS RU5ERVJfQ0xBU1MsCiAJCS5pbnN0YW5jZSA9IDAsCiAJCS5tbWlvX2Jhc2UgPSBSRU5ERVJfUklO R19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9SQ1NfSVJRX1NISUZULAotCQkuaW5pdF9leGVj bGlzdHMgPSBsb2dpY2FsX3JlbmRlcl9yaW5nX2luaXQsCi0JCS5pbml0X2xlZ2FjeSA9IGludGVs X2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyLAogCX0sCiAJW0JDU10gPSB7Ci0JCS5uYW1lID0gImJj cyIsCiAJCS5od19pZCA9IEJDU19IVywKLQkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfQkxULAogCQku Y2xhc3MgPSBDT1BZX0VOR0lORV9DTEFTUywKIAkJLmluc3RhbmNlID0gMCwKIAkJLm1taW9fYmFz ZSA9IEJMVF9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X0JDU19JUlFfU0hJRlQsCi0J CS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKLQkJLmluaXRfbGVnYWN5 ID0gaW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIsCiAJfSwKIAlbVkNTXSA9IHsKLQkJLm5hbWUg PSAidmNzIiwKIAkJLmh3X2lkID0gVkNTX0hXLAotCQkuZXhlY19pZCA9IEk5MTVfRVhFQ19CU0Qs CiAJCS5jbGFzcyA9IFZJREVPX0RFQ09ERV9DTEFTUywKIAkJLmluc3RhbmNlID0gMCwKIAkJLm1t aW9fYmFzZSA9IEdFTjZfQlNEX1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfVkNTMV9J UlFfU0hJRlQsCi0JCS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKLQkJ LmluaXRfbGVnYWN5ID0gaW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIsCiAJfSwKIAlbVkNTMl0g PSB7Ci0JCS5uYW1lID0gInZjcyIsCiAJCS5od19pZCA9IFZDUzJfSFcsCi0JCS5leGVjX2lkID0g STkxNV9FWEVDX0JTRCwKIAkJLmNsYXNzID0gVklERU9fREVDT0RFX0NMQVNTLAogCQkuaW5zdGFu Y2UgPSAxLAogCQkubW1pb19iYXNlID0gR0VOOF9CU0QyX1JJTkdfQkFTRSwKIAkJLmlycV9zaGlm dCA9IEdFTjhfVkNTMl9JUlFfU0hJRlQsCi0JCS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNz X3JpbmdfaW5pdCwKLQkJLmluaXRfbGVnYWN5ID0gaW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIs CiAJfSwKIAlbVkVDU10gPSB7Ci0JCS5uYW1lID0gInZlY3MiLAogCQkuaHdfaWQgPSBWRUNTX0hX LAotCQkuZXhlY19pZCA9IEk5MTVfRVhFQ19WRUJPWCwKIAkJLmNsYXNzID0gVklERU9fRU5IQU5D RU1FTlRfQ0xBU1MsCiAJCS5pbnN0YW5jZSA9IDAsCiAJCS5tbWlvX2Jhc2UgPSBWRUJPWF9SSU5H X0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X1ZFQ1NfSVJRX1NISUZULAotCQkuaW5pdF9leGVj bGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCi0JCS5pbml0X2xlZ2FjeSA9IGludGVsX2lu aXRfdmVib3hfcmluZ19idWZmZXIsCiAJfSwKIH07CiAKQEAgLTk5LDYgKzExMSw4IEBACiAJCSAg IGVudW0gaW50ZWxfZW5naW5lX2lkIGlkKQogewogCWNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyAq aW5mbyA9ICZpbnRlbF9lbmdpbmVzW2lkXTsKKwljb25zdCBzdHJ1Y3QgZW5naW5lX2NsYXNzX2lu Zm8gKmNsYXNzX2luZm8gPQorCQkJCSZpbnRlbF9lbmdpbmVfY2xhc3Nlc1tpbmZvLT5jbGFzc107 CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWNoYXIgaW5zdGFuY2VbM10gPSAi IjsKIApAQCAtMTEwLDggKzEyNCw4IEBACiAJZW5naW5lLT5pZCA9IGlkOwogCWVuZ2luZS0+aTkx NSA9IGRldl9wcml2OwogCXNucHJpbnRmKGluc3RhbmNlLCBzaXplb2YoaW5zdGFuY2UpLCAiJXUi LCBpbmZvLT5pbnN0YW5jZSk7Ci0Jc25wcmludGYoZW5naW5lLT5uYW1lLCBzaXplb2YoZW5naW5l LT5uYW1lKSwgIiVzJXMiLCBpbmZvLT5uYW1lLCBpbnN0YW5jZSk7Ci0JZW5naW5lLT5leGVjX2lk ID0gaW5mby0+ZXhlY19pZDsKKwlzbnByaW50ZihlbmdpbmUtPm5hbWUsIHNpemVvZihlbmdpbmUt Pm5hbWUpLCAiJXMlcyIsIGNsYXNzX2luZm8tPm5hbWUsIGluc3RhbmNlKTsKKwllbmdpbmUtPmV4 ZWNfaWQgPSBjbGFzc19pbmZvLT5leGVjX2lkOwogCWVuZ2luZS0+aHdfaWQgPSBlbmdpbmUtPmd1 Y19pZCA9IGluZm8tPmh3X2lkOwogCWVuZ2luZS0+bW1pb19iYXNlID0gaW5mby0+bW1pb19iYXNl OwogCWVuZ2luZS0+aXJxX3NoaWZ0ID0gaW5mby0+aXJxX3NoaWZ0OwpAQCAtMTkxLDEyICsyMDUs MTQgQEAgaW50IGludGVsX2VuZ2luZXNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJaW50IGVyciA9IDA7CiAKIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJp diwgaWQpIHsKKwkJY29uc3Qgc3RydWN0IGVuZ2luZV9jbGFzc19pbmZvICpjbGFzc19pbmZvID0K KwkJCQkJJmludGVsX2VuZ2luZV9jbGFzc2VzW2VuZ2luZS0+Y2xhc3NdOwogCQlpbnQgKCppbml0 KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogCiAJCWlmIChpOTE1LmVuYWJsZV9l eGVjbGlzdHMpCi0JCQlpbml0ID0gaW50ZWxfZW5naW5lc1tpZF0uaW5pdF9leGVjbGlzdHM7CisJ CQlpbml0ID0gY2xhc3NfaW5mby0+aW5pdF9leGVjbGlzdHM7CiAJCWVsc2UKLQkJCWluaXQgPSBp bnRlbF9lbmdpbmVzW2lkXS5pbml0X2xlZ2FjeTsKKwkJCWluaXQgPSBjbGFzc19pbmZvLT5pbml0 X2xlZ2FjeTsKIAkJaWYgKCFpbml0KSB7CiAJCQlrZnJlZShlbmdpbmUpOwogCQkJZGV2X3ByaXYt PmVuZ2luZVtpZF0gPSBOVUxMOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=