From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 1/2] drm/i915: mask RPS IRQs properly when disabling RPS Date: Thu, 20 Nov 2014 23:01:47 +0200 Message-ID: <1416517308-12934-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 21E386ED15 for ; Thu, 20 Nov 2014 13:03:22 -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 List-Id: intel-gfx@lists.freedesktop.org QXRtLCBpZ3QvZ2VtX3Jlc2V0X3N0YXRzIGNhbiB0cmlnZ2VyIHRoZSByZWNlbnRseSBhZGRlZCBX QVJOIG9uCmxlZnQtb3ZlciBQTV9JSVIgYml0cyBpbiBnZW42X2VuYWJsZV9ycHNfaW50ZXJydXB0 cygpLiBUaGVyZSBhcmUgdHdvCnJlYXNvbnMgZm9yIHRoaXM6CjEuIHdlIGNhbGwgaW50ZWxfZW5h YmxlX2d0X3Bvd2Vyc2F2ZSgpIHdpdGhvdXQgYSBwcmVjZWVkaW5nCiAgIGludGVsX2Rpc2FibGVf Z3RfcG93ZXJzYXZlKCkKMi4gZ2VuNl9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRzKCkgZG9lc24ndCBt YXNrIGludGVycnVwdHMgaW4gUE1fSU1SCgoxLiBtZWFucyBSUFMgaW50ZXJydXB0cyB3aWxsIHJl bWFpbiBlbmFibGVkIGFuZCBjYW4gYmUgc2VydmljZWQgZHVyaW5nCnRoZSBIVyBpbml0aWFsaXph dGlvbiBhZnRlciBhIEdQVSByZXNldC4gMi4gbWVhbnMgZXZlbiBpZiB3ZSBjYWxsZWQKZ2VuNl9k aXNhYmxlX3Jwc19pbnRlcnJ1cHRzKCkgYW55IG5ldyBSUFMgaW50ZXJydXB0IGR1cmluZyBSUFMK aW5pdGlhbGl6YXRpb24gd291bGQgc3RpbGwgcHJvcGFnYXRlIHRvIFBNX0lJUiB0b28gZWFybHkg KHRob3VnaAp3b3VsZG4ndCBiZSBzZXJ2aWNlZCkuCgpUaGlzIHBhdGNoIHNvbHZlcyB0aGUgMi4g aXNzdWUgYnkgYWxzbyBtYXNraW5nIGludGVycnVwdHMgaW4gUE1fSU1SLCB0aGUKZm9sbG93aW5n IHBhdGNoIGZpeGVzIDEuIGdldHRpbmcgcmlkIG9mIHRoZSBXQVJOLiBUaGlzIGFsc28gbWFrZXMK aW50ZWxfZW5hYmxlX2d0X3Bvd2Vyc2F2ZSgpIGFuZCBpbnRlbF9kaXNhYmxlX2d0X3Bvd2Vyc2F2 ZSgpIG1vcmUKc3ltbWV0cmljLgoKU2luY2UgZ2VuNl9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRzKCkg aXMgY2FsbGVkIGR1cmluZyBkcml2ZXIgbG9hZGluZyB3aXRoCmk5MTUgaW50ZXJydXB0cyBkaXNh YmxlZCBhZGQgYSBuZXcgdmVyc2lvbiBvZiBnZW42X2Rpc2FibGVfcG1faXJxKCkgdGhhdApkb2Vz bid0IFdBUk4gZm9yIHRoaXMuCgpBbHNvIHdoaWxlIGF0IGl0LCBnZXQgdGhlIGlycV9sb2NrIGFy b3VuZCB0aGUgd2hvbGUgUE1fSU1SL0lFUi9JSVIKcHJvZ3JhbW1pbmcgc2VxdWVuY2UgYW5kIG1h a2Ugc3VyZSB0aGF0IGFueSBxdWV1ZWQgUE1fSUlSIGJpdCBpcyBhbHNvCmNsZWFyZWQuCgpUaGUg V0FSTiB3YXMgY2F1Z2h0IGJ5IFBSVFMgYWZ0ZXIgSSBzZW50IG15IHByZXZpb3VzIFJQUyBzYW5p dGl6aW5nCnBhdGNoc2V0IGFuZCBJIGNvdWxkIGVhc2lseSByZXByb2R1Y2UgaXQgb24gSFNXLiBU byBhY3R1YWxseSBmaXggaXQgd2UKYWxzbyBuZWVkIHRoZSBuZXh0IHBhdGNoLgoKUmVwb3J0ZWQt Ynk6IEhlLCBTaHVhbmcgPHNodWFuZy5oZUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEltcmUg RGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jIHwgMjcgKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MjAgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpp bmRleCA4ZDE2OWUxLi41OThlOTY4OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0yMzEs OSArMjMxLDYgQEAgc3RhdGljIHZvaWQgc25iX3VwZGF0ZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCiAJYXNzZXJ0X3NwaW5fbG9ja2VkKCZkZXZfcHJpdi0+aXJx X2xvY2spOwogCi0JaWYgKFdBUk5fT04oIWludGVsX2lycXNfZW5hYmxlZChkZXZfcHJpdikpKQot CQlyZXR1cm47Ci0KIAluZXdfdmFsID0gZGV2X3ByaXYtPnBtX2lycV9tYXNrOwogCW5ld192YWwg Jj0gfmludGVycnVwdF9tYXNrOwogCW5ld192YWwgfD0gKH5lbmFibGVkX2lycV9tYXNrICYgaW50 ZXJydXB0X21hc2spOwpAQCAtMjQ3LDE0ICsyNDQsMjYgQEAgc3RhdGljIHZvaWQgc25iX3VwZGF0 ZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiB2b2lkIGdlbjZf ZW5hYmxlX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHVpbnQzMl90 IG1hc2spCiB7CisJaWYgKFdBUk5fT04oIWludGVsX2lycXNfZW5hYmxlZChkZXZfcHJpdikpKQor CQlyZXR1cm47CisKIAlzbmJfdXBkYXRlX3BtX2lycShkZXZfcHJpdiwgbWFzaywgbWFzayk7CiB9 CiAKLXZvaWQgZ2VuNl9kaXNhYmxlX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIHVpbnQzMl90IG1hc2spCitzdGF0aWMgdm9pZCBfX2dlbjZfZGlzYWJsZV9wbV9pcnEo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSAgdWludDMyX3QgbWFzaykK IHsKIAlzbmJfdXBkYXRlX3BtX2lycShkZXZfcHJpdiwgbWFzaywgMCk7CiB9CiAKK3ZvaWQgZ2Vu Nl9kaXNhYmxlX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHVpbnQz Ml90IG1hc2spCit7CisJaWYgKFdBUk5fT04oIWludGVsX2lycXNfZW5hYmxlZChkZXZfcHJpdikp KQorCQlyZXR1cm47CisKKwlfX2dlbjZfZGlzYWJsZV9wbV9pcnEoZGV2X3ByaXYsIG1hc2spOwor fQorCiB2b2lkIGdlbjZfcmVzZXRfcnBzX2ludGVycnVwdHMoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwpAQCAtMjg5LDE2ICsyOTgsMjAgQEAgdm9pZCBnZW42X2Rpc2FibGVfcnBzX2ludGVycnVw dHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWNhbmNlbF93b3JrX3N5bmMoJmRldl9wcml2 LT5ycHMud29yayk7CiAKKwlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOworCiAJ STkxNV9XUklURShHRU42X1BNSU5UUk1TSywgSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA4 ID8KIAkJICAgfkdFTjhfUE1JTlRSX1JFRElSRUNUX1RPX05PTl9ESVNQIDogfjApOworCisJX19n ZW42X2Rpc2FibGVfcG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7CiAJ STkxNV9XUklURShnZW42X3BtX2llcihkZXZfcHJpdiksIEk5MTVfUkVBRChnZW42X3BtX2llcihk ZXZfcHJpdikpICYKIAkJCQl+ZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMpOworCUk5MTVfV1JJVEUo Z2VuNl9wbV9paXIoZGV2X3ByaXYpLCBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7CisJSTkxNV9X UklURShnZW42X3BtX2lpcihkZXZfcHJpdiksIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsKIAot CXNwaW5fbG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiAJZGV2X3ByaXYtPnJwcy5wbV9p aXIgPSAwOworCiAJc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwotCi0JSTkx NV9XUklURShnZW42X3BtX2lpcihkZXZfcHJpdiksIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsK IH0KIAogLyoqCi0tIAoxLjguNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK