From: Mika Kuoppala Subject: [PATCH 8/8] drm/i915/icl: Use hw engine class, instance to find irq handler Date: Fri, 16 Mar 2018 14:14:56 +0200 Message-ID: <20180316121456.11577-8-mika.kuoppala@linux.intel.com> References: <20180316121456.11577-1-mika.kuoppala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7EC5A6EB37 for ; Fri, 16 Mar 2018 12:15:17 +0000 (UTC) In-Reply-To: <20180316121456.11577-1-mika.kuoppala@linux.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 List-Id: intel-gfx@lists.freedesktop.org SW50ZXJydXB0IGlkZW50aXR5IHJlZ2lzdGVyIHdlIGFscmVhZHkgcmVhZCBmcm9tIGhhcmR3YXJl CmNvbnRhaW5zIGVuZ2luZSBjbGFzcyBhbmQgaW5zdGFuY2UgZmllbGRzLiBMZXZlcmFnZQp0aGVz ZSBmaWVsZHMgdG8gZmluZCBjb3JyZWN0IGVuZ2luZSB0byBoYW5kbGUgdGhlIGludGVycnVwdC4K CnYzOiByZWJhc2Ugb24gdG9wIG9mIHJwcyBpbnRyCiAgICB1c2UgY29ycmVjdCBjbGFzcyAvIGlu c3RhbmNlIGxpbWl0cyAoTWljaGVsKQoKU3VnZ2VzdGVkLWJ5OiBEYW5pZWxlIENlcmFvbG8gU3B1 cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgpDYzogRGFuaWVsZSBDZXJhb2xv IFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51 cnN1bGluQGludGVsLmNvbT4KQ2M6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXgu aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgfCA4MCArKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9yZWcuaCB8ICA0ICsrLQogMiBmaWxlcyBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCsp LCA1MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCA4YzQ1MTBmZmU2 MjUuLmRkMmZiMmQwNDU3ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC00MTMsOCArNDEz LDggQEAgc3RhdGljIHZvaWQgZ2VuNl9kaXNhYmxlX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIHUzMiBkaXNhYmxlX20KIH0KIAogc3RhdGljIHUzMgotZ2VuMTFfZ3Rf ZW5naW5lX2ludHIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKiBjb25zdCBpOTE1LAotCQkgICAg IGNvbnN0IHVuc2lnbmVkIGludCBiYW5rLCBjb25zdCB1bnNpZ25lZCBpbnQgYml0KTsKK2dlbjEx X2d0X2VuZ2luZV9pZGVudGl0eShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqIGNvbnN0IGk5MTUs CisJCQkgY29uc3QgdW5zaWduZWQgaW50IGJhbmssIGNvbnN0IHVuc2lnbmVkIGludCBiaXQpOwog CiB2b2lkIGdlbjExX3Jlc2V0X3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKQEAgLTQyOCw3ICs0MjgsNyBAQCB2b2lkIGdlbjExX3Jlc2V0X3Jwc19p bnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgKi8KIAlkdyA9 IEk5MTVfUkVBRF9GVyhHRU4xMV9HVF9JTlRSX0RXMCk7CiAJd2hpbGUgKGR3ICYgQklUKEdFTjEx X0dUUE0pKSB7Ci0JCWdlbjExX2d0X2VuZ2luZV9pbnRyKGRldl9wcml2LCAwLCBHRU4xMV9HVFBN KTsKKwkJZ2VuMTFfZ3RfZW5naW5lX2lkZW50aXR5KGRldl9wcml2LCAwLCBHRU4xMV9HVFBNKTsK IAkJSTkxNV9XUklURV9GVyhHRU4xMV9HVF9JTlRSX0RXMCwgQklUKEdFTjExX0dUUE0pKTsKIAkJ ZHcgPSBJOTE1X1JFQURfRlcoR0VOMTFfR1RfSU5UUl9EVzApOwogCX0KQEAgLTI3NzEsNTAgKzI3 NzEsOSBAQCBzdGF0aWMgdm9pZCBfX2Zpbmlfd2VkZ2Uoc3RydWN0IHdlZGdlX21lICp3KQogCSAg ICAgKFcpLT5pOTE1OwkJCQkJCQlcCiAJICAgICBfX2Zpbmlfd2VkZ2UoKFcpKSkKIAotc3RhdGlj IHZvaWQKLWdlbjExX2d0X2VuZ2luZV9pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqIGNvbnN0IGk5MTUsCi0JCQkgICAgY29uc3QgdW5zaWduZWQgaW50IGJhbmssCi0JCQkgICAg Y29uc3QgdW5zaWduZWQgaW50IGVuZ2luZV9uLAotCQkJICAgIGNvbnN0IHUxNiBpaXIpCi17Ci0J c3RydWN0IGludGVsX2VuZ2luZV9jcyAqKiBjb25zdCBlbmdpbmUgPSBpOTE1LT5lbmdpbmU7Ci0K LQlzd2l0Y2ggKGJhbmspIHsKLQljYXNlIDA6Ci0JCXN3aXRjaCAoZW5naW5lX24pIHsKLQotCQlj YXNlIEdFTjExX1JDUzA6Ci0JCQlyZXR1cm4gZ2VuOF9jc19pcnFfaGFuZGxlcihlbmdpbmVbUkNT XSwgaWlyKTsKLQotCQljYXNlIEdFTjExX0JDUzoKLQkJCXJldHVybiBnZW44X2NzX2lycV9oYW5k bGVyKGVuZ2luZVtCQ1NdLCBpaXIpOwotCi0JCWNhc2UgR0VOMTFfR1RQTToKLQkJCXJldHVybiBn ZW42X3Jwc19pcnFfaGFuZGxlcihpOTE1LCBpaXIpOwotCQl9Ci0JY2FzZSAxOgotCQlzd2l0Y2gg KGVuZ2luZV9uKSB7Ci0KLQkJY2FzZSBHRU4xMV9WQ1MoMCk6Ci0JCQlyZXR1cm4gZ2VuOF9jc19p cnFfaGFuZGxlcihlbmdpbmVbX1ZDUygwKV0sIGlpcik7Ci0JCWNhc2UgR0VOMTFfVkNTKDEpOgot CQkJcmV0dXJuIGdlbjhfY3NfaXJxX2hhbmRsZXIoZW5naW5lW19WQ1MoMSldLCBpaXIpOwotCQlj YXNlIEdFTjExX1ZDUygyKToKLQkJCXJldHVybiBnZW44X2NzX2lycV9oYW5kbGVyKGVuZ2luZVtf VkNTKDIpXSwgaWlyKTsKLQkJY2FzZSBHRU4xMV9WQ1MoMyk6Ci0JCQlyZXR1cm4gZ2VuOF9jc19p cnFfaGFuZGxlcihlbmdpbmVbX1ZDUygzKV0sIGlpcik7Ci0KLQkJY2FzZSBHRU4xMV9WRUNTKDAp OgotCQkJcmV0dXJuIGdlbjhfY3NfaXJxX2hhbmRsZXIoZW5naW5lW19WRUNTKDApXSwgaWlyKTsK LQkJY2FzZSBHRU4xMV9WRUNTKDEpOgotCQkJcmV0dXJuIGdlbjhfY3NfaXJxX2hhbmRsZXIoZW5n aW5lW19WRUNTKDEpXSwgaWlyKTsKLQkJfQotCX0KLX0KLQogc3RhdGljIHUzMgotZ2VuMTFfZ3Rf ZW5naW5lX2ludHIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKiBjb25zdCBpOTE1LAotCQkgICAg IGNvbnN0IHVuc2lnbmVkIGludCBiYW5rLCBjb25zdCB1bnNpZ25lZCBpbnQgYml0KQorZ2VuMTFf Z3RfZW5naW5lX2lkZW50aXR5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICogY29uc3QgaTkxNSwK KwkJCSBjb25zdCB1bnNpZ25lZCBpbnQgYmFuaywgY29uc3QgdW5zaWduZWQgaW50IGJpdCkKIHsK IAl2b2lkIF9faW9tZW0gKiBjb25zdCByZWdzID0gaTkxNS0+cmVnczsKIAl1MzIgdGltZW91dF90 czsKQEAgLTI4NDEsNyArMjgwMCwyNiBAQCBnZW4xMV9ndF9lbmdpbmVfaW50cihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqIGNvbnN0IGk5MTUsCiAJcmF3X3JlZ193cml0ZShyZWdzLCBHRU4xMV9J TlRSX0lERU5USVRZX1JFRyhiYW5rKSwKIAkJICAgICAgR0VOMTFfSU5UUl9EQVRBX1ZBTElEKTsK IAotCXJldHVybiBpZGVudCAmIEdFTjExX0lOVFJfRU5HSU5FX01BU0s7CisJcmV0dXJuIGlkZW50 OworfQorCitzdGF0aWMgdm9pZAorZ2VuMTFfZ3RfaWRlbnRpdHlfaGFuZGxlcihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqIGNvbnN0IGk5MTUsCisJCQkgIGNvbnN0IHUzMiBpZGVudGl0eSkKK3sK Kwljb25zdCB1OCBjbGFzcyA9IEdFTjExX0lOVFJfRU5HSU5FX0NMQVNTKGlkZW50aXR5KTsKKwlj b25zdCB1OCBpbnN0YW5jZSA9IEdFTjExX0lOVFJfRU5HSU5FX0lOU1RBTkNFKGlkZW50aXR5KTsK Kwljb25zdCB1MTYgaWlyID0gR0VOMTFfSU5UUl9FTkdJTkVfTUFTSyhpZGVudGl0eSk7CisKKwlp ZiAodW5saWtlbHkoIWlpcikpCisJCXJldHVybjsKKworCWlmIChjbGFzcyA8PSBNQVhfRU5HSU5F X0NMQVNTICYmIGluc3RhbmNlIDw9IE1BWF9FTkdJTkVfSU5TVEFOQ0UpCisJCXJldHVybiBnZW44 X2NzX2lycV9oYW5kbGVyKGk5MTUtPmVuZ2luZV9jbGFzc1tjbGFzc11baW5zdGFuY2VdLAorCQkJ CQkgICBpaXIpOworCisJaWYgKGNsYXNzID09IEdFTjExX0dUUE0pCisJCXJldHVybiBnZW42X3Jw c19pcnFfaGFuZGxlcihpOTE1LCBpaXIpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtMjg2NiwxMiAr Mjg0NCwxMCBAQCBnZW4xMV9ndF9pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq IGNvbnN0IGk5MTUsCiAJCX0KIAogCQlmb3JfZWFjaF9zZXRfYml0KGJpdCwgJmludHJfZHcsIDMy KSB7Ci0JCQljb25zdCB1MTYgaWlyID0gZ2VuMTFfZ3RfZW5naW5lX2ludHIoaTkxNSwgYmFuaywg Yml0KTsKLQotCQkJaWYgKHVubGlrZWx5KCFpaXIpKQotCQkJCWNvbnRpbnVlOworCQkJY29uc3Qg dTMyIGlkZW50ID0gZ2VuMTFfZ3RfZW5naW5lX2lkZW50aXR5KGk5MTUsCisJCQkJCQkJCSAgIGJh bmssIGJpdCk7CiAKLQkJCWdlbjExX2d0X2VuZ2luZV9pcnFfaGFuZGxlcihpOTE1LCBiYW5rLCBi aXQsIGlpcik7CisJCQlnZW4xMV9ndF9pZGVudGl0eV9oYW5kbGVyKGk5MTUsIGlkZW50KTsKIAkJ fQogCiAJCS8qIENsZWFyIG11c3QgYmUgYWZ0ZXIgc2hhcmVkIGhhcyBiZWVuIHNlcnZlZCBmb3Ig ZW5naW5lICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCBmM2NjNzc2OTAxMjQuLjc0YThm NDU0ZThhMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC02ODI2LDcgKzY4MjYsOSBAQCBl bnVtIHsKICNkZWZpbmUgR0VOMTFfSU5UUl9JREVOVElUWV9SRUcwCV9NTUlPKDB4MTkwMDYwKQog I2RlZmluZSBHRU4xMV9JTlRSX0lERU5USVRZX1JFRzEJX01NSU8oMHgxOTAwNjQpCiAjZGVmaW5l ICBHRU4xMV9JTlRSX0RBVEFfVkFMSUQJCSgxIDw8IDMxKQotI2RlZmluZSAgR0VOMTFfSU5UUl9F TkdJTkVfTUFTSwkJKDB4ZmZmZikKKyNkZWZpbmUgIEdFTjExX0lOVFJfRU5HSU5FX01BU0soeCkJ KCh4KSAmIDB4ZmZmZikKKyNkZWZpbmUgIEdFTjExX0lOVFJfRU5HSU5FX0NMQVNTKHgpCSgoKHgp ICYgR0VOTUFTSygxOCwgMTYpKSA+PiAxNikKKyNkZWZpbmUgIEdFTjExX0lOVFJfRU5HSU5FX0lO U1RBTkNFKHgpCSgoKHgpICYgR0VOTUFTSygyNSwgMjApKSA+PiAyMCkKIAogI2RlZmluZSBHRU4x MV9JTlRSX0lERU5USVRZX1JFRyh4KQlfTU1JTygweDE5MDA2MCArICh4ICogNCkpCiAKLS0gCjIu MTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==