From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: [RFC 7/8] drm/i915: Start the conversion from passing intel_irq instead of dev_priv/i915 Date: Thu, 18 Apr 2019 13:53:46 -0700 Message-ID: <20190418205347.6402-8-rodrigo.vivi@intel.com> References: <20190418205347.6402-1-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 693276E1BF for ; Thu, 18 Apr 2019 20:53:37 +0000 (UTC) In-Reply-To: <20190418205347.6402-1-rodrigo.vivi@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 Tm93IHRoYXQgd2UgYXJlIGZyZWUgZnJvbSBwYXNzaW5nIHVuY29yZSBhcm91bmQgbGV0J3MgZnJl ZSBvdXJzZWx2ZXMKZnJvbSBwYXNzaW5nIHRoZSB3aG9sZSBpOTE1IHJlZmVyZW5jZSBhbmQgb25s eSBwYXNzaW5nIHRoZSBzdHJ1Y3QKd2l0aCBhbGwgaW5mb3JtYXRpb24gdGhhdCB3ZSBuZWVkIGZv ciBoYW5kbGluZyB0aGUgaW50ZXJydXB0cy4KClNpZ25lZC1vZmYtYnk6IFJvZHJpZ28gVml2aSA8 cm9kcmlnby52aXZpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2ly cS5jIHwgNTcgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMjkgaW5zZXJ0aW9ucygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMKaW5kZXggMjdjYWUxZTdmMmNjLi5mMTQyZmUyM2JmMTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYwpAQCAtMjkzLDE3ICsyOTMsMTcgQEAgdm9pZCBpOTE1X2hvdHBsdWdfaW50ZXJydXB0X3Vw ZGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB9CiAKIHN0YXRpYyB1MzIK LWdlbjExX2d0X2VuZ2luZV9pZGVudGl0eShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqIGNvbnN0 IGk5MTUsCitnZW4xMV9ndF9lbmdpbmVfaWRlbnRpdHkoc3RydWN0IGludGVsX2lycSAqIGNvbnN0 IGlycSwKIAkJCSBjb25zdCB1bnNpZ25lZCBpbnQgYmFuaywgY29uc3QgdW5zaWduZWQgaW50IGJp dCk7CiAKLXN0YXRpYyBib29sIGdlbjExX3Jlc2V0X29uZV9paXIoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKiBjb25zdCBpOTE1LAorc3RhdGljIGJvb2wgZ2VuMTFfcmVzZXRfb25lX2lpcihzdHJ1 Y3QgaW50ZWxfaXJxICogY29uc3QgaXJxLAogCQkJCWNvbnN0IHVuc2lnbmVkIGludCBiYW5rLAog CQkJCWNvbnN0IHVuc2lnbmVkIGludCBiaXQpCiB7Ci0Jdm9pZCBfX2lvbWVtICogY29uc3QgcmVn cyA9IGk5MTUtPnVuY29yZS5yZWdzOworCXZvaWQgX19pb21lbSAqIGNvbnN0IHJlZ3MgPSBpcnEt PnVuY29yZS0+cmVnczsKIAl1MzIgZHc7CiAKLQlsb2NrZGVwX2Fzc2VydF9oZWxkKCZpOTE1LT5p cnEubG9jayk7CisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmaXJxLT5sb2NrKTsKIAogCWR3ID0gcmF3 X3JlZ19yZWFkKHJlZ3MsIEdFTjExX0dUX0lOVFJfRFcoYmFuaykpOwogCWlmIChkdyAmIEJJVChi aXQpKSB7CkBAIC0zMTEsNyArMzExLDcgQEAgc3RhdGljIGJvb2wgZ2VuMTFfcmVzZXRfb25lX2lp cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqIGNvbnN0IGk5MTUsCiAJCSAqIEFjY29yZGluZyB0 byB0aGUgQlNwZWMsIERXX0lJUiBiaXRzIGNhbm5vdCBiZSBjbGVhcmVkIHdpdGhvdXQKIAkJICog Zmlyc3Qgc2VydmljaW5nIHRoZSBTZWxlY3RvciAmIFNoYXJlZCBJSVIgcmVnaXN0ZXJzLgogCQkg Ki8KLQkJZ2VuMTFfZ3RfZW5naW5lX2lkZW50aXR5KGk5MTUsIGJhbmssIGJpdCk7CisJCWdlbjEx X2d0X2VuZ2luZV9pZGVudGl0eShpcnEsIGJhbmssIGJpdCk7CiAKIAkJLyoKIAkJICogV2UgbG9j a2VkIEdUIElOVCBEVyBieSByZWFkaW5nIGl0LiBJZiB3ZSB3YW50IHRvICh0cnkKQEAgLTUxNiw3 ICs1MTYsNyBAQCB2b2lkIGdlbjExX3Jlc2V0X3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+aXJxLmxv Y2spOwogCi0Jd2hpbGUgKGdlbjExX3Jlc2V0X29uZV9paXIoZGV2X3ByaXYsIDAsIEdFTjExX0dU UE0pKQorCXdoaWxlIChnZW4xMV9yZXNldF9vbmVfaWlyKCZkZXZfcHJpdi0+aXJxLCAwLCBHRU4x MV9HVFBNKSkKIAkJOwogCiAJZGV2X3ByaXYtPmlycS5wbV9paXIgPSAwOwpAQCAtNTQzLDcgKzU0 Myw3IEBAIHZvaWQgZ2VuNl9lbmFibGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCVdBUk5fT05fT05DRShpcnEtPnBtX2lpcik7CiAKIAlpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA+PSAxMSkKLQkJV0FSTl9PTl9PTkNFKGdlbjExX3Jlc2V0X29uZV9p aXIoZGV2X3ByaXYsIDAsIEdFTjExX0dUUE0pKTsKKwkJV0FSTl9PTl9PTkNFKGdlbjExX3Jlc2V0 X29uZV9paXIoJmRldl9wcml2LT5pcnEsIDAsIEdFTjExX0dUUE0pKTsKIAllbHNlCiAJCVdBUk5f T05fT05DRShJOTE1X1JFQUQoZ2VuNl9wbV9paXIoZGV2X3ByaXYpKSAmIGRldl9wcml2LT5wbV9y cHNfZXZlbnRzKTsKIApAQCAtMTg0MSwxMCArMTg0MSwxMCBAQCBzdGF0aWMgdm9pZCBpOXh4X3Bp cGVfY3JjX2lycV9oYW5kbGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIC8q IFRoZSBSUFMgZXZlbnRzIG5lZWQgZm9yY2V3YWtlLCBzbyB3ZSBhZGQgdGhlbSB0byBhIHdvcmsg cXVldWUgYW5kIG1hc2sgdGhlaXIKICAqIElNUiBiaXRzIHVudGlsIHRoZSB3b3JrIGlzIGRvbmUu IE90aGVyIGludGVycnVwdHMgY2FuIGJlIHByb2Nlc3NlZCB3aXRob3V0CiAgKiB0aGUgd29yayBx dWV1ZS4gKi8KLXN0YXRpYyB2b2lkIGdlbjExX3Jwc19pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqaTkxNSwgdTMyIHBtX2lpcikKK3N0YXRpYyB2b2lkIGdlbjExX3Jwc19pcnFf aGFuZGxlcihzdHJ1Y3QgaW50ZWxfaXJxICppcnEsIHUzMiBwbV9paXIpCiB7CisJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmk5MTUgPSB1bmNvcmVfdG9faTkxNShpcnEtPnVuY29yZSk7CiAJc3Ry dWN0IGludGVsX3JwcyAqcnBzID0gJmk5MTUtPmd0X3BtLnJwczsKLQlzdHJ1Y3QgaW50ZWxfaXJx ICppcnEgPSAmaTkxNS0+aXJxOwogCWNvbnN0IHUzMiBldmVudHMgPSBpOTE1LT5wbV9ycHNfZXZl bnRzICYgcG1faWlyOwogCiAJbG9ja2RlcF9hc3NlcnRfaGVsZCgmaTkxNS0+aXJxLmxvY2spOwpA QCAtMjk3NywxNCArMjk3NywxNCBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgZ2VuOF9pcnFfaGFuZGxl cihpbnQgaXJxLCB2b2lkICphcmcpCiB9CiAKIHN0YXRpYyB1MzIKLWdlbjExX2d0X2VuZ2luZV9p ZGVudGl0eShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqIGNvbnN0IGk5MTUsCitnZW4xMV9ndF9l bmdpbmVfaWRlbnRpdHkoc3RydWN0IGludGVsX2lycSAqIGNvbnN0IGlycSwKIAkJCSBjb25zdCB1 bnNpZ25lZCBpbnQgYmFuaywgY29uc3QgdW5zaWduZWQgaW50IGJpdCkKIHsKLQl2b2lkIF9faW9t ZW0gKiBjb25zdCByZWdzID0gaTkxNS0+dW5jb3JlLnJlZ3M7CisJdm9pZCBfX2lvbWVtICogY29u c3QgcmVncyA9IGlycS0+dW5jb3JlLT5yZWdzOwogCXUzMiB0aW1lb3V0X3RzOwogCXUzMiBpZGVu dDsKIAotCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmk5MTUtPmlycS5sb2NrKTsKKwlsb2NrZGVwX2Fz c2VydF9oZWxkKCZpcnEtPmxvY2spOwogCiAJcmF3X3JlZ193cml0ZShyZWdzLCBHRU4xMV9JSVJf UkVHX1NFTEVDVE9SKGJhbmspLCBCSVQoYml0KSk7CiAKQEAgLTMwMTEsMjAgKzMwMTEsMjEgQEAg Z2VuMTFfZ3RfZW5naW5lX2lkZW50aXR5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICogY29uc3Qg aTkxNSwKIH0KIAogc3RhdGljIHZvaWQKLWdlbjExX290aGVyX2lycV9oYW5kbGVyKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICogY29uc3QgaTkxNSwKK2dlbjExX290aGVyX2lycV9oYW5kbGVyKHN0 cnVjdCBpbnRlbF9pcnEgKiBjb25zdCBpcnEsCiAJCQljb25zdCB1OCBpbnN0YW5jZSwgY29uc3Qg dTE2IGlpcikKIHsKIAlpZiAoaW5zdGFuY2UgPT0gT1RIRVJfR1RQTV9JTlNUQU5DRSkKLQkJcmV0 dXJuIGdlbjExX3Jwc19pcnFfaGFuZGxlcihpOTE1LCBpaXIpOworCQlyZXR1cm4gZ2VuMTFfcnBz X2lycV9oYW5kbGVyKGlycSwgaWlyKTsKIAogCVdBUk5fT05DRSgxLCAidW5oYW5kbGVkIG90aGVy IGludGVycnVwdCBpbnN0YW5jZT0weCV4LCBpaXI9MHgleFxuIiwKIAkJICBpbnN0YW5jZSwgaWly KTsKIH0KIAogc3RhdGljIHZvaWQKLWdlbjExX2VuZ2luZV9pcnFfaGFuZGxlcihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqIGNvbnN0IGk5MTUsCitnZW4xMV9lbmdpbmVfaXJxX2hhbmRsZXIoc3Ry dWN0IGludGVsX2lycSAqIGNvbnN0IGlycSwKIAkJCSBjb25zdCB1OCBjbGFzcywgY29uc3QgdTgg aW5zdGFuY2UsIGNvbnN0IHUxNiBpaXIpCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUgPSB1bmNvcmVfdG9faTkxNShpcnEtPnVuY29yZSk7CiAJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lOwogCiAJaWYgKGluc3RhbmNlIDw9IE1BWF9FTkdJTkVfSU5TVEFOQ0UpCkBAIC0z MDQwLDcgKzMwNDEsNyBAQCBnZW4xMV9lbmdpbmVfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKiBjb25zdCBpOTE1LAogfQogCiBzdGF0aWMgdm9pZAotZ2VuMTFfZ3RfaWRlbnRp dHlfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqIGNvbnN0IGk5MTUsCitnZW4xMV9n dF9pZGVudGl0eV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9pcnEgKiBjb25zdCBpcnEsCiAJCQkgIGNv bnN0IHUzMiBpZGVudGl0eSkKIHsKIAljb25zdCB1OCBjbGFzcyA9IEdFTjExX0lOVFJfRU5HSU5F X0NMQVNTKGlkZW50aXR5KTsKQEAgLTMwNTEsMzEgKzMwNTIsMzEgQEAgZ2VuMTFfZ3RfaWRlbnRp dHlfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqIGNvbnN0IGk5MTUsCiAJCXJldHVy bjsKIAogCWlmIChjbGFzcyA8PSBDT1BZX0VOR0lORV9DTEFTUykKLQkJcmV0dXJuIGdlbjExX2Vu Z2luZV9pcnFfaGFuZGxlcihpOTE1LCBjbGFzcywgaW5zdGFuY2UsIGludHIpOworCQlyZXR1cm4g Z2VuMTFfZW5naW5lX2lycV9oYW5kbGVyKGlycSwgY2xhc3MsIGluc3RhbmNlLCBpbnRyKTsKIAog CWlmIChjbGFzcyA9PSBPVEhFUl9DTEFTUykKLQkJcmV0dXJuIGdlbjExX290aGVyX2lycV9oYW5k bGVyKGk5MTUsIGluc3RhbmNlLCBpbnRyKTsKKwkJcmV0dXJuIGdlbjExX290aGVyX2lycV9oYW5k bGVyKGlycSwgaW5zdGFuY2UsIGludHIpOwogCiAJV0FSTl9PTkNFKDEsICJ1bmtub3duIGludGVy cnVwdCBjbGFzcz0weCV4LCBpbnN0YW5jZT0weCV4LCBpbnRyPTB4JXhcbiIsCiAJCSAgY2xhc3Ms IGluc3RhbmNlLCBpbnRyKTsKIH0KIAogc3RhdGljIHZvaWQKLWdlbjExX2d0X2JhbmtfaGFuZGxl cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqIGNvbnN0IGk5MTUsCitnZW4xMV9ndF9iYW5rX2hh bmRsZXIoc3RydWN0IGludGVsX2lycSAqIGNvbnN0IGlycSwKIAkJICAgICAgY29uc3QgdW5zaWdu ZWQgaW50IGJhbmspCiB7Ci0Jdm9pZCBfX2lvbWVtICogY29uc3QgcmVncyA9IGk5MTUtPnVuY29y ZS5yZWdzOworCXZvaWQgX19pb21lbSAqIGNvbnN0IHJlZ3MgPSBpcnEtPnVuY29yZS0+cmVnczsK IAl1bnNpZ25lZCBsb25nIGludHJfZHc7CiAJdW5zaWduZWQgaW50IGJpdDsKIAotCWxvY2tkZXBf YXNzZXJ0X2hlbGQoJmk5MTUtPmlycS5sb2NrKTsKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZpcnEt PmxvY2spOwogCiAJaW50cl9kdyA9IHJhd19yZWdfcmVhZChyZWdzLCBHRU4xMV9HVF9JTlRSX0RX KGJhbmspKTsKIAogCWZvcl9lYWNoX3NldF9iaXQoYml0LCAmaW50cl9kdywgMzIpIHsKLQkJY29u c3QgdTMyIGlkZW50ID0gZ2VuMTFfZ3RfZW5naW5lX2lkZW50aXR5KGk5MTUsIGJhbmssIGJpdCk7 CisJCWNvbnN0IHUzMiBpZGVudCA9IGdlbjExX2d0X2VuZ2luZV9pZGVudGl0eShpcnEsIGJhbmss IGJpdCk7CiAKLQkJZ2VuMTFfZ3RfaWRlbnRpdHlfaGFuZGxlcihpOTE1LCBpZGVudCk7CisJCWdl bjExX2d0X2lkZW50aXR5X2hhbmRsZXIoaXJxLCBpZGVudCk7CiAJfQogCiAJLyogQ2xlYXIgbXVz dCBiZSBhZnRlciBzaGFyZWQgaGFzIGJlZW4gc2VydmVkIGZvciBlbmdpbmUgKi8KQEAgLTMwODMs MTkgKzMwODQsMTkgQEAgZ2VuMTFfZ3RfYmFua19oYW5kbGVyKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICogY29uc3QgaTkxNSwKIH0KIAogc3RhdGljIHZvaWQKLWdlbjExX2d0X2lycV9oYW5kbGVy KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICogY29uc3QgaTkxNSwKK2dlbjExX2d0X2lycV9oYW5k bGVyKHN0cnVjdCBpbnRlbF9pcnEgKiBjb25zdCBpcnEsCiAJCSAgICAgY29uc3QgdTMyIG1hc3Rl cl9jdGwpCiB7CiAJdW5zaWduZWQgaW50IGJhbms7CiAKLQlzcGluX2xvY2soJmk5MTUtPmlycS5s b2NrKTsKKwlzcGluX2xvY2soJmlycS0+bG9jayk7CiAKIAlmb3IgKGJhbmsgPSAwOyBiYW5rIDwg MjsgYmFuaysrKSB7CiAJCWlmIChtYXN0ZXJfY3RsICYgR0VOMTFfR1RfRFdfSVJRKGJhbmspKQot CQkJZ2VuMTFfZ3RfYmFua19oYW5kbGVyKGk5MTUsIGJhbmspOworCQkJZ2VuMTFfZ3RfYmFua19o YW5kbGVyKGlycSwgYmFuayk7CiAJfQogCi0Jc3Bpbl91bmxvY2soJmk5MTUtPmlycS5sb2NrKTsK KwlzcGluX3VubG9jaygmaXJxLT5sb2NrKTsKIH0KIAogc3RhdGljIHUzMgpAQCAtMzE1Niw3ICsz MTU3LDcgQEAgc3RhdGljIGlycXJldHVybl90IGdlbjExX2lycV9oYW5kbGVyKGludCBpcnEsIHZv aWQgKmFyZykKIAl9CiAKIAkvKiBGaW5kLCBjbGVhciwgdGhlbiBwcm9jZXNzIGVhY2ggc291cmNl IG9mIGludGVycnVwdC4gKi8KLQlnZW4xMV9ndF9pcnFfaGFuZGxlcihpOTE1LCBtYXN0ZXJfY3Rs KTsKKwlnZW4xMV9ndF9pcnFfaGFuZGxlcigmaTkxNS0+aXJxLCBtYXN0ZXJfY3RsKTsKIAogCS8q IElSUXMgYXJlIHN5bmNlZCBkdXJpbmcgcnVudGltZV9zdXNwZW5kLCB3ZSBkb24ndCByZXF1aXJl IGEgd2FrZXJlZiAqLwogCWlmIChtYXN0ZXJfY3RsICYgR0VOMTFfRElTUExBWV9JUlEpIHsKLS0g CjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4