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: Mon, 10 Apr 2017 07:34:32 -0700 Message-ID: <1491834873-9345-5-git-send-email-oscar.mateo@intel.com> References: <1491834873-9345-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 448946E3DB for ; Mon, 10 Apr 2017 21:34:56 +0000 (UTC) In-Reply-To: <1491834873-9345-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 Y2hhbCkKCnY1OiBCdWcgb24gdGhlIHJpZ2h0IHRoaW5nIChNaWNoYWwpCgp2NjogUmViYXNlZAoK Q2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBQYXVsbyBa YW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmln by52aXZpQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGlu dGVsLmNvbT4KUmV2aWV3ZWQtYnk6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29A aW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBPc2NhciBNYXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwu Y29tPgoKQ29uZmxpY3RzOgoJZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMK LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyB8IDY1ICsrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MiBpbnNlcnRpb25z KCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9lbmdpbmVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5j CmluZGV4IDVlNWNkYTAuLjgwY2IwZmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2lu ZV9jcy5jCkBAIC0yNiw3MSArMjYsODQgQEAKICNpbmNsdWRlICJpbnRlbF9yaW5nYnVmZmVyLmgi CiAjaW5jbHVkZSAiaW50ZWxfbHJjLmgiCiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5lX2lu Zm8geworc3RydWN0IGVuZ2luZV9jbGFzc19pbmZvIHsKIAljb25zdCBjaGFyICpuYW1lOwotCXVu c2lnbmVkIGludCBleGVjX2lkOworCWludCAoKmluaXRfbGVnYWN5KShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpOworCWludCAoKmluaXRfZXhlY2xpc3RzKShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpOworfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfY2xhc3Nf aW5mbyBpbnRlbF9lbmdpbmVfY2xhc3Nlc1tdID0geworCVtSRU5ERVJfQ0xBU1NdID0geworCQku bmFtZSA9ICJyY3MiLAorCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3JlbmRlcl9yaW5nX2lu aXQsCisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyLAorCX0s CisJW0NPUFlfRU5HSU5FX0NMQVNTXSA9IHsKKwkJLm5hbWUgPSAiYmNzIiwKKwkJLmluaXRfZXhl Y2xpc3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAorCQkuaW5pdF9sZWdhY3kgPSBpbnRlbF9p bml0X2JsdF9yaW5nX2J1ZmZlciwKKwl9LAorCVtWSURFT19ERUNPREVfQ0xBU1NdID0geworCQku bmFtZSA9ICJ2Y3MiLAorCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQs CisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyLAorCX0sCisJW1ZJ REVPX0VOSEFOQ0VNRU5UX0NMQVNTXSA9IHsKKwkJLm5hbWUgPSAidmVjcyIsCisJCS5pbml0X2V4 ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKKwkJLmluaXRfbGVnYWN5ID0gaW50ZWxf aW5pdF92ZWJveF9yaW5nX2J1ZmZlciwKKwl9LAorfTsKKworc3RydWN0IGVuZ2luZV9pbmZvIHsK IAl1bnNpZ25lZCBpbnQgaHdfaWQ7CisJdW5zaWduZWQgaW50IGV4ZWNfaWQ7CiAJdTggY2xhc3M7 CiAJdTggaW5zdGFuY2U7CiAJdTMyIG1taW9fYmFzZTsKIAl1bnNpZ25lZCBpcnFfc2hpZnQ7Ci0J aW50ICgqaW5pdF9sZWdhY3kpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci0JaW50 ICgqaW5pdF9leGVjbGlzdHMpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci19IGlu dGVsX2VuZ2luZXNbXSA9IHsKK307CisKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5lX2luZm8g aW50ZWxfZW5naW5lc1tdID0gewogCVtSQ1NdID0gewotCQkubmFtZSA9ICJyY3MiLAogCQkuaHdf aWQgPSBSQ1NfSFcsCiAJCS5leGVjX2lkID0gSTkxNV9FWEVDX1JFTkRFUiwKIAkJLmNsYXNzID0g UkVOREVSX0NMQVNTLAogCQkuaW5zdGFuY2UgPSAwLAogCQkubW1pb19iYXNlID0gUkVOREVSX1JJ TkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfUkNTX0lSUV9TSElGVCwKLQkJLmluaXRfZXhl Y2xpc3RzID0gbG9naWNhbF9yZW5kZXJfcmluZ19pbml0LAotCQkuaW5pdF9sZWdhY3kgPSBpbnRl bF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlciwKIAl9LAogCVtCQ1NdID0gewotCQkubmFtZSA9ICJi Y3MiLAogCQkuaHdfaWQgPSBCQ1NfSFcsCiAJCS5leGVjX2lkID0gSTkxNV9FWEVDX0JMVCwKIAkJ LmNsYXNzID0gQ09QWV9FTkdJTkVfQ0xBU1MsCiAJCS5pbnN0YW5jZSA9IDAsCiAJCS5tbWlvX2Jh c2UgPSBCTFRfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9CQ1NfSVJRX1NISUZULAot CQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCi0JCS5pbml0X2xlZ2Fj eSA9IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyLAogCX0sCiAJW1ZDU10gPSB7Ci0JCS5uYW1l ID0gInZjcyIsCiAJCS5od19pZCA9IFZDU19IVywKIAkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfQlNE LAogCQkuY2xhc3MgPSBWSURFT19ERUNPREVfQ0xBU1MsCiAJCS5pbnN0YW5jZSA9IDAsCiAJCS5t bWlvX2Jhc2UgPSBHRU42X0JTRF9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X1ZDUzFf SVJRX1NISUZULAotCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCi0J CS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyLAogCX0sCiAJW1ZDUzJd ID0gewotCQkubmFtZSA9ICJ2Y3MiLAogCQkuaHdfaWQgPSBWQ1MyX0hXLAogCQkuZXhlY19pZCA9 IEk5MTVfRVhFQ19CU0QsCiAJCS5jbGFzcyA9IFZJREVPX0RFQ09ERV9DTEFTUywKIAkJLmluc3Rh bmNlID0gMSwKIAkJLm1taW9fYmFzZSA9IEdFTjhfQlNEMl9SSU5HX0JBU0UsCiAJCS5pcnFfc2hp ZnQgPSBHRU44X1ZDUzJfSVJRX1NISUZULAotCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hj c19yaW5nX2luaXQsCi0JCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVy LAogCX0sCiAJW1ZFQ1NdID0gewotCQkubmFtZSA9ICJ2ZWNzIiwKIAkJLmh3X2lkID0gVkVDU19I VywKIAkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfVkVCT1gsCiAJCS5jbGFzcyA9IFZJREVPX0VOSEFO Q0VNRU5UX0NMQVNTLAogCQkuaW5zdGFuY2UgPSAwLAogCQkubW1pb19iYXNlID0gVkVCT1hfUklO R19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9WRUNTX0lSUV9TSElGVCwKLQkJLmluaXRfZXhl Y2xpc3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAotCQkuaW5pdF9sZWdhY3kgPSBpbnRlbF9p bml0X3ZlYm94X3JpbmdfYnVmZmVyLAogCX0sCiB9OwogCkBAIC05OSw4ICsxMTIsMTIgQEAKIAkJ ICAgZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQpCiB7CiAJY29uc3Qgc3RydWN0IGVuZ2luZV9pbmZv ICppbmZvID0gJmludGVsX2VuZ2luZXNbaWRdOworCWNvbnN0IHN0cnVjdCBlbmdpbmVfY2xhc3Nf aW5mbyAqY2xhc3NfaW5mbzsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAKKwlH RU1fQlVHX09OKGluZm8tPmNsYXNzID49IEFSUkFZX1NJWkUoaW50ZWxfZW5naW5lX2NsYXNzZXMp KTsKKwljbGFzc19pbmZvID0gJmludGVsX2VuZ2luZV9jbGFzc2VzW2luZm8tPmNsYXNzXTsKKwog CUdFTV9CVUdfT04oZGV2X3ByaXYtPmVuZ2luZVtpZF0pOwogCWVuZ2luZSA9IGt6YWxsb2Moc2l6 ZW9mKCplbmdpbmUpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIWVuZ2luZSkKQEAgLTEwOSw3ICsxMjYs NyBAQAogCWVuZ2luZS0+aWQgPSBpZDsKIAllbmdpbmUtPmk5MTUgPSBkZXZfcHJpdjsKIAlXQVJO X09OKHNucHJpbnRmKGVuZ2luZS0+bmFtZSwgc2l6ZW9mKGVuZ2luZS0+bmFtZSksICIlcyV1IiwK LQkJCSBpbmZvLT5uYW1lLCBpbmZvLT5pbnN0YW5jZSkgPj0gc2l6ZW9mKGVuZ2luZS0+bmFtZSkp OworCQkJIGNsYXNzX2luZm8tPm5hbWUsIGluZm8tPmluc3RhbmNlKSA+PSBzaXplb2YoZW5naW5l LT5uYW1lKSk7CiAJZW5naW5lLT5leGVjX2lkID0gaW5mby0+ZXhlY19pZDsKIAllbmdpbmUtPmh3 X2lkID0gZW5naW5lLT5ndWNfaWQgPSBpbmZvLT5od19pZDsKIAllbmdpbmUtPm1taW9fYmFzZSA9 IGluZm8tPm1taW9fYmFzZTsKQEAgLTE5MCwxMiArMjA3LDE0IEBAIGludCBpbnRlbF9lbmdpbmVz X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWludCBlcnIgPSAwOwog CiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKSB7CisJCWNvbnN0IHN0cnVj dCBlbmdpbmVfY2xhc3NfaW5mbyAqY2xhc3NfaW5mbyA9CisJCQkJCSZpbnRlbF9lbmdpbmVfY2xh c3Nlc1tlbmdpbmUtPmNsYXNzXTsKIAkJaW50ICgqaW5pdCkoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKTsKIAogCQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQotCQkJaW5pdCA9IGlu dGVsX2VuZ2luZXNbaWRdLmluaXRfZXhlY2xpc3RzOworCQkJaW5pdCA9IGNsYXNzX2luZm8tPmlu aXRfZXhlY2xpc3RzOwogCQllbHNlCi0JCQlpbml0ID0gaW50ZWxfZW5naW5lc1tpZF0uaW5pdF9s ZWdhY3k7CisJCQlpbml0ID0gY2xhc3NfaW5mby0+aW5pdF9sZWdhY3k7CiAJCWlmICghaW5pdCkg ewogCQkJa2ZyZWUoZW5naW5lKTsKIAkJCWRldl9wcml2LT5lbmdpbmVbaWRdID0gTlVMTDsKLS0g CjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK