From: Imre Deak Subject: [PATCH 1/8] drm/i915: unify gen6/gen8 pm irq helpers Date: Wed, 5 Nov 2014 20:48:31 +0200 Message-ID: <1415213311-16867-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 96DC76E171 for ; Wed, 5 Nov 2014 10:48:42 -0800 (PST) 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: shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org VGhlIGhlbHBlcnMgdG8gZW5hYmxlL2Rpc2FibGUgUE0gSVJRcyBmb3IgR0VONiBhbmQgR0VOOCBh cmUgdGhlIHNhbWUKZXhjZXB0IGZvciB0aGUgUE0gaW50ZXJydXB0IG1hc2sgcmVnaXN0ZXIsIHNv IGFic3RyYWN0IGF3YXkgdGhpcwpyZWdpc3RlciBpbiB0aGUgR0VONiB2ZXJzaW9ucyBhbmQgdXNl IHRoZXNlIGV2ZXJ5d2hlcmUuCgpObyBmdW5jdGlvbmFsIGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6 IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5jICB8IDU5ICsrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgIDIgLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0 aW9ucygrKSwgNTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggMzE4 YTZhMC4uYTM1N2UwMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0yMDAsNiArMjAwLDEx IEBAIHZvaWQgZ2VuNV9kaXNhYmxlX2d0X2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIHVpbnQzMl90IG1hc2spCiAJaWxrX3VwZGF0ZV9ndF9pcnEoZGV2X3ByaXYsIG1hc2ss IDApOwogfQogCitzdGF0aWMgdTMyIGdlbjZfcG1faW1yKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKK3sKKwlyZXR1cm4gSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA4ID8g R0VOOF9HVF9JTVIoMikgOiBHRU42X1BNSU1SOworfQorCiAvKioKICAgKiBzbmJfdXBkYXRlX3Bt X2lycSAtIHVwZGF0ZSBHRU42X1BNSU1SCiAgICogQGRldl9wcml2OiBkcml2ZXIgcHJpdmF0ZQpA QCAtMjIzLDggKzIyOCw4IEBAIHN0YXRpYyB2b2lkIHNuYl91cGRhdGVfcG1faXJxKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCWlmIChuZXdfdmFsICE9IGRldl9wcml2LT5w bV9pcnFfbWFzaykgewogCQlkZXZfcHJpdi0+cG1faXJxX21hc2sgPSBuZXdfdmFsOwotCQlJOTE1 X1dSSVRFKEdFTjZfUE1JTVIsIGRldl9wcml2LT5wbV9pcnFfbWFzayk7Ci0JCVBPU1RJTkdfUkVB RChHRU42X1BNSU1SKTsKKwkJSTkxNV9XUklURShnZW42X3BtX2ltcihkZXZfcHJpdiksIGRldl9w cml2LT5wbV9pcnFfbWFzayk7CisJCVBPU1RJTkdfUkVBRChnZW42X3BtX2ltcihkZXZfcHJpdikp OwogCX0KIH0KIApAQCAtMjM5LDQ2ICsyNDQsNiBAQCB2b2lkIGdlbjZfZGlzYWJsZV9wbV9pcnEo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1aW50MzJfdCBtYXNrKQogfQogCiAv KioKLSAgKiBiZHdfdXBkYXRlX3BtX2lycSAtIHVwZGF0ZSBHVCBpbnRlcnJ1cHQgMgotICAqIEBk ZXZfcHJpdjogZHJpdmVyIHByaXZhdGUKLSAgKiBAaW50ZXJydXB0X21hc2s6IG1hc2sgb2YgaW50 ZXJydXB0IGJpdHMgdG8gdXBkYXRlCi0gICogQGVuYWJsZWRfaXJxX21hc2s6IG1hc2sgb2YgaW50 ZXJydXB0IGJpdHMgdG8gZW5hYmxlCi0gICoKLSAgKiBDb3BpZWQgZnJvbSB0aGUgc25iIGZ1bmN0 aW9uLCB1cGRhdGVkIHdpdGggcmVsZXZhbnQgcmVnaXN0ZXIgb2Zmc2V0cwotICAqLwotc3RhdGlj IHZvaWQgYmR3X3VwZGF0ZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAotCQkJICAgICAgdWludDMyX3QgaW50ZXJydXB0X21hc2ssCi0JCQkgICAgICB1aW50MzJfdCBl bmFibGVkX2lycV9tYXNrKQotewotCXVpbnQzMl90IG5ld192YWw7Ci0KLQlhc3NlcnRfc3Bpbl9s b2NrZWQoJmRldl9wcml2LT5pcnFfbG9jayk7Ci0KLQlpZiAoV0FSTl9PTighaW50ZWxfaXJxc19l bmFibGVkKGRldl9wcml2KSkpCi0JCXJldHVybjsKLQotCW5ld192YWwgPSBkZXZfcHJpdi0+cG1f aXJxX21hc2s7Ci0JbmV3X3ZhbCAmPSB+aW50ZXJydXB0X21hc2s7Ci0JbmV3X3ZhbCB8PSAofmVu YWJsZWRfaXJxX21hc2sgJiBpbnRlcnJ1cHRfbWFzayk7Ci0KLQlpZiAobmV3X3ZhbCAhPSBkZXZf cHJpdi0+cG1faXJxX21hc2spIHsKLQkJZGV2X3ByaXYtPnBtX2lycV9tYXNrID0gbmV3X3ZhbDsK LQkJSTkxNV9XUklURShHRU44X0dUX0lNUigyKSwgZGV2X3ByaXYtPnBtX2lycV9tYXNrKTsKLQkJ UE9TVElOR19SRUFEKEdFTjhfR1RfSU1SKDIpKTsKLQl9Ci19Ci0KLXZvaWQgZ2VuOF9lbmFibGVf cG1faXJxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdWludDMyX3QgbWFzaykK LXsKLQliZHdfdXBkYXRlX3BtX2lycShkZXZfcHJpdiwgbWFzaywgbWFzayk7Ci19Ci0KLXZvaWQg Z2VuOF9kaXNhYmxlX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHVp bnQzMl90IG1hc2spCi17Ci0JYmR3X3VwZGF0ZV9wbV9pcnEoZGV2X3ByaXYsIG1hc2ssIDApOwot fQotCi0vKioKICAqIGlieF9kaXNwbGF5X2ludGVycnVwdF91cGRhdGUgLSB1cGRhdGUgU0RFSU1S CiAgKiBAZGV2X3ByaXY6IGRyaXZlciBwcml2YXRlCiAgKiBAaW50ZXJydXB0X21hc2s6IG1hc2sg b2YgaW50ZXJydXB0IGJpdHMgdG8gdXBkYXRlCkBAIC0xMTIxLDEyICsxMDg2LDggQEAgc3RhdGlj IHZvaWQgZ2VuNl9wbV9ycHNfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJc3Bpbl9s b2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAlwbV9paXIgPSBkZXZfcHJpdi0+cnBzLnBt X2lpcjsKIAlkZXZfcHJpdi0+cnBzLnBtX2lpciA9IDA7Ci0JaWYgKElOVEVMX0lORk8oZGV2X3By aXYtPmRldiktPmdlbiA+PSA4KQotCQlnZW44X2VuYWJsZV9wbV9pcnEoZGV2X3ByaXYsIGRldl9w cml2LT5wbV9ycHNfZXZlbnRzKTsKLQllbHNlIHsKLQkJLyogTWFrZSBzdXJlIG5vdCB0byBjb3Jy dXB0IFBNSU1SIHN0YXRlIHVzZWQgYnkgcmluZ2J1ZmZlciAqLwotCQlnZW42X2VuYWJsZV9wbV9p cnEoZGV2X3ByaXYsIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsKLQl9CisJLyogTWFrZSBzdXJl IG5vdCB0byBjb3JydXB0IFBNSU1SIHN0YXRlIHVzZWQgYnkgcmluZ2J1ZmZlciBvbiBHRU42ICov CisJZ2VuNl9lbmFibGVfcG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7 CiAJc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCiAJLyogTWFrZSBzdXJl IHdlIGRpZG4ndCBxdWV1ZSBhbnl0aGluZyB3ZSdyZSBub3QgZ29pbmcgdG8gcHJvY2Vzcy4gKi8K QEAgLTEzMzUsNyArMTI5Niw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfcnBzX2lycV9oYW5kbGVyKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIHBtX2lpcikKIAogCXNwaW5fbG9j aygmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAlkZXZfcHJpdi0+cnBzLnBtX2lpciB8PSBwbV9paXIg JiBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50czsKLQlnZW44X2Rpc2FibGVfcG1faXJxKGRldl9wcml2 LCBwbV9paXIgJiBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7CisJZ2VuNl9kaXNhYmxlX3BtX2ly cShkZXZfcHJpdiwgcG1faWlyICYgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMpOwogCXNwaW5fdW5s b2NrKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCiAJcXVldWVfd29yayhkZXZfcHJpdi0+d3EsICZk ZXZfcHJpdi0+cnBzLndvcmspOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBjYjBlOWRi Li5hOTgwZmIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNzkxLDggKzc5MSw2IEBA IHZvaWQgZ2VuNV9lbmFibGVfZ3RfaXJxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwgdWludDMyX3QgbWFzayk7CiB2b2lkIGdlbjVfZGlzYWJsZV9ndF9pcnEoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LCB1aW50MzJfdCBtYXNrKTsKIHZvaWQgZ2VuNl9lbmFibGVf cG1faXJxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdWludDMyX3QgbWFzayk7 CiB2b2lkIGdlbjZfZGlzYWJsZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCB1aW50MzJfdCBtYXNrKTsKLXZvaWQgZ2VuOF9lbmFibGVfcG1faXJxKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdWludDMyX3QgbWFzayk7Ci12b2lkIGdlbjhfZGlzYWJs ZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1aW50MzJfdCBtYXNr KTsKIHZvaWQgaW50ZWxfcnVudGltZV9wbV9kaXNhYmxlX2ludGVycnVwdHMoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfcnVudGltZV9wbV9lbmFibGVfaW50 ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogc3RhdGljIGlubGlu ZSBib29sIGludGVsX2lycXNfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAzMDBkN2U1Li42N2Y1NWVmIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMKQEAgLTQ2NjksNyArNDY2OSw3IEBAIHN0YXRpYyB2b2lkIGdlbjhf ZW5hYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlzcGluX2xv Y2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCVdBUk5fT04oZGV2X3ByaXYtPnJwcy5wbV9p aXIpOwotCWdlbjhfZW5hYmxlX3BtX2lycShkZXZfcHJpdiwgZGV2X3ByaXYtPnBtX3Jwc19ldmVu dHMpOworCWdlbjZfZW5hYmxlX3BtX2lycShkZXZfcHJpdiwgZGV2X3ByaXYtPnBtX3Jwc19ldmVu dHMpOwogCUk5MTVfV1JJVEUoR0VOOF9HVF9JSVIoMiksIGRldl9wcml2LT5wbV9ycHNfZXZlbnRz KTsKIAlzcGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiB9Ci0tIAoxLjguNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK