From: Dhinakaran Pandiyan Subject: [PATCH 2/2] drm/i915/psr: Mask PSR irq bits when re-enabling interrupts. Date: Wed, 15 Aug 2018 18:05:46 -0700 Message-ID: <20180816010546.2681-2-dhinakaran.pandiyan@intel.com> References: <20180816010546.2681-1-dhinakaran.pandiyan@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 ESMTPS id 5E4EB6E14C for ; Thu, 16 Aug 2018 01:07:53 +0000 (UTC) In-Reply-To: <20180816010546.2681-1-dhinakaran.pandiyan@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 Cc: Dhinakaran Pandiyan List-Id: intel-gfx@lists.freedesktop.org Z2VuOF9kZV9pcnFfcG9zdGluc3RhbGwoKSB3YXNuJ3QgbWFza2luZyB0aGUgSVJRIGJpdCBiZWZv cmUgcGFzc2luZyB0aGUKZGVidWcgZmxhZyB0byBwc3JfaXJxX2NvbnRyb2woKS4gVGhpcyBjaGVj ayB3YXMgbWlzc2VkIHdoZW4gbmV3IGRlYnVnIGJpdHMKd2VyZSBkZWZpbmVkIGluICAnY29tbWl0 IGM0NDMwMWZjZTYxNCAoImRybS9pOTE1OiBBbGxvdyBjb250cm9sIG9mIFBTUiBhdApydW50aW1l IHRocm91Z2ggZGVidWdmcywgdjYiKScuIEluc3RlYWQgb2YgQU5EaW5nIHRoZSBpcnEgYml0IGlu IGFsbCB0aGUKY2FsbGVycywgbW92ZSBpdCB0byB0aGUgY2FsbGVlLgoKQ2M6IE1hYXJ0ZW4gTGFu a2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6 IERoaW5ha2FyYW4gUGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFuZGl5YW5AaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgIHwgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3Iu YyB8IDYgKysrLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCBiMmM5ODM4NDQyYmMuLjgwODRlMzVi MjVjNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC00MDQ4LDcgKzQwNDgsNyBAQCBzdGF0 aWMgaW50IGlyb25sYWtlX2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CiAJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7CiAJCWdlbjNfYXNzZXJ0X2lpcl9pc196ZXJv KGRldl9wcml2LCBFRFBfUFNSX0lJUik7Ci0JCWludGVsX3Bzcl9pcnFfY29udHJvbChkZXZfcHJp diwgZGV2X3ByaXYtPnBzci5kZWJ1ZyAmIEk5MTVfUFNSX0RFQlVHX0lSUSk7CisJCWludGVsX3Bz cl9pcnFfY29udHJvbChkZXZfcHJpdiwgZGV2X3ByaXYtPnBzci5kZWJ1Zyk7CiAJCWRpc3BsYXlf bWFzayB8PSBERV9FRFBfUFNSX0lOVF9IU1c7CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CmluZGV4IDdiOTg0YWVmY2U5OC4uYmMxYzUzYzVmNGRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaApAQCAtMTk0NCw3ICsxOTQ0LDcgQEAgdm9pZCBpbnRlbF9wc3JfZmx1c2goc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogdm9pZCBpbnRlbF9wc3JfaW5pdChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9wc3JfY29tcHV0ZV9jb25maWco c3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAkJCSAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKTsKLXZvaWQgaW50ZWxfcHNyX2lycV9jb250cm9sKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCBkZWJ1Zyk7Cit2b2lkIGludGVsX3Bzcl9pcnFf Y29udHJvbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBkZWJ1Zyk7CiB2 b2lkIGludGVsX3Bzcl9pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIHUzMiBwc3JfaWlyKTsKIHZvaWQgaW50ZWxfcHNyX3Nob3J0X3B1bHNlKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHApOwogaW50IGludGVsX3Bzcl93YWl0X2Zvcl9pZGxlKGNvbnN0IHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bz ci5jCmluZGV4IDc1NjBjNjVmNTBhZC4uZGY3OTAyMDA0NWE1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wc3IuYwpAQCAtNzksNyArNzksNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9wc3IyX2VuYWJsZWQo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCX0KIH0KIAotdm9pZCBpbnRlbF9w c3JfaXJxX2NvbnRyb2woc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBib29sIGRl YnVnKQordm9pZCBpbnRlbF9wc3JfaXJxX2NvbnRyb2woc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LCB1MzIgZGVidWcpCiB7CiAJdTMyIGRlYnVnX21hc2ssIG1hc2s7CiAKQEAgLTEw MCw3ICsxMDAsNyBAQCB2b2lkIGludGVsX3Bzcl9pcnFfY29udHJvbChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsIGJvb2wgZGVidWcpCiAJCQkgICAgICBFRFBfUFNSX1BSRV9FTlRS WShUUkFOU0NPREVSX0MpOwogCX0KIAotCWlmIChkZWJ1ZykKKwlpZiAoZGVidWcgJiBJOTE1X1BT Ul9ERUJVR19JUlEpCiAJCW1hc2sgfD0gZGVidWdfbWFzazsKIAogCUk5MTVfV1JJVEUoRURQX1BT Ul9JTVIsIH5tYXNrKTsKQEAgLTkwMSw3ICs5MDEsNyBAQCBpbnQgaW50ZWxfcHNyX3NldF9kZWJ1 Z2ZzX21vZGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWlmIChjcnRjKQog CQlkZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxlZCA9IGludGVsX3BzcjJfZW5hYmxlZChkZXZfcHJp diwgY3J0Y19zdGF0ZSk7CiAKLQlpbnRlbF9wc3JfaXJxX2NvbnRyb2woZGV2X3ByaXYsIGRldl9w cml2LT5wc3IuZGVidWcgJiBJOTE1X1BTUl9ERUJVR19JUlEpOworCWludGVsX3Bzcl9pcnFfY29u dHJvbChkZXZfcHJpdiwgZGV2X3ByaXYtPnBzci5kZWJ1Zyk7CiAKIAlpZiAoZGV2X3ByaXYtPnBz ci5wcmVwYXJlZCAmJiBlbmFibGUpCiAJCWludGVsX3Bzcl9lbmFibGVfbG9ja2VkKGRldl9wcml2 LCBjcnRjX3N0YXRlKTsKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==