From: Imre Deak Subject: [PATCH 3/8] drm/i915: unify gen6/gen8 rps irq enable/disable Date: Wed, 5 Nov 2014 20:48:42 +0200 Message-ID: <1415213322-16949-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B5B6F6E9E6 for ; Wed, 5 Nov 2014 10:48:45 -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 VGhlIEdFTjYgYW5kIEdFTjggdmVyc2lvbnMgZGlmZmVyIG9ubHkgaW4gdGhlIFBNIElJUiBhbmQg SUVSIHJlZ2lzdGVyCmFkZHJlc3NlcyBhbmQgdGhhdCBvbiBHRU44IHdlIG5lZWQgdG8ga2VlcCB0 aGUKR0VOOF9QTUlOVFJfUkVESVJFQ1RfVE9fTk9OX0RJU1AgUE0gaW50ZXJydXB0IHVubWFza2Vk LiBBYnN0cmFjdCBhd2F5CnRoZXNlIDMgdGhpbmdzIGluIHRoZSBHRU42IHZlcnNpb25zIG9mIHRo ZSBoZWxwZXJzIGFuZCB1c2UgdGhlbQpldmVyeXdoZXJlLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2Uu CgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDUzICsrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMzgg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggNjdmNTVlZi4uMGFiOWY1 ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC00NTE5LDI0ICs0NTE5LDE0IEBAIHZvaWQg dmFsbGV5dmlld19zZXRfcnBzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHU4IHZhbCkKIAl0cmFj ZV9pbnRlbF9ncHVfZnJlcV9jaGFuZ2Uodmx2X2dwdV9mcmVxKGRldl9wcml2LCB2YWwpKTsKIH0K IAotc3RhdGljIHZvaWQgZ2VuOF9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCitzdGF0aWMgdTMyIGdlbjZfcG1faWlyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOworCXJldHVybiBJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDggPyBH RU44X0dUX0lJUigyKSA6IEdFTjZfUE1JSVI7Cit9CiAKLQlJOTE1X1dSSVRFKEdFTjZfUE1JTlRS TVNLLCB+R0VOOF9QTUlOVFJfUkVESVJFQ1RfVE9fTk9OX0RJU1ApOwotCUk5MTVfV1JJVEUoR0VO OF9HVF9JRVIoMiksIEk5MTVfUkVBRChHRU44X0dUX0lFUigyKSkgJgotCQkJCSAgIH5kZXZfcHJp di0+cG1fcnBzX2V2ZW50cyk7Ci0JLyogQ29tcGxldGUgUE0gaW50ZXJydXB0IG1hc2tpbmcgaGVy ZSBkb2Vzbid0IHJhY2Ugd2l0aCB0aGUgcnBzIHdvcmsKLQkgKiBpdGVtIGFnYWluIHVubWFza2lu ZyBQTSBpbnRlcnJ1cHRzIGJlY2F1c2UgdGhhdCBpcyB1c2luZyBhIGRpZmZlcmVudAotCSAqIHJl Z2lzdGVyIChHRU44X0dUX0lNUigyKSkgdG8gbWFzayBQTSBpbnRlcnJ1cHRzLiBUaGUgb25seSBy aXNrIGlzIGluCi0JICogbGVhdmluZyBzdGFsZSBiaXRzIGluIEdFTjhfR1RfSUlSKDIpIGFuZCBH RU44X0dUX0lNUigyKSB3aGljaAotCSAqIGdlbjhfZW5hYmxlX3JwcyB3aWxsIGNsZWFuIHVwLiAq LwotCi0Jc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKLQlkZXZfcHJpdi0+cnBz LnBtX2lpciA9IDA7Ci0Jc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwotCi0J STkxNV9XUklURShHRU44X0dUX0lJUigyKSwgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMpOworc3Rh dGljIHUzMiBnZW42X3BtX2llcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7 CisJcmV0dXJuIElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOCA/IEdFTjhfR1RfSUVSKDIp IDogR0VONl9QTUlFUjsKIH0KIAogc3RhdGljIHZvaWQgZ2VuOV9kaXNhYmxlX3JwcyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQpAQCAtNDU1MCw4ICs0NTQwLDkgQEAgc3RhdGljIHZvaWQgZ2VuNl9k aXNhYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAotCUk5MTVf V1JJVEUoR0VONl9QTUlOVFJNU0ssIDB4ZmZmZmZmZmYpOwotCUk5MTVfV1JJVEUoR0VONl9QTUlF UiwgSTkxNV9SRUFEKEdFTjZfUE1JRVIpICYKKwlJOTE1X1dSSVRFKEdFTjZfUE1JTlRSTVNLLCBJ TlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDggPworCQkgICB+R0VOOF9QTUlOVFJfUkVESVJF Q1RfVE9fTk9OX0RJU1AgOiB+MCk7CisJSTkxNV9XUklURShnZW42X3BtX2llcihkZXZfcHJpdiks IEk5MTVfUkVBRChnZW42X3BtX2llcihkZXZfcHJpdikpICYKIAkJCQl+ZGV2X3ByaXYtPnBtX3Jw c19ldmVudHMpOwogCS8qIENvbXBsZXRlIFBNIGludGVycnVwdCBtYXNraW5nIGhlcmUgZG9lc24n dCByYWNlIHdpdGggdGhlIHJwcyB3b3JrCiAJICogaXRlbSBhZ2FpbiB1bm1hc2tpbmcgUE0gaW50 ZXJydXB0cyBiZWNhdXNlIHRoYXQgaXMgdXNpbmcgYSBkaWZmZXJlbnQKQEAgLTQ1NjIsNyArNDU1 Myw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCWRldl9wcml2LT5ycHMucG1faWlyID0gMDsKIAlzcGluX3VubG9ja19p cnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiAKLQlJOTE1X1dSSVRFKEdFTjZfUE1JSVIsIGRldl9w cml2LT5wbV9ycHNfZXZlbnRzKTsKKwlJOTE1X1dSSVRFKGdlbjZfcG1faWlyKGRldl9wcml2KSwg ZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMpOwogfQogCiBzdGF0aWMgdm9pZCBnZW42X2Rpc2FibGVf cnBzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC00NTcyLDEwICs0NTYzLDcgQEAgc3RhdGlj IHZvaWQgZ2VuNl9kaXNhYmxlX3JwcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCUk5MTVfV1JJ VEUoR0VONl9SQ19DT05UUk9MLCAwKTsKIAlJOTE1X1dSSVRFKEdFTjZfUlBOU1dSRVEsIDEgPDwg MzEpOwogCi0JaWYgKElTX0JST0FEV0VMTChkZXYpKQotCQlnZW44X2Rpc2FibGVfcnBzX2ludGVy cnVwdHMoZGV2KTsKLQllbHNlCi0JCWdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhkZXYpOwor CWdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhkZXYpOwogfQogCiBzdGF0aWMgdm9pZCBjaGVy cnl2aWV3X2Rpc2FibGVfcnBzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC00NTg0LDcgKzQ1 NzIsNyBAQCBzdGF0aWMgdm9pZCBjaGVycnl2aWV3X2Rpc2FibGVfcnBzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAKIAlJOTE1X1dSSVRFKEdFTjZfUkNfQ09OVFJPTCwgMCk7CiAKLQlnZW44X2Rp c2FibGVfcnBzX2ludGVycnVwdHMoZGV2KTsKKwlnZW42X2Rpc2FibGVfcnBzX2ludGVycnVwdHMo ZGV2KTsKIH0KIAogc3RhdGljIHZvaWQgdmFsbGV5dmlld19kaXNhYmxlX3JwcyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQpAQCAtNDY2MywxNyArNDY1MSw2IEBAIGludCBpbnRlbF9lbmFibGVfcmM2 KGNvbnN0IHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIGk5MTUuZW5hYmxlX3JjNjsK IH0KIAotc3RhdGljIHZvaWQgZ2VuOF9lbmFibGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKLXsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwotCi0Jc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKLQlX QVJOX09OKGRldl9wcml2LT5ycHMucG1faWlyKTsKLQlnZW42X2VuYWJsZV9wbV9pcnEoZGV2X3By aXYsIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsKLQlJOTE1X1dSSVRFKEdFTjhfR1RfSUlSKDIp LCBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7Ci0Jc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+ aXJxX2xvY2spOwotfQotCiBzdGF0aWMgdm9pZCBnZW42X2VuYWJsZV9ycHNfaW50ZXJydXB0cyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC00NjgxLDcgKzQ2NTgsNyBAQCBzdGF0aWMgdm9p ZCBnZW42X2VuYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXNw aW5fbG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiAJV0FSTl9PTihkZXZfcHJpdi0+cnBz LnBtX2lpcik7CiAJZ2VuNl9lbmFibGVfcG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fcnBz X2V2ZW50cyk7Ci0JSTkxNV9XUklURShHRU42X1BNSUlSLCBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50 cyk7CisJSTkxNV9XUklURShnZW42X3BtX2lpcihkZXZfcHJpdiksIGRldl9wcml2LT5wbV9ycHNf ZXZlbnRzKTsKIAlzcGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiB9CiAKQEAg LTQ4MjMsNyArNDgwMCw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfZW5hYmxlX3JwcyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCiAJZ2VuNl9zZXRfcnBzKGRldiwgKEk5MTVfUkVBRChHRU42X0dUX1BF UkZfU1RBVFVTKSAmIDB4ZmYwMCkgPj4gOCk7CiAKLQlnZW44X2VuYWJsZV9ycHNfaW50ZXJydXB0 cyhkZXYpOworCWdlbjZfZW5hYmxlX3Jwc19pbnRlcnJ1cHRzKGRldik7CiAKIAlnZW42X2d0X2Zv cmNlX3dha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIH0KQEAgLTU0MTQsNyArNTM5 MSw3IEBAIHN0YXRpYyB2b2lkIGNoZXJyeXZpZXdfZW5hYmxlX3JwcyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCiAJdmFsbGV5dmlld19zZXRfcnBzKGRldl9wcml2LT5kZXYsIGRldl9wcml2LT5y cHMuZWZmaWNpZW50X2ZyZXEpOwogCi0JZ2VuOF9lbmFibGVfcnBzX2ludGVycnVwdHMoZGV2KTsK KwlnZW42X2VuYWJsZV9ycHNfaW50ZXJydXB0cyhkZXYpOwogCiAJZ2VuNl9ndF9mb3JjZV93YWtl X3B1dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiB9Ci0tIAoxLjguNAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK