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 08:00:15 -0700 Message-ID: <1491490816-26965-5-git-send-email-oscar.mateo@intel.com> References: <1491490816-26965-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 770F96E19A for ; Thu, 6 Apr 2017 21:59:58 +0000 (UTC) In-Reply-To: <1491490816-26965-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 ZWJhc2VkCiAgLSBFeGVjL3VhYmkgaWQgc2hvdWxkIGJlIHBlciBpbnN0YW5jZSAoQ2hyaXMpCgpD YzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IFBhdWxvIFph bm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgpDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdv LnZpdmlAaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+CkNjOiBEYW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50 ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBPc2NhciBNYXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jIHwgNzEgKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ0IGluc2VydGlv bnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2VuZ2luZV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2Nz LmMKaW5kZXggYzZhNzNkMC4uNmVhYjIyZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZW5naW5lX2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5n aW5lX2NzLmMKQEAgLTI2LDcxICsyNiw4NCBAQAogI2luY2x1ZGUgImludGVsX3JpbmdidWZmZXIu aCIKICNpbmNsdWRlICJpbnRlbF9scmMuaCIKIAotc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVf aW5mbyB7CitzdHJ1Y3QgZW5naW5lX2NsYXNzX2luZm8gewogCWNvbnN0IGNoYXIgKm5hbWU7CisJ aW50ICgqaW5pdF9sZWdhY3kpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CisJaW50 ICgqaW5pdF9leGVjbGlzdHMpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Cit9Owor CitzdGF0aWMgY29uc3Qgc3RydWN0IGVuZ2luZV9jbGFzc19pbmZvIGludGVsX2VuZ2luZV9jbGFz c2VzW10gPSB7CisJW1JFTkRFUl9DTEFTU10gPSB7CisJCS5uYW1lID0gInJjcyIsCisJCS5pbml0 X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdCwKKwkJLmluaXRfbGVnYWN5ID0g aW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIsCisJfSwKKwlbQ09QWV9FTkdJTkVfQ0xBU1Nd ID0geworCQkubmFtZSA9ICJiY3MiLAorCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19y aW5nX2luaXQsCisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyLAor CX0sCisJW1ZJREVPX0RFQ09ERV9DTEFTU10gPSB7CisJCS5uYW1lID0gInZjcyIsCisJCS5pbml0 X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKKwkJLmluaXRfbGVnYWN5ID0gaW50 ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIsCisJfSwKKwlbVklERU9fRU5IQU5DRU1FTlRfQ0xBU1Nd ID0geworCQkubmFtZSA9ICJ2ZWNzIiwKKwkJLmluaXRfZXhlY2xpc3RzID0gbG9naWNhbF94Y3Nf cmluZ19pbml0LAorCQkuaW5pdF9sZWdhY3kgPSBpbnRlbF9pbml0X3ZlYm94X3JpbmdfYnVmZmVy LAorCX0sCit9OworCitzdHJ1Y3QgZW5naW5lX2luZm8gewogCXVuc2lnbmVkIGludCBleGVjX2lk OwogCXVuc2lnbmVkIGludCBod19pZDsKIAllbnVtIGludGVsX2VuZ2luZV9jbGFzcyBjbGFzczsK IAl1OCBpbnN0YW5jZTsKIAl1MzIgbW1pb19iYXNlOwogCXVuc2lnbmVkIGlycV9zaGlmdDsKLQlp bnQgKCppbml0X2xlZ2FjeSkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKLQlpbnQg KCppbml0X2V4ZWNsaXN0cykoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKLX0gaW50 ZWxfZW5naW5lc1tdID0geworfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyBp bnRlbF9lbmdpbmVzW10gPSB7CiAJW1JDU10gPSB7Ci0JCS5uYW1lID0gInJjcyIsCi0JCS5od19p ZCA9IFJDU19IVywKIAkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfUkVOREVSLAorCQkuaHdfaWQgPSBS Q1NfSFcsCiAJCS5jbGFzcyA9IFJFTkRFUl9DTEFTUywKIAkJLmluc3RhbmNlID0gMCwKIAkJLm1t aW9fYmFzZSA9IFJFTkRFUl9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X1JDU19JUlFf U0hJRlQsCi0JCS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdCwKLQkJ LmluaXRfbGVnYWN5ID0gaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIsCiAJfSwKIAlbQkNT XSA9IHsKLQkJLm5hbWUgPSAiYmNzIiwKLQkJLmh3X2lkID0gQkNTX0hXLAogCQkuZXhlY19pZCA9 IEk5MTVfRVhFQ19CTFQsCisJCS5od19pZCA9IEJDU19IVywKIAkJLmNsYXNzID0gQ09QWV9FTkdJ TkVfQ0xBU1MsCiAJCS5pbnN0YW5jZSA9IDAsCiAJCS5tbWlvX2Jhc2UgPSBCTFRfUklOR19CQVNF LAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9CQ1NfSVJRX1NISUZULAotCQkuaW5pdF9leGVjbGlzdHMg PSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCi0JCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfYmx0 X3JpbmdfYnVmZmVyLAogCX0sCiAJW1ZDU10gPSB7Ci0JCS5uYW1lID0gInZjcyIsCi0JCS5od19p ZCA9IFZDU19IVywKIAkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfQlNELAorCQkuaHdfaWQgPSBWQ1Nf SFcsCiAJCS5jbGFzcyA9IFZJREVPX0RFQ09ERV9DTEFTUywKIAkJLmluc3RhbmNlID0gMCwKIAkJ Lm1taW9fYmFzZSA9IEdFTjZfQlNEX1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfVkNT MV9JUlFfU0hJRlQsCi0JCS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwK LQkJLmluaXRfbGVnYWN5ID0gaW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIsCiAJfSwKIAlbVkNT Ml0gPSB7Ci0JCS5uYW1lID0gInZjcyIsCi0JCS5od19pZCA9IFZDUzJfSFcsCiAJCS5leGVjX2lk ID0gSTkxNV9FWEVDX0JTRCwKKwkJLmh3X2lkID0gVkNTMl9IVywKIAkJLmNsYXNzID0gVklERU9f REVDT0RFX0NMQVNTLAogCQkuaW5zdGFuY2UgPSAxLAogCQkubW1pb19iYXNlID0gR0VOOF9CU0Qy X1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfVkNTMl9JUlFfU0hJRlQsCi0JCS5pbml0 X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKLQkJLmluaXRfbGVnYWN5ID0gaW50 ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIsCiAJfSwKIAlbVkVDU10gPSB7Ci0JCS5uYW1lID0gInZl Y3MiLAotCQkuaHdfaWQgPSBWRUNTX0hXLAogCQkuZXhlY19pZCA9IEk5MTVfRVhFQ19WRUJPWCwK KwkJLmh3X2lkID0gVkVDU19IVywKIAkJLmNsYXNzID0gVklERU9fRU5IQU5DRU1FTlRfQ0xBU1Ms CiAJCS5pbnN0YW5jZSA9IDAsCiAJCS5tbWlvX2Jhc2UgPSBWRUJPWF9SSU5HX0JBU0UsCiAJCS5p cnFfc2hpZnQgPSBHRU44X1ZFQ1NfSVJRX1NISUZULAotCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dp Y2FsX3hjc19yaW5nX2luaXQsCi0JCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfdmVib3hfcmlu Z19idWZmZXIsCiAJfSwKIH07CiAKQEAgLTk5LDYgKzExMiw4IEBACiAJCSAgIGVudW0gaW50ZWxf ZW5naW5lX2lkIGlkKQogewogCWNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyAqaW5mbyA9ICZpbnRl bF9lbmdpbmVzW2lkXTsKKwljb25zdCBzdHJ1Y3QgZW5naW5lX2NsYXNzX2luZm8gKmNsYXNzX2lu Zm8gPQorCQkJCSZpbnRlbF9lbmdpbmVfY2xhc3Nlc1tpbmZvLT5jbGFzc107CiAJc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCiAJR0VNX0JVR19PTihkZXZfcHJpdi0+ZW5naW5lW2lk XSk7CkBAIC0xMDksNyArMTI0LDcgQEAKIAllbmdpbmUtPmlkID0gaWQ7CiAJZW5naW5lLT5pOTE1 ID0gZGV2X3ByaXY7CiAJc25wcmludGYoZW5naW5lLT5uYW1lLCBzaXplb2YoZW5naW5lLT5uYW1l KSwgIiVzJXUiLAotCQkJCWluZm8tPm5hbWUsIGluZm8tPmluc3RhbmNlKTsKKwkJCQljbGFzc19p bmZvLT5uYW1lLCBpbmZvLT5pbnN0YW5jZSk7CiAJZW5naW5lLT5leGVjX2lkID0gaW5mby0+ZXhl Y19pZDsKIAllbmdpbmUtPmh3X2lkID0gZW5naW5lLT5ndWNfaWQgPSBpbmZvLT5od19pZDsKIAll bmdpbmUtPm1taW9fYmFzZSA9IGluZm8tPm1taW9fYmFzZTsKQEAgLTE5MCwxMiArMjA1LDE0IEBA IGludCBpbnRlbF9lbmdpbmVzX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCWludCBlcnIgPSAwOwogCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlk KSB7CisJCWNvbnN0IHN0cnVjdCBlbmdpbmVfY2xhc3NfaW5mbyAqY2xhc3NfaW5mbyA9CisJCQkJ CSZpbnRlbF9lbmdpbmVfY2xhc3Nlc1tlbmdpbmUtPmNsYXNzXTsKIAkJaW50ICgqaW5pdCkoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAogCQlpZiAoaTkxNS5lbmFibGVfZXhlY2xp c3RzKQotCQkJaW5pdCA9IGludGVsX2VuZ2luZXNbaWRdLmluaXRfZXhlY2xpc3RzOworCQkJaW5p dCA9IGNsYXNzX2luZm8tPmluaXRfZXhlY2xpc3RzOwogCQllbHNlCi0JCQlpbml0ID0gaW50ZWxf ZW5naW5lc1tpZF0uaW5pdF9sZWdhY3k7CisJCQlpbml0ID0gY2xhc3NfaW5mby0+aW5pdF9sZWdh Y3k7CiAJCWlmICghaW5pdCkgewogCQkJa2ZyZWUoZW5naW5lKTsKIAkJCWRldl9wcml2LT5lbmdp bmVbaWRdID0gTlVMTDsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK