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: Wed, 5 Apr 2017 02:30:36 -0700 Message-ID: <1491384637-971-5-git-send-email-oscar.mateo@intel.com> References: <1491384637-971-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id A0E096E837 for ; Wed, 5 Apr 2017 16:30:29 +0000 (UTC) In-Reply-To: <1491384637-971-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 Q2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBQYXVsbyBa YW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmln by52aXZpQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGlu dGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyB8IDcyICsrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0NCBpbnNlcnRp b25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9lbmdpbmVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9j cy5jCmluZGV4IDUzMGY4MjIuLjY5MTY4OWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Vu Z2luZV9jcy5jCkBAIC0yNiw3MSArMjYsODMgQEAKICNpbmNsdWRlICJpbnRlbF9yaW5nYnVmZmVy LmgiCiAjaW5jbHVkZSAiaW50ZWxfbHJjLmgiCiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5l X2luZm8geworc3RydWN0IGVuZ2luZV9jbGFzc19pbmZvIHsKIAljb25zdCBjaGFyICpuYW1lOwog CXVuc2lnbmVkIGludCBleGVjX2lkOworCWludCAoKmluaXRfbGVnYWN5KShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpOworCWludCAoKmluaXRfZXhlY2xpc3RzKShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpOworfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfY2xh c3NfaW5mbyBpbnRlbF9lbmdpbmVfY2xhc3Nlc1tdID0geworCVtSRU5ERVJfQ0xBU1NdID0gewor CQkubmFtZSA9ICJyY3MiLAorCQkuZXhlY19pZCA9IEk5MTVfRVhFQ19SRU5ERVIsCisJCS5pbml0 X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdCwKKwkJLmluaXRfbGVnYWN5ID0g aW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIsCisJfSwKKwlbQ09QWV9FTkdJTkVfQ0xBU1Nd ID0geworCQkubmFtZSA9ICJiY3MiLAorCQkuZXhlY19pZCA9IEk5MTVfRVhFQ19CTFQsCisJCS5p bml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKKwkJLmluaXRfbGVnYWN5ID0g aW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIsCisJfSwKKwlbVklERU9fREVDT0RFX0NMQVNTXSA9 IHsKKwkJLm5hbWUgPSAidmNzIiwKKwkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfQlNELAorCQkuaW5p dF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCisJCS5pbml0X2xlZ2FjeSA9IGlu dGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyLAorCX0sCisJW1ZJREVPX0VOSEFOQ0VNRU5UX0NMQVNT XSA9IHsKKwkJLm5hbWUgPSAidmVjcyIsCisJCS5leGVjX2lkID0gSTkxNV9FWEVDX1ZFQk9YLAor CQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCisJCS5pbml0X2xlZ2Fj eSA9IGludGVsX2luaXRfdmVib3hfcmluZ19idWZmZXIsCisJfSwKK307CisKK3N0cnVjdCBlbmdp bmVfaW5mbyB7CiAJdW5zaWduZWQgaW50IGh3X2lkOwogCWVudW0gaW50ZWxfZW5naW5lX2NsYXNz IGNsYXNzOwogCXUzMiBpbnN0YW5jZTsKIAl1MzIgbW1pb19iYXNlOwogCXVuc2lnbmVkIGlycV9z aGlmdDsKLQlpbnQgKCppbml0X2xlZ2FjeSkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KTsKLQlpbnQgKCppbml0X2V4ZWNsaXN0cykoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KTsKLX0gaW50ZWxfZW5naW5lc1tdID0geworfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdp bmVfaW5mbyBpbnRlbF9lbmdpbmVzW10gPSB7CiAJW1JDU10gPSB7Ci0JCS5uYW1lID0gInJjcyIs CiAJCS5od19pZCA9IFJDU19IVywKLQkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNfUkVOREVSLAogCQku Y2xhc3MgPSBSRU5ERVJfQ0xBU1MsCiAJCS5pbnN0YW5jZSA9IDAsCiAJCS5tbWlvX2Jhc2UgPSBS RU5ERVJfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9SQ1NfSVJRX1NISUZULAotCQku aW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3JlbmRlcl9yaW5nX2luaXQsCi0JCS5pbml0X2xlZ2Fj eSA9IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyLAogCX0sCiAJW0JDU10gPSB7Ci0JCS5u YW1lID0gImJjcyIsCiAJCS5od19pZCA9IEJDU19IVywKLQkJLmV4ZWNfaWQgPSBJOTE1X0VYRUNf QkxULAogCQkuY2xhc3MgPSBDT1BZX0VOR0lORV9DTEFTUywKIAkJLmluc3RhbmNlID0gMCwKIAkJ Lm1taW9fYmFzZSA9IEJMVF9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X0JDU19JUlFf U0hJRlQsCi0JCS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKLQkJLmlu aXRfbGVnYWN5ID0gaW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIsCiAJfSwKIAlbVkNTXSA9IHsK LQkJLm5hbWUgPSAidmNzIiwKIAkJLmh3X2lkID0gVkNTX0hXLAotCQkuZXhlY19pZCA9IEk5MTVf RVhFQ19CU0QsCiAJCS5jbGFzcyA9IFZJREVPX0RFQ09ERV9DTEFTUywKIAkJLmluc3RhbmNlID0g MCwKIAkJLm1taW9fYmFzZSA9IEdFTjZfQlNEX1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdF TjhfVkNTMV9JUlFfU0hJRlQsCi0JCS5pbml0X2V4ZWNsaXN0cyA9IGxvZ2ljYWxfeGNzX3Jpbmdf aW5pdCwKLQkJLmluaXRfbGVnYWN5ID0gaW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIsCiAJfSwK IAlbVkNTMl0gPSB7Ci0JCS5uYW1lID0gInZjcyIsCiAJCS5od19pZCA9IFZDUzJfSFcsCi0JCS5l eGVjX2lkID0gSTkxNV9FWEVDX0JTRCwKIAkJLmNsYXNzID0gVklERU9fREVDT0RFX0NMQVNTLAog CQkuaW5zdGFuY2UgPSAxLAogCQkubW1pb19iYXNlID0gR0VOOF9CU0QyX1JJTkdfQkFTRSwKIAkJ LmlycV9zaGlmdCA9IEdFTjhfVkNTMl9JUlFfU0hJRlQsCi0JCS5pbml0X2V4ZWNsaXN0cyA9IGxv Z2ljYWxfeGNzX3JpbmdfaW5pdCwKLQkJLmluaXRfbGVnYWN5ID0gaW50ZWxfaW5pdF9ic2Rfcmlu Z19idWZmZXIsCiAJfSwKIAlbVkVDU10gPSB7Ci0JCS5uYW1lID0gInZlY3MiLAogCQkuaHdfaWQg PSBWRUNTX0hXLAotCQkuZXhlY19pZCA9IEk5MTVfRVhFQ19WRUJPWCwKIAkJLmNsYXNzID0gVklE RU9fRU5IQU5DRU1FTlRfQ0xBU1MsCiAJCS5pbnN0YW5jZSA9IDAsCiAJCS5tbWlvX2Jhc2UgPSBW RUJPWF9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X1ZFQ1NfSVJRX1NISUZULAotCQku aW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCi0JCS5pbml0X2xlZ2FjeSA9 IGludGVsX2luaXRfdmVib3hfcmluZ19idWZmZXIsCiAJfSwKIH07CiAKQEAgLTk5LDYgKzExMSw4 IEBACiAJCSAgIGVudW0gaW50ZWxfZW5naW5lX2lkIGlkKQogewogCWNvbnN0IHN0cnVjdCBlbmdp bmVfaW5mbyAqaW5mbyA9ICZpbnRlbF9lbmdpbmVzW2lkXTsKKwljb25zdCBzdHJ1Y3QgZW5naW5l X2NsYXNzX2luZm8gKmNsYXNzX2luZm8gPQorCQkJCSZpbnRlbF9lbmdpbmVfY2xhc3Nlc1tpbmZv LT5jbGFzc107CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWNoYXIgaW5zdGFu Y2VbM10gPSAiIjsKIApAQCAtMTEyLDggKzEyNiw4IEBACiAJLyogRm9yIGhpc3RvcmljYWwgcmVh c29ucyB0aGUgZW5naW5lcyBhcmUgY2FsbGVkOiBuYW1lLCBuYW1lMi4uLiAqLwogCWlmIChpbmZv LT5pbnN0YW5jZSkKIAkJc25wcmludGYoaW5zdGFuY2UsIHNpemVvZihpbnN0YW5jZSksICIldSIs IGluZm8tPmluc3RhbmNlICsgMSk7Ci0Jc25wcmludGYoZW5naW5lLT5uYW1lLCBzaXplb2YoZW5n aW5lLT5uYW1lKSwgIiVzJXMiLCBpbmZvLT5uYW1lLCBpbnN0YW5jZSk7Ci0JZW5naW5lLT5leGVj X2lkID0gaW5mby0+ZXhlY19pZDsKKwlzbnByaW50ZihlbmdpbmUtPm5hbWUsIHNpemVvZihlbmdp bmUtPm5hbWUpLCAiJXMlcyIsIGNsYXNzX2luZm8tPm5hbWUsIGluc3RhbmNlKTsKKwllbmdpbmUt PmV4ZWNfaWQgPSBjbGFzc19pbmZvLT5leGVjX2lkOwogCWVuZ2luZS0+aHdfaWQgPSBlbmdpbmUt Pmd1Y19pZCA9IGluZm8tPmh3X2lkOwogCWVuZ2luZS0+bW1pb19iYXNlID0gaW5mby0+bW1pb19i YXNlOwogCWVuZ2luZS0+aXJxX3NoaWZ0ID0gaW5mby0+aXJxX3NoaWZ0OwpAQCAtMTkzLDEyICsy MDcsMTQgQEAgaW50IGludGVsX2VuZ2luZXNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJaW50IGVyciA9IDA7CiAKIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZf cHJpdiwgaWQpIHsKKwkJY29uc3Qgc3RydWN0IGVuZ2luZV9jbGFzc19pbmZvICpjbGFzc19pbmZv ID0KKwkJCQkJJmludGVsX2VuZ2luZV9jbGFzc2VzW2VuZ2luZS0+Y2xhc3NdOwogCQlpbnQgKCpp bml0KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogCiAJCWlmIChpOTE1LmVuYWJs ZV9leGVjbGlzdHMpCi0JCQlpbml0ID0gaW50ZWxfZW5naW5lc1tpZF0uaW5pdF9leGVjbGlzdHM7 CisJCQlpbml0ID0gY2xhc3NfaW5mby0+aW5pdF9leGVjbGlzdHM7CiAJCWVsc2UKLQkJCWluaXQg PSBpbnRlbF9lbmdpbmVzW2lkXS5pbml0X2xlZ2FjeTsKKwkJCWluaXQgPSBjbGFzc19pbmZvLT5p bml0X2xlZ2FjeTsKIAkJaWYgKCFpbml0KSB7CiAJCQlrZnJlZShlbmdpbmUpOwogCQkJZGV2X3By aXYtPmVuZ2luZVtpZF0gPSBOVUxMOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=