From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v3 4/5] drm/i915: sanitize rps irq disabling Date: Wed, 19 Nov 2014 15:30:04 +0200 Message-ID: <1416403805-19494-5-git-send-email-imre.deak@intel.com> References: <1416403805-19494-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 1CFFF6EDDC for ; Wed, 19 Nov 2014 05:31:15 -0800 (PST) In-Reply-To: <1416403805-19494-1-git-send-email-imre.deak@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: paulo.r.zanoni@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 CnRoZSBuZXh0IHBhdGNoLgoKdjIvdjM6Ci0gcmViYXNlIG9uIHBhdGNoICJkcm0vaTkxNTogbW92 ZSBycHMgaXJxIGRpc2FibGUgb25lIGxldmVsIHVwIiBpbiB0aGUKICBwYXRjaHNldAoKU2lnbmVk LW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogUGF1 bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCB8ICA2ICsrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYyB8IDIzICsrKysrKysrKysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jIHwgMTcgKysrKysrKysrLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzAgaW5z ZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg YzRmMmNiNi4uZDhmYzE2MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC05OTgsOCArOTk4 LDEyIEBAIHN0cnVjdCBpbnRlbF9ycHNfZWkgewogfTsKIAogc3RydWN0IGludGVsX2dlbjZfcG93 ZXJfbWdtdCB7Ci0JLyogd29yayBhbmQgcG1faWlyIGFyZSBwcm90ZWN0ZWQgYnkgZGV2X3ByaXYt PmlycV9sb2NrICovCisJLyoKKwkgKiB3b3JrLCBpbnRlcnJ1cHRzX2VuYWJsZWQgYW5kIHBtX2lp ciBhcmUgcHJvdGVjdGVkIGJ5CisJICogZGV2X3ByaXYtPmlycV9sb2NrCisJICovCiAJc3RydWN0 IHdvcmtfc3RydWN0IHdvcms7CisJYm9vbCBpbnRlcnJ1cHRzX2VuYWJsZWQ7CiAJdTMyIHBtX2lp cjsKIAogCS8qIEZyZXF1ZW5jaWVzIGFyZSBzdG9yZWQgaW4gcG90ZW50aWFsbHkgcGxhdGZvcm0g ZGVwZW5kZW50IG11bHRpcGxlcy4KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IDY3MmI3MTEu LmZhYzQ4OWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMjc0LDYgKzI3NCw3IEBAIHZv aWQgZ2VuNl9lbmFibGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlz cGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCVdBUk5fT04oZGV2X3ByaXYtPnJw cy5wbV9paXIpOwogCVdBUk5fT04oSTkxNV9SRUFEKGdlbjZfcG1faWlyKGRldl9wcml2KSkgJiBk ZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7CisJZGV2X3ByaXYtPnJwcy5pbnRlcnJ1cHRzX2VuYWJs ZWQgPSB0cnVlOwogCWdlbjZfZW5hYmxlX3BtX2lycShkZXZfcHJpdiwgZGV2X3ByaXYtPnBtX3Jw c19ldmVudHMpOwogCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIH0KQEAg LTI4MiwxNCArMjgzLDE2IEBAIHZvaWQgZ2VuNl9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAorCXNwaW5fbG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9j ayk7CisJZGV2X3ByaXYtPnJwcy5pbnRlcnJ1cHRzX2VuYWJsZWQgPSBmYWxzZTsKKwlzcGluX3Vu bG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CisKKwljYW5jZWxfd29ya19zeW5jKCZkZXZf cHJpdi0+cnBzLndvcmspOworCiAJSTkxNV9XUklURShHRU42X1BNSU5UUk1TSywgSU5URUxfSU5G TyhkZXZfcHJpdiktPmdlbiA+PSA4ID8KIAkJICAgfkdFTjhfUE1JTlRSX1JFRElSRUNUX1RPX05P Tl9ESVNQIDogfjApOwogCUk5MTVfV1JJVEUoZ2VuNl9wbV9pZXIoZGV2X3ByaXYpLCBJOTE1X1JF QUQoZ2VuNl9wbV9pZXIoZGV2X3ByaXYpKSAmCiAJCQkJfmRldl9wcml2LT5wbV9ycHNfZXZlbnRz KTsKLQkvKiBDb21wbGV0ZSBQTSBpbnRlcnJ1cHQgbWFza2luZyBoZXJlIGRvZXNuJ3QgcmFjZSB3 aXRoIHRoZSBycHMgd29yawotCSAqIGl0ZW0gYWdhaW4gdW5tYXNraW5nIFBNIGludGVycnVwdHMg YmVjYXVzZSB0aGF0IGlzIHVzaW5nIGEgZGlmZmVyZW50Ci0JICogcmVnaXN0ZXIgKFBNSU1SKSB0 byBtYXNrIFBNIGludGVycnVwdHMuIFRoZSBvbmx5IHJpc2sgaXMgaW4gbGVhdmluZwotCSAqIHN0 YWxlIGJpdHMgaW4gUE1JSVIgYW5kIFBNSU1SIHdoaWNoIGdlbjZfZW5hYmxlX3JwcyB3aWxsIGNs ZWFuIHVwLiAqLwogCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAlkZXZf cHJpdi0+cnBzLnBtX2lpciA9IDA7CkBAIC0xMTM2LDYgKzExMzksMTEgQEAgc3RhdGljIHZvaWQg Z2VuNl9wbV9ycHNfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJaW50IG5ld19kZWxh eSwgYWRqOwogCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKKwkvKiBTcGVl ZCB1cCB3b3JrIGNhbmNlbGF0aW9uIGR1cmluZyBkaXNhYmxpbmcgcnBzIGludGVycnVwdHMuICov CisJaWYgKCFkZXZfcHJpdi0+cnBzLmludGVycnVwdHNfZW5hYmxlZCkgeworCQlzcGluX3VubG9j a19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CisJCXJldHVybjsKKwl9CiAJcG1faWlyID0gZGV2 X3ByaXYtPnJwcy5wbV9paXI7CiAJZGV2X3ByaXYtPnJwcy5wbV9paXIgPSAwOwogCS8qIE1ha2Ug c3VyZSBub3QgdG8gY29ycnVwdCBQTUlNUiBzdGF0ZSB1c2VkIGJ5IHJpbmdidWZmZXIgb24gR0VO NiAqLwpAQCAtMTcwOSwxMSArMTcxNywxMiBAQCBzdGF0aWMgdm9pZCBnZW42X3Jwc19pcnFfaGFu ZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBwbV9paXIpCiAKIAlp ZiAocG1faWlyICYgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMpIHsKIAkJc3Bpbl9sb2NrKCZkZXZf cHJpdi0+aXJxX2xvY2spOwotCQlkZXZfcHJpdi0+cnBzLnBtX2lpciB8PSBwbV9paXIgJiBkZXZf cHJpdi0+cG1fcnBzX2V2ZW50czsKIAkJZ2VuNl9kaXNhYmxlX3BtX2lycShkZXZfcHJpdiwgcG1f aWlyICYgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMpOworCQlpZiAoZGV2X3ByaXYtPnJwcy5pbnRl cnJ1cHRzX2VuYWJsZWQpIHsKKwkJCWRldl9wcml2LT5ycHMucG1faWlyIHw9IHBtX2lpciAmIGRl dl9wcml2LT5wbV9ycHNfZXZlbnRzOworCQkJcXVldWVfd29yayhkZXZfcHJpdi0+d3EsICZkZXZf cHJpdi0+cnBzLndvcmspOworCQl9CiAJCXNwaW5fdW5sb2NrKCZkZXZfcHJpdi0+aXJxX2xvY2sp OwotCi0JCXF1ZXVlX3dvcmsoZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYtPnJwcy53b3JrKTsKIAl9 CiAKIAlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA4KQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKaW5kZXggZTQ2ZmViNi4uOWRjMjlmYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBA IC02MTg2LDkgKzYxODYsMTcgQEAgdm9pZCBpbnRlbF9zdXNwZW5kX2d0X3Bvd2Vyc2F2ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCS8qIEludGVycnVwdHMgc2hvdWxkIGJlIGRpc2FibGVkIGFs cmVhZHkgdG8gYXZvaWQgcmUtYXJtaW5nLiAqLwogCVdBUk5fT04oaW50ZWxfaXJxc19lbmFibGVk KGRldl9wcml2KSk7CiAKKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA2KQorCQlyZXR1cm47 CisKIAlmbHVzaF9kZWxheWVkX3dvcmsoJmRldl9wcml2LT5ycHMuZGVsYXllZF9yZXN1bWVfd29y ayk7CiAKLQljYW5jZWxfd29ya19zeW5jKCZkZXZfcHJpdi0+cnBzLndvcmspOworCS8qCisJICog VE9ETzogZGlzYWJsZSBSUFMgaW50ZXJydXB0cyBvbiBHRU45KyB0b28gb25jZSBSUFMgc3VwcG9y dAorCSAqIGlzIGFkZGVkIGZvciBpdC4KKwkgKi8KKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4g PCA5KQorCQlnZW42X2Rpc2FibGVfcnBzX2ludGVycnVwdHMoZGV2KTsKIAogCS8qIEZvcmNlIEdQ VSB0byBtaW4gZnJlcSBkdXJpbmcgc3VzcGVuZCAqLwogCWdlbjZfcnBzX2lkbGUoZGV2X3ByaXYp OwpAQCAtNjIxNywxMyArNjIyNSw2IEBAIHZvaWQgaW50ZWxfZGlzYWJsZV9ndF9wb3dlcnNhdmUo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJZWxzZQogCQkJZ2VuNl9kaXNhYmxlX3JwcyhkZXYp OwogCi0JCS8qCi0JCSAqIFRPRE86IGRpc2FibGUgUlBTIGludGVycnVwdHMgb24gR0VOOSsgdG9v IG9uY2UgUlBTIHN1cHBvcnQKLQkJICogaXMgYWRkZWQgZm9yIGl0LgotCQkgKi8KLQkJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuIDwgOSkKLQkJCWdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhk ZXYpOwotCiAJCWRldl9wcml2LT5ycHMuZW5hYmxlZCA9IGZhbHNlOwogCQltdXRleF91bmxvY2so JmRldl9wcml2LT5ycHMuaHdfbG9jayk7CiAJfQotLSAKMS44LjQKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==