From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oscar Mateo Subject: [PATCH v5] drm/i915: Split the engine info table in two levels, using class + instance Date: Fri, 7 Apr 2017 02:34:54 -0700 Message-ID: <1491557694-3493-1-git-send-email-oscar.mateo@intel.com> References: <20170407162734.GF185988@mwajdecz-MOBL1.ger.corp.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 D95876EC27 for ; Fri, 7 Apr 2017 16:34:35 +0000 (UTC) In-Reply-To: <20170407162734.GF185988@mwajdecz-MOBL1.ger.corp.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 Y2hhbCkKCnY1OiBCdWcgb24gdGhlIHJpZ2h0IHRoaW5nIChNaWNoYWwpCgpDYzogVHZydGtvIFVy c3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IFBhdWxvIFphbm9uaSA8cGF1bG8u ci56YW5vbmlAaW50ZWwuY29tPgpDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwu Y29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBEYW5p ZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgpDYzog TWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IE9zY2FyIE1hdGVvIDxvc2Nhci5tYXRlb0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgfCA2NSArKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwppbmRleCBlNDAzNTVjLi4z N2JkMDA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3Mu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwpAQCAtMjYsNzEg KzI2LDg0IEBACiAjaW5jbHVkZSAiaW50ZWxfcmluZ2J1ZmZlci5oIgogI2luY2x1ZGUgImludGVs X2xyYy5oIgogCi1zdGF0aWMgY29uc3Qgc3RydWN0IGVuZ2luZV9pbmZvIHsKK3N0cnVjdCBlbmdp bmVfY2xhc3NfaW5mbyB7CiAJY29uc3QgY2hhciAqbmFtZTsKLQl1bnNpZ25lZCBpbnQgZXhlY19p ZDsKKwlpbnQgKCppbml0X2xlZ2FjeSkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsK KwlpbnQgKCppbml0X2V4ZWNsaXN0cykoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsK K307CisKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5lX2NsYXNzX2luZm8gaW50ZWxfZW5naW5l X2NsYXNzZXNbXSA9IHsKKwlbUkVOREVSX0NMQVNTXSA9IHsKKwkJLm5hbWUgPSAicmNzIiwKKwkJ LmluaXRfZXhlY2xpc3RzID0gbG9naWNhbF9yZW5kZXJfcmluZ19pbml0LAorCQkuaW5pdF9sZWdh Y3kgPSBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlciwKKwl9LAorCVtDT1BZX0VOR0lORV9D TEFTU10gPSB7CisJCS5uYW1lID0gImJjcyIsCisJCS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxf eGNzX3JpbmdfaW5pdCwKKwkJLmluaXRfbGVnYWN5ID0gaW50ZWxfaW5pdF9ibHRfcmluZ19idWZm ZXIsCisJfSwKKwlbVklERU9fREVDT0RFX0NMQVNTXSA9IHsKKwkJLm5hbWUgPSAidmNzIiwKKwkJ LmluaXRfZXhlY2xpc3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAorCQkuaW5pdF9sZWdhY3kg PSBpbnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlciwKKwl9LAorCVtWSURFT19FTkhBTkNFTUVOVF9D TEFTU10gPSB7CisJCS5uYW1lID0gInZlY3MiLAorCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2Fs X3hjc19yaW5nX2luaXQsCisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfdmVib3hfcmluZ19i dWZmZXIsCisJfSwKK307CisKK3N0cnVjdCBlbmdpbmVfaW5mbyB7CiAJdW5zaWduZWQgaW50IGh3 X2lkOworCXVuc2lnbmVkIGludCBleGVjX2lkOwogCXU4IGNsYXNzOwogCXU4IGluc3RhbmNlOwog CXUzMiBtbWlvX2Jhc2U7CiAJdW5zaWduZWQgaXJxX3NoaWZ0OwotCWludCAoKmluaXRfbGVnYWN5 KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwotCWludCAoKmluaXRfZXhlY2xpc3Rz KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwotfSBpbnRlbF9lbmdpbmVzW10gPSB7 Cit9OworCitzdGF0aWMgY29uc3Qgc3RydWN0IGVuZ2luZV9pbmZvIGludGVsX2VuZ2luZXNbXSA9 IHsKIAlbUkNTXSA9IHsKLQkJLm5hbWUgPSAicmNzIiwKIAkJLmh3X2lkID0gUkNTX0hXLAogCQku ZXhlY19pZCA9IEk5MTVfRVhFQ19SRU5ERVIsCiAJCS5jbGFzcyA9IFJFTkRFUl9DTEFTUywKIAkJ Lmluc3RhbmNlID0gMCwKIAkJLm1taW9fYmFzZSA9IFJFTkRFUl9SSU5HX0JBU0UsCiAJCS5pcnFf c2hpZnQgPSBHRU44X1JDU19JUlFfU0hJRlQsCi0JCS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxf cmVuZGVyX3JpbmdfaW5pdCwKLQkJLmluaXRfbGVnYWN5ID0gaW50ZWxfaW5pdF9yZW5kZXJfcmlu Z19idWZmZXIsCiAJfSwKIAlbQkNTXSA9IHsKLQkJLm5hbWUgPSAiYmNzIiwKIAkJLmh3X2lkID0g QkNTX0hXLAogCQkuZXhlY19pZCA9IEk5MTVfRVhFQ19CTFQsCiAJCS5jbGFzcyA9IENPUFlfRU5H SU5FX0NMQVNTLAogCQkuaW5zdGFuY2UgPSAwLAogCQkubW1pb19iYXNlID0gQkxUX1JJTkdfQkFT RSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfQkNTX0lSUV9TSElGVCwKLQkJLmluaXRfZXhlY2xpc3Rz ID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAotCQkuaW5pdF9sZWdhY3kgPSBpbnRlbF9pbml0X2Js dF9yaW5nX2J1ZmZlciwKIAl9LAogCVtWQ1NdID0gewotCQkubmFtZSA9ICJ2Y3MiLAogCQkuaHdf aWQgPSBWQ1NfSFcsCiAJCS5leGVjX2lkID0gSTkxNV9FWEVDX0JTRCwKIAkJLmNsYXNzID0gVklE RU9fREVDT0RFX0NMQVNTLAogCQkuaW5zdGFuY2UgPSAwLAogCQkubW1pb19iYXNlID0gR0VONl9C U0RfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9WQ1MxX0lSUV9TSElGVCwKLQkJLmlu aXRfZXhlY2xpc3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAotCQkuaW5pdF9sZWdhY3kgPSBp bnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlciwKIAl9LAogCVtWQ1MyXSA9IHsKLQkJLm5hbWUgPSAi dmNzIiwKIAkJLmh3X2lkID0gVkNTMl9IVywKIAkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfQlNELAog CQkuY2xhc3MgPSBWSURFT19ERUNPREVfQ0xBU1MsCiAJCS5pbnN0YW5jZSA9IDEsCiAJCS5tbWlv X2Jhc2UgPSBHRU44X0JTRDJfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9WQ1MyX0lS UV9TSElGVCwKLQkJLmluaXRfZXhlY2xpc3RzID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAotCQku aW5pdF9sZWdhY3kgPSBpbnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlciwKIAl9LAogCVtWRUNTXSA9 IHsKLQkJLm5hbWUgPSAidmVjcyIsCiAJCS5od19pZCA9IFZFQ1NfSFcsCiAJCS5leGVjX2lkID0g STkxNV9FWEVDX1ZFQk9YLAogCQkuY2xhc3MgPSBWSURFT19FTkhBTkNFTUVOVF9DTEFTUywKIAkJ Lmluc3RhbmNlID0gMCwKIAkJLm1taW9fYmFzZSA9IFZFQk9YX1JJTkdfQkFTRSwKIAkJLmlycV9z aGlmdCA9IEdFTjhfVkVDU19JUlFfU0hJRlQsCi0JCS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxf eGNzX3JpbmdfaW5pdCwKLQkJLmluaXRfbGVnYWN5ID0gaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1 ZmZlciwKIAl9LAogfTsKIApAQCAtOTksOCArMTEyLDEyIEBACiAJCSAgIGVudW0gaW50ZWxfZW5n aW5lX2lkIGlkKQogewogCWNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyAqaW5mbyA9ICZpbnRlbF9l bmdpbmVzW2lkXTsKKwljb25zdCBzdHJ1Y3QgZW5naW5lX2NsYXNzX2luZm8gKmNsYXNzX2luZm87 CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCisJR0VNX0JVR19PTihpbmZvLT5j bGFzcyA+PSBBUlJBWV9TSVpFKGludGVsX2VuZ2luZV9jbGFzc2VzKSk7CisJY2xhc3NfaW5mbyA9 ICZpbnRlbF9lbmdpbmVfY2xhc3Nlc1tpbmZvLT5jbGFzc107CisKIAlHRU1fQlVHX09OKGRldl9w cml2LT5lbmdpbmVbaWRdKTsKIAllbmdpbmUgPSBremFsbG9jKHNpemVvZigqZW5naW5lKSwgR0ZQ X0tFUk5FTCk7CiAJaWYgKCFlbmdpbmUpCkBAIC0xMDksNyArMTI2LDcgQEAKIAllbmdpbmUtPmlk ID0gaWQ7CiAJZW5naW5lLT5pOTE1ID0gZGV2X3ByaXY7CiAJV0FSTl9PTihzbnByaW50Zihlbmdp bmUtPm5hbWUsIHNpemVvZihlbmdpbmUtPm5hbWUpLCAiJXMldSIsCi0JCQkgaW5mby0+bmFtZSwg aW5mby0+aW5zdGFuY2UpID49IHNpemVvZihlbmdpbmUtPm5hbWUpKTsKKwkJCSBjbGFzc19pbmZv LT5uYW1lLCBpbmZvLT5pbnN0YW5jZSkgPj0gc2l6ZW9mKGVuZ2luZS0+bmFtZSkpOwogCWVuZ2lu ZS0+ZXhlY19pZCA9IGluZm8tPmV4ZWNfaWQ7CiAJZW5naW5lLT5od19pZCA9IGVuZ2luZS0+Z3Vj X2lkID0gaW5mby0+aHdfaWQ7CiAJZW5naW5lLT5tbWlvX2Jhc2UgPSBpbmZvLT5tbWlvX2Jhc2U7 CkBAIC0xOTAsMTIgKzIwNywxNCBAQCBpbnQgaW50ZWxfZW5naW5lc19pbml0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpbnQgZXJyID0gMDsKIAogCWZvcl9lYWNoX2VuZ2lu ZShlbmdpbmUsIGRldl9wcml2LCBpZCkgeworCQljb25zdCBzdHJ1Y3QgZW5naW5lX2NsYXNzX2lu Zm8gKmNsYXNzX2luZm8gPQorCQkJCQkmaW50ZWxfZW5naW5lX2NsYXNzZXNbZW5naW5lLT5jbGFz c107CiAJCWludCAoKmluaXQpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKIAkJ aWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykKLQkJCWluaXQgPSBpbnRlbF9lbmdpbmVzW2lkXS5p bml0X2V4ZWNsaXN0czsKKwkJCWluaXQgPSBjbGFzc19pbmZvLT5pbml0X2V4ZWNsaXN0czsKIAkJ ZWxzZQotCQkJaW5pdCA9IGludGVsX2VuZ2luZXNbaWRdLmluaXRfbGVnYWN5OworCQkJaW5pdCA9 IGNsYXNzX2luZm8tPmluaXRfbGVnYWN5OwogCQlpZiAoIWluaXQpIHsKIAkJCWtmcmVlKGVuZ2lu ZSk7CiAJCQlkZXZfcHJpdi0+ZW5naW5lW2lkXSA9IE5VTEw7Ci0tIAoxLjkuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==