From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 7/8] drm/i915: sanitize rps irq disabling Date: Wed, 5 Nov 2014 20:49:04 +0200 Message-ID: <1415213344-17111-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id F3FDB6E9E8 for ; Wed, 5 Nov 2014 10:49:07 -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 V2hlbiBkaXNhYmxpbmcgdGhlIFJQUyBpbnRlcnJ1cHRzIHRoZXJlIGlzIGEgdHJpY2t5IGRlcGVu ZGVuY3kgYmV0d2Vlbgp0aGUgdGhyZWFkIGRpc2FibGluZyB0aGUgaW50ZXJydXB0cywgdGhlIFJQ UyBpbnRlcnJ1cHQgaGFuZGxlciBhbmQgdGhlCmNvcnJlc3BvbmRpbmcgUlBTIHdvcmsuIFRoZSBS UFMgd29yayBjYW4gcmVlbmFibGUgdGhlIGludGVycnVwdHMsIHNvCnRoZXJlIGlzIG5vIHN0cmFp Z2h0Zm9yd2FyZCBvcmRlciBpbiB0aGUgZGlzYWJsaW5nIHRocmVhZCB0byAoMSkgbWFrZQpzdXJl IHRoYXQgYW55IFJQUyB3b3JrIGlzIGZsdXNoZWQgYW5kIHRvICgyKSBkaXNhYmxlIGFsbCBSUFMK aW50ZXJydXB0cy4gQ3VycmVudGx5IHRoaXMgaXMgc29sdmVkIGJ5IG1hc2tpbmcgdGhlIGludGVy cnVwdHMgdXNpbmcgdHdvCnNlcGFyYXRlIG1hc2sgcmVnaXN0ZXJzIChmaXJzdCBsZXZlbCBkaXNw bGF5IElNUiBhbmQgUE0gSU1SKSBhbmQgZG9pbmcKdGhlIGRpc2FibGluZyB3aGVuIGFsbCBmaXJz dCBsZXZlbCBpbnRlcnJ1cHRzIGFyZSBkaXNhYmxlZC4KClRoaXMgd29ya3MsIGJ1dCB0aGUgcmVx dWlyZW1lbnQgdG8gcnVuIHdpdGggYWxsIGZpcnN0IGxldmVsIGludGVycnVwdHMKZGlzYWJsZWQg aXMgdW5uZWNlc3NhcnkgbWFraW5nIHRoZSBzdXNwZW5kIC8gdW5sb2FkIHRpbWUgb3JkZXJpbmcg b2YgUlBTCmRpc2FibGluZyB3cnQuIG90aGVyIHVuaXRpYWxpemF0aW9uIHN0ZXBzIGRpZmZpY3Vs dCBhbmQgZXJyb3IgcHJvbmUuClJlbW92aW5nIHRoaXMgcmVzdHJpY3Rpb24gYWxsb3dzIHVzIHRv IGRpc2FibGUgUlBTIGVhcmx5IGR1cmluZyBzdXNwZW5kCi8gdW5sb2FkIGFuZCBmb3JnZXQgYWJv dXQgaXQgZm9yIHRoZSByZXN0IG9mIHRoZSBzZXF1ZW5jZS4gQnkgYWRkaW5nIGEKbW9yZSBleHBs aWNpdCBtZXRob2QgZm9yIGF2b2lkaW5nIHRoZSBhYm92ZSByYWNlLCBpdCBhbHNvIGJlY29tZXMg ZWFzaWVyCnRvIHByb3ZlIGl0cyBjb3JyZWN0bmVzcy4gRmluYWxseSBjdXJyZW50bHkgd2UgY2Fu IGhpdCB0aGUgV0FSTiBpbgpzbmJfdXBkYXRlX3BtX2lycSgpLCB3aGVuIGEgZmluYWwgUlBTIHdv cmsgcnVucyB3aXRoIHRoZSBmaXJzdCBsZXZlbAppbnRlcnJ1cHRzIGFscmVhZHkgZGlzYWJsZWQu IFRoaXMgd29uJ3QgbGVhZCB0byBhbnkgcHJvYmxlbSAoZHVlIHRvIHRoZQpzZXBhcmF0ZSBpbnRl cnJ1cHQgbWFza3MpLCBidXQgd2l0aCB0aGUgY2hhbmdlIGluIHRoaXMgYW5kIHRoZSBuZXh0CnBh dGNoIHdlIGNhbiBnZXQgcmlkIG9mIHRoZSBXQVJOLCB3aGlsZSBsZWF2aW5nIGl0IGluIHBsYWNl IGZvciBvdGhlcgpzY2VuYXJpb3MuCgpUbyBhZGRyZXNzIHRoZSBhYm92ZSBwb2ludHMsIGFkZCBh IG5ldyBSUFMgaW50ZXJydXB0c19lbmFibGVkIGZsYWcgYW5kCnVzZSB0aGlzIGR1cmluZyBSUFMg ZGlzYWJsaW5nIHRvIGF2b2lkIHJlcXVldWluZyB0aGUgUlBTIHdvcmsgYW5kCnJlZW5hYmxpbmcg b2YgdGhlIFJQUyBpbnRlcnJ1cHRzLiBTaW5jZSB0aGUgaW50ZXJydXB0IGRpc2FibGluZyBoYXBw ZW5zCm5vdyBpbiBpbnRlbF9zdXNwZW5kX2d0X3Bvd2Vyc2F2ZSgpLCB3ZSB3aWxsIGRpc2FibGUg UlBTIGludGVycnVwdHMKZXhwbGljaXRseSBkdXJpbmcgc3VzcGVuZCAoYW5kIG5vdCBqdXN0IHRo cm91Z2ggdGhlIGZpcnN0IGxldmVsIG1hc2spLApidXQgdGhlcmUgaXMgbm8gcHJvYmxlbSBkb2lu ZyBzbywgaXQncyBhbHNvIG1vcmUgY29uc2lzdGVudCBhbmQgYWxsb3dzCnVzIHRvIHVuaWZ5IG1v cmUgb2YgdGhlIFJQUyBkaXNhYmxpbmcgZHVyaW5nIHN1c3BlbmQgYW5kIHVubG9hZCB0aW1lIGlu CnRoZSBuZXh0IHBhdGNoLgoKU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgNiArKysrKy0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgfCAyMyArKysrKysrKysrKysrKysrLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8ICA3ICsrKystLS0KIDMgZmls ZXMgY2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKaW5kZXggMGYwMGU1OC4uNTU4OTk0YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCkBAIC05NzgsOCArOTc4LDEyIEBAIHN0cnVjdCBpbnRlbF9ycHNfZWkgewogfTsKIAogc3Ry dWN0IGludGVsX2dlbjZfcG93ZXJfbWdtdCB7Ci0JLyogd29yayBhbmQgcG1faWlyIGFyZSBwcm90 ZWN0ZWQgYnkgZGV2X3ByaXYtPmlycV9sb2NrICovCisJLyoKKwkgKiB3b3JrLCBpbnRlcnJ1cHRz X2VuYWJsZWQgYW5kIHBtX2lpciBhcmUgcHJvdGVjdGVkIGJ5CisJICogZGV2X3ByaXYtPmlycV9s b2NrCisJICovCiAJc3RydWN0IHdvcmtfc3RydWN0IHdvcms7CisJYm9vbCBpbnRlcnJ1cHRzX2Vu YWJsZWQ7CiAJdTMyIHBtX2lpcjsKIAogCS8qIEZyZXF1ZW5jaWVzIGFyZSBzdG9yZWQgaW4gcG90 ZW50aWFsbHkgcGxhdGZvcm0gZGVwZW5kZW50IG11bHRpcGxlcy4KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2ly cS5jCmluZGV4IDY4ZjY1ZWMuLjgxZTI0YjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAt MjcxLDYgKzI3MSw3IEBAIHZvaWQgZ2VuNl9lbmFibGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAogCXNwaW5fbG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiAJ V0FSTl9PTihkZXZfcHJpdi0+cnBzLnBtX2lpcik7CisJZGV2X3ByaXYtPnJwcy5pbnRlcnJ1cHRz X2VuYWJsZWQgPSB0cnVlOwogCWdlbjZfZW5hYmxlX3BtX2lycShkZXZfcHJpdiwgZGV2X3ByaXYt PnBtX3Jwc19ldmVudHMpOwogCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsK IH0KQEAgLTI3OSwxNCArMjgwLDE2IEBAIHZvaWQgZ2VuNl9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAorCXNwaW5fbG9ja19pcnEoJmRldl9wcml2LT5p cnFfbG9jayk7CisJZGV2X3ByaXYtPnJwcy5pbnRlcnJ1cHRzX2VuYWJsZWQgPSBmYWxzZTsKKwlz cGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CisKKwljYW5jZWxfd29ya19zeW5j KCZkZXZfcHJpdi0+cnBzLndvcmspOworCiAJSTkxNV9XUklURShHRU42X1BNSU5UUk1TSywgSU5U RUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA4ID8KIAkJICAgfkdFTjhfUE1JTlRSX1JFRElSRUNU X1RPX05PTl9ESVNQIDogfjApOwogCUk5MTVfV1JJVEUoZ2VuNl9wbV9pZXIoZGV2X3ByaXYpLCBJ OTE1X1JFQUQoZ2VuNl9wbV9pZXIoZGV2X3ByaXYpKSAmCiAJCQkJfmRldl9wcml2LT5wbV9ycHNf ZXZlbnRzKTsKLQkvKiBDb21wbGV0ZSBQTSBpbnRlcnJ1cHQgbWFza2luZyBoZXJlIGRvZXNuJ3Qg cmFjZSB3aXRoIHRoZSBycHMgd29yawotCSAqIGl0ZW0gYWdhaW4gdW5tYXNraW5nIFBNIGludGVy cnVwdHMgYmVjYXVzZSB0aGF0IGlzIHVzaW5nIGEgZGlmZmVyZW50Ci0JICogcmVnaXN0ZXIgKFBN SU1SKSB0byBtYXNrIFBNIGludGVycnVwdHMuIFRoZSBvbmx5IHJpc2sgaXMgaW4gbGVhdmluZwot CSAqIHN0YWxlIGJpdHMgaW4gUE1JSVIgYW5kIFBNSU1SIHdoaWNoIGdlbjZfZW5hYmxlX3JwcyB3 aWxsIGNsZWFuIHVwLiAqLwogCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsK IAlkZXZfcHJpdi0+cnBzLnBtX2lpciA9IDA7CkBAIC0xMTM2LDYgKzExMzksMTEgQEAgc3RhdGlj IHZvaWQgZ2VuNl9wbV9ycHNfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJaW50IG5l d19kZWxheSwgYWRqOwogCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKKwkv KiBTcGVlZCB1cCB3b3JrIGNhbmNlbGF0aW9uIGR1cmluZyBkaXNhYmxpbmcgcnBzIGludGVycnVw dHMuICovCisJaWYgKCFkZXZfcHJpdi0+cnBzLmludGVycnVwdHNfZW5hYmxlZCkgeworCQlzcGlu X3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CisJCXJldHVybjsKKwl9CiAJcG1faWly ID0gZGV2X3ByaXYtPnJwcy5wbV9paXI7CiAJZGV2X3ByaXYtPnJwcy5wbV9paXIgPSAwOwogCS8q IE1ha2Ugc3VyZSBub3QgdG8gY29ycnVwdCBQTUlNUiBzdGF0ZSB1c2VkIGJ5IHJpbmdidWZmZXIg b24gR0VONiAqLwpAQCAtMTcwNCwxMSArMTcxMiwxMiBAQCBzdGF0aWMgdm9pZCBnZW42X3Jwc19p cnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBwbV9paXIp CiB7CiAJaWYgKHBtX2lpciAmIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKSB7CiAJCXNwaW5fbG9j aygmZGV2X3ByaXYtPmlycV9sb2NrKTsKLQkJZGV2X3ByaXYtPnJwcy5wbV9paXIgfD0gcG1faWly ICYgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHM7CiAJCWdlbjZfZGlzYWJsZV9wbV9pcnEoZGV2X3By aXYsIHBtX2lpciAmIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsKKwkJaWYgKGRldl9wcml2LT5y cHMuaW50ZXJydXB0c19lbmFibGVkKSB7CisJCQlkZXZfcHJpdi0+cnBzLnBtX2lpciB8PSBwbV9p aXIgJiBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50czsKKwkJCXF1ZXVlX3dvcmsoZGV2X3ByaXYtPndx LCAmZGV2X3ByaXYtPnJwcy53b3JrKTsKKwkJfQogCQlzcGluX3VubG9jaygmZGV2X3ByaXYtPmly cV9sb2NrKTsKLQotCQlxdWV1ZV93b3JrKGRldl9wcml2LT53cSwgJmRldl9wcml2LT5ycHMud29y ayk7CiAJfQogCiAJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOCkKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCmluZGV4IDgwMzY3NmYuLjc5ZWVjZWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYwpAQCAtNjE3OSw5ICs2MTc5LDEyIEBAIHZvaWQgaW50ZWxfc3VzcGVuZF9ndF9wb3dlcnNh dmUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkvKiBJbnRlcnJ1cHRzIHNob3VsZCBiZSBkaXNh YmxlZCBhbHJlYWR5IHRvIGF2b2lkIHJlLWFybWluZy4gKi8KIAlXQVJOX09OKGludGVsX2lycXNf ZW5hYmxlZChkZXZfcHJpdikpOwogCisJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNikKKwkJ cmV0dXJuOworCiAJZmx1c2hfZGVsYXllZF93b3JrKCZkZXZfcHJpdi0+cnBzLmRlbGF5ZWRfcmVz dW1lX3dvcmspOwogCi0JY2FuY2VsX3dvcmtfc3luYygmZGV2X3ByaXYtPnJwcy53b3JrKTsKKwln ZW42X2Rpc2FibGVfcnBzX2ludGVycnVwdHMoZGV2KTsKIAogCS8qIEZvcmNlIEdQVSB0byBtaW4g ZnJlcSBkdXJpbmcgc3VzcGVuZCAqLwogCWdlbjZfcnBzX2lkbGUoZGV2X3ByaXYpOwpAQCAtNjIx MCw4ICs2MjEzLDYgQEAgdm9pZCBpbnRlbF9kaXNhYmxlX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCQllbHNlCiAJCQlnZW42X2Rpc2FibGVfcnBzKGRldik7CiAKLQkJZ2Vu Nl9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRzKGRldik7Ci0KIAkJZGV2X3ByaXYtPnJwcy5lbmFibGVk ID0gZmFsc2U7CiAJCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnJwcy5od19sb2NrKTsKIAl9Ci0t IAoxLjguNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK