From: Nick Hoath Subject: [RFC 1/5] drm/i915: Clean up gen8 irq handler Date: Thu, 9 Jul 2015 11:57:40 +0100 Message-ID: <1436439464-17122-1-git-send-email-nicholas.hoath@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 ESMTP id A76716E238 for ; Thu, 9 Jul 2015 03:57:52 -0700 (PDT) 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 TW92ZWQgY29tbW9uIGNvZGUgaGFuZGxpbmcgY29tbWFuZCBzdHJlYW1lciBpbnRlcnJ1cHRzIGlu dG8gYSBmdW5jdGlvbi4KUmVuYW1lZCB0bXAgdmFyaWFibGUgdG8gdGhlIG1vcmUgZGVzY3JpcHRp dmUgaWlyLgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIERhbmllbCA8dGhvbWFzLmRhbmllbEBpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IE5pY2sgSG9hdGggPG5pY2hvbGFzLmhvYXRoQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIHwgNjggKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNSBpbnNlcnRp b25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCBhNmZi ZTY0Li4zYWMzMGI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTExNTYsNzAgKzExNTYs NzIgQEAgc3RhdGljIHZvaWQgc25iX2d0X2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJCWl2eWJyaWRnZV9wYXJpdHlfZXJyb3JfaXJxX2hhbmRsZXIoZGV2LCBndF9paXIpOwog fQogCitzdGF0aWMgdm9pZCBnZW44X2NzX2lycV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcsIHUzMiBpaXIpCit7CisJaWYgKGlpciAmIEdUX0NPTlRFWFRfU1dJVENIX0lOVEVS UlVQVCkKKwkJaW50ZWxfbHJjX2lycV9oYW5kbGVyKHJpbmcpOworCWlmIChpaXIgJiBHVF9SRU5E RVJfVVNFUl9JTlRFUlJVUFQpCisJCW5vdGlmeV9yaW5nKHJpbmcpOworfQorCiBzdGF0aWMgaXJx cmV0dXJuX3QgZ2VuOF9ndF9pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCQkJICAgICAgIHUzMiBtYXN0ZXJfY3RsKQogewogCWlycXJldHVybl90IHJldCA9 IElSUV9OT05FOwogCiAJaWYgKG1hc3Rlcl9jdGwgJiAoR0VOOF9HVF9SQ1NfSVJRIHwgR0VOOF9H VF9CQ1NfSVJRKSkgewotCQl1MzIgdG1wID0gSTkxNV9SRUFEX0ZXKEdFTjhfR1RfSUlSKDApKTsK LQkJaWYgKHRtcCkgewotCQkJSTkxNV9XUklURV9GVyhHRU44X0dUX0lJUigwKSwgdG1wKTsKKwkJ dTMyIGlpciA9IEk5MTVfUkVBRF9GVyhHRU44X0dUX0lJUigwKSk7CisKKwkJaWYgKGlpcikgewor CQkJSTkxNV9XUklURV9GVyhHRU44X0dUX0lJUigwKSwgaWlyKTsKIAkJCXJldCA9IElSUV9IQU5E TEVEOwogCi0JCQlpZiAodG1wICYgKEdUX0NPTlRFWFRfU1dJVENIX0lOVEVSUlVQVCA8PCBHRU44 X1JDU19JUlFfU0hJRlQpKQotCQkJCWludGVsX2xyY19pcnFfaGFuZGxlcigmZGV2X3ByaXYtPnJp bmdbUkNTXSk7Ci0JCQlpZiAodG1wICYgKEdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBHRU44 X1JDU19JUlFfU0hJRlQpKQotCQkJCW5vdGlmeV9yaW5nKCZkZXZfcHJpdi0+cmluZ1tSQ1NdKTsK KwkJCWdlbjhfY3NfaXJxX2hhbmRsZXIoJmRldl9wcml2LT5yaW5nW1JDU10sCisJCQkJaWlyID4+ IEdFTjhfUkNTX0lSUV9TSElGVCk7CiAKLQkJCWlmICh0bXAgJiAoR1RfQ09OVEVYVF9TV0lUQ0hf SU5URVJSVVBUIDw8IEdFTjhfQkNTX0lSUV9TSElGVCkpCi0JCQkJaW50ZWxfbHJjX2lycV9oYW5k bGVyKCZkZXZfcHJpdi0+cmluZ1tCQ1NdKTsKLQkJCWlmICh0bXAgJiAoR1RfUkVOREVSX1VTRVJf SU5URVJSVVBUIDw8IEdFTjhfQkNTX0lSUV9TSElGVCkpCi0JCQkJbm90aWZ5X3JpbmcoJmRldl9w cml2LT5yaW5nW0JDU10pOworCQkJZ2VuOF9jc19pcnFfaGFuZGxlcigmZGV2X3ByaXYtPnJpbmdb QkNTXSwKKwkJCQlpaXIgPj4gR0VOOF9CQ1NfSVJRX1NISUZUKTsKIAkJfSBlbHNlCiAJCQlEUk1f RVJST1IoIlRoZSBtYXN0ZXIgY29udHJvbCBpbnRlcnJ1cHQgbGllZCAoR1QwKSFcbiIpOwogCX0K IAogCWlmIChtYXN0ZXJfY3RsICYgKEdFTjhfR1RfVkNTMV9JUlEgfCBHRU44X0dUX1ZDUzJfSVJR KSkgewotCQl1MzIgdG1wID0gSTkxNV9SRUFEX0ZXKEdFTjhfR1RfSUlSKDEpKTsKLQkJaWYgKHRt cCkgewotCQkJSTkxNV9XUklURV9GVyhHRU44X0dUX0lJUigxKSwgdG1wKTsKKwkJdTMyIGlpciA9 IEk5MTVfUkVBRF9GVyhHRU44X0dUX0lJUigxKSk7CisKKwkJaWYgKGlpcikgeworCQkJSTkxNV9X UklURV9GVyhHRU44X0dUX0lJUigxKSwgaWlyKTsKIAkJCXJldCA9IElSUV9IQU5ETEVEOwogCi0J CQlpZiAodG1wICYgKEdUX0NPTlRFWFRfU1dJVENIX0lOVEVSUlVQVCA8PCBHRU44X1ZDUzFfSVJR X1NISUZUKSkKLQkJCQlpbnRlbF9scmNfaXJxX2hhbmRsZXIoJmRldl9wcml2LT5yaW5nW1ZDU10p OwotCQkJaWYgKHRtcCAmIChHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9WQ1MxX0lS UV9TSElGVCkpCi0JCQkJbm90aWZ5X3JpbmcoJmRldl9wcml2LT5yaW5nW1ZDU10pOworCQkJZ2Vu OF9jc19pcnFfaGFuZGxlcigmZGV2X3ByaXYtPnJpbmdbVkNTXSwKKwkJCQlpaXIgPj4gR0VOOF9W Q1MxX0lSUV9TSElGVCk7CiAKLQkJCWlmICh0bXAgJiAoR1RfQ09OVEVYVF9TV0lUQ0hfSU5URVJS VVBUIDw8IEdFTjhfVkNTMl9JUlFfU0hJRlQpKQotCQkJCWludGVsX2xyY19pcnFfaGFuZGxlcigm ZGV2X3ByaXYtPnJpbmdbVkNTMl0pOwotCQkJaWYgKHRtcCAmIChHVF9SRU5ERVJfVVNFUl9JTlRF UlJVUFQgPDwgR0VOOF9WQ1MyX0lSUV9TSElGVCkpCi0JCQkJbm90aWZ5X3JpbmcoJmRldl9wcml2 LT5yaW5nW1ZDUzJdKTsKKwkJCWdlbjhfY3NfaXJxX2hhbmRsZXIoJmRldl9wcml2LT5yaW5nW1ZD UzJdLAorCQkJCWlpciA+PiBHRU44X1ZDUzJfSVJRX1NISUZUKTsKIAkJfSBlbHNlCiAJCQlEUk1f RVJST1IoIlRoZSBtYXN0ZXIgY29udHJvbCBpbnRlcnJ1cHQgbGllZCAoR1QxKSFcbiIpOwogCX0K IAogCWlmIChtYXN0ZXJfY3RsICYgR0VOOF9HVF9WRUNTX0lSUSkgewotCQl1MzIgdG1wID0gSTkx NV9SRUFEX0ZXKEdFTjhfR1RfSUlSKDMpKTsKLQkJaWYgKHRtcCkgewotCQkJSTkxNV9XUklURV9G VyhHRU44X0dUX0lJUigzKSwgdG1wKTsKKwkJdTMyIGlpciA9IEk5MTVfUkVBRF9GVyhHRU44X0dU X0lJUigzKSk7CisKKwkJaWYgKGlpcikgeworCQkJSTkxNV9XUklURV9GVyhHRU44X0dUX0lJUigz KSwgaWlyKTsKIAkJCXJldCA9IElSUV9IQU5ETEVEOwogCi0JCQlpZiAodG1wICYgKEdUX0NPTlRF WFRfU1dJVENIX0lOVEVSUlVQVCA8PCBHRU44X1ZFQ1NfSVJRX1NISUZUKSkKLQkJCQlpbnRlbF9s cmNfaXJxX2hhbmRsZXIoJmRldl9wcml2LT5yaW5nW1ZFQ1NdKTsKLQkJCWlmICh0bXAgJiAoR1Rf UkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfVkVDU19JUlFfU0hJRlQpKQotCQkJCW5vdGlm eV9yaW5nKCZkZXZfcHJpdi0+cmluZ1tWRUNTXSk7CisJCQlnZW44X2NzX2lycV9oYW5kbGVyKCZk ZXZfcHJpdi0+cmluZ1tWRUNTXSwKKwkJCQlpaXIgPj4gR0VOOF9WRUNTX0lSUV9TSElGVCk7CiAJ CX0gZWxzZQogCQkJRFJNX0VSUk9SKCJUaGUgbWFzdGVyIGNvbnRyb2wgaW50ZXJydXB0IGxpZWQg KEdUMykhXG4iKTsKIAl9CiAKIAlpZiAobWFzdGVyX2N0bCAmIEdFTjhfR1RfUE1fSVJRKSB7Ci0J CXUzMiB0bXAgPSBJOTE1X1JFQURfRlcoR0VOOF9HVF9JSVIoMikpOwotCQlpZiAodG1wICYgZGV2 X3ByaXYtPnBtX3Jwc19ldmVudHMpIHsKKwkJdTMyIGlpciA9IEk5MTVfUkVBRF9GVyhHRU44X0dU X0lJUigyKSk7CisKKwkJaWYgKGlpciAmIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKSB7CiAJCQlJ OTE1X1dSSVRFX0ZXKEdFTjhfR1RfSUlSKDIpLAotCQkJCSAgICAgIHRtcCAmIGRldl9wcml2LT5w bV9ycHNfZXZlbnRzKTsKKwkJCQkgICAgICBpaXIgJiBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7 CiAJCQlyZXQgPSBJUlFfSEFORExFRDsKLQkJCWdlbjZfcnBzX2lycV9oYW5kbGVyKGRldl9wcml2 LCB0bXApOworCQkJZ2VuNl9ycHNfaXJxX2hhbmRsZXIoZGV2X3ByaXYsIGlpcik7CiAJCX0gZWxz ZQogCQkJRFJNX0VSUk9SKCJUaGUgbWFzdGVyIGNvbnRyb2wgaW50ZXJydXB0IGxpZWQgKFBNKSFc biIpOwogCX0KLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=