From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 7/8] drm/i915: sanitize rps irq disabling Date: Mon, 10 Nov 2014 15:44:04 +0200 Message-ID: <1415627044-2025-1-git-send-email-imre.deak@intel.com> References: <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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C2C76F65B for ; Mon, 10 Nov 2014 05:44:07 -0800 (PST) In-Reply-To: <1415213344-17111-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 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 CnRoZSBuZXh0IHBhdGNoLgoKdjI6Ci0gcmViYXNlIG9uIHYyIG9mIHBhdGNoICJkcm0vaTkxNTog bW92ZSBycHMgaXJxIGRpc2FibGUgb25lIGxldmVsIHVwIgoKU2lnbmVkLW9mZi1ieTogSW1yZSBE ZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggfCAgNiArKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgfCAyMyAr KysrKysrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8 IDE3ICsrKysrKysrKy0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyks IDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGY4MzA1OTYuLjE0 ZThmODIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtOTc4LDggKzk3OCwxMiBAQCBzdHJ1 Y3QgaW50ZWxfcnBzX2VpIHsKIH07CiAKIHN0cnVjdCBpbnRlbF9nZW42X3Bvd2VyX21nbXQgewot CS8qIHdvcmsgYW5kIHBtX2lpciBhcmUgcHJvdGVjdGVkIGJ5IGRldl9wcml2LT5pcnFfbG9jayAq LworCS8qCisJICogd29yaywgaW50ZXJydXB0c19lbmFibGVkIGFuZCBwbV9paXIgYXJlIHByb3Rl Y3RlZCBieQorCSAqIGRldl9wcml2LT5pcnFfbG9jaworCSAqLwogCXN0cnVjdCB3b3JrX3N0cnVj dCB3b3JrOworCWJvb2wgaW50ZXJydXB0c19lbmFibGVkOwogCXUzMiBwbV9paXI7CiAKIAkvKiBG cmVxdWVuY2llcyBhcmUgc3RvcmVkIGluIHBvdGVudGlhbGx5IHBsYXRmb3JtIGRlcGVuZGVudCBt dWx0aXBsZXMuCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCA4OWE3YmUxLi4yNjc3NzYwIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTI3MSw2ICsyNzEsNyBAQCB2b2lkIGdlbjZfZW5h YmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlzcGluX2xvY2tf aXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCVdBUk5fT04oZGV2X3ByaXYtPnJwcy5wbV9paXIp OworCWRldl9wcml2LT5ycHMuaW50ZXJydXB0c19lbmFibGVkID0gdHJ1ZTsKIAlnZW42X2VuYWJs ZV9wbV9pcnEoZGV2X3ByaXYsIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsKIAlzcGluX3VubG9j a19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiB9CkBAIC0yNzksMTQgKzI4MCwxNiBAQCB2b2lk IGdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAK KwlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOworCWRldl9wcml2LT5ycHMuaW50 ZXJydXB0c19lbmFibGVkID0gZmFsc2U7CisJc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJx X2xvY2spOworCisJY2FuY2VsX3dvcmtfc3luYygmZGV2X3ByaXYtPnJwcy53b3JrKTsKKwogCUk5 MTVfV1JJVEUoR0VONl9QTUlOVFJNU0ssIElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOCA/ CiAJCSAgIH5HRU44X1BNSU5UUl9SRURJUkVDVF9UT19OT05fRElTUCA6IH4wKTsKIAlJOTE1X1dS SVRFKGdlbjZfcG1faWVyKGRldl9wcml2KSwgSTkxNV9SRUFEKGdlbjZfcG1faWVyKGRldl9wcml2 KSkgJgogCQkJCX5kZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7Ci0JLyogQ29tcGxldGUgUE0gaW50 ZXJydXB0IG1hc2tpbmcgaGVyZSBkb2Vzbid0IHJhY2Ugd2l0aCB0aGUgcnBzIHdvcmsKLQkgKiBp dGVtIGFnYWluIHVubWFza2luZyBQTSBpbnRlcnJ1cHRzIGJlY2F1c2UgdGhhdCBpcyB1c2luZyBh IGRpZmZlcmVudAotCSAqIHJlZ2lzdGVyIChQTUlNUikgdG8gbWFzayBQTSBpbnRlcnJ1cHRzLiBU aGUgb25seSByaXNrIGlzIGluIGxlYXZpbmcKLQkgKiBzdGFsZSBiaXRzIGluIFBNSUlSIGFuZCBQ TUlNUiB3aGljaCBnZW42X2VuYWJsZV9ycHMgd2lsbCBjbGVhbiB1cC4gKi8KIAogCXNwaW5fbG9j a19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiAJZGV2X3ByaXYtPnJwcy5wbV9paXIgPSAwOwpA QCAtMTEzMyw2ICsxMTM2LDExIEBAIHN0YXRpYyB2b2lkIGdlbjZfcG1fcnBzX3dvcmsoc3RydWN0 IHdvcmtfc3RydWN0ICp3b3JrKQogCWludCBuZXdfZGVsYXksIGFkajsKIAogCXNwaW5fbG9ja19p cnEoJmRldl9wcml2LT5pcnFfbG9jayk7CisJLyogU3BlZWQgdXAgd29yayBjYW5jZWxhdGlvbiBk dXJpbmcgZGlzYWJsaW5nIHJwcyBpbnRlcnJ1cHRzLiAqLworCWlmICghZGV2X3ByaXYtPnJwcy5p bnRlcnJ1cHRzX2VuYWJsZWQpIHsKKwkJc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xv Y2spOworCQlyZXR1cm47CisJfQogCXBtX2lpciA9IGRldl9wcml2LT5ycHMucG1faWlyOwogCWRl dl9wcml2LT5ycHMucG1faWlyID0gMDsKIAkvKiBNYWtlIHN1cmUgbm90IHRvIGNvcnJ1cHQgUE1J TVIgc3RhdGUgdXNlZCBieSByaW5nYnVmZmVyIG9uIEdFTjYgKi8KQEAgLTE3MDYsMTEgKzE3MTQs MTIgQEAgc3RhdGljIHZvaWQgZ2VuNl9ycHNfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCB1MzIgcG1faWlyKQogCiAJaWYgKHBtX2lpciAmIGRldl9wcml2LT5w bV9ycHNfZXZlbnRzKSB7CiAJCXNwaW5fbG9jaygmZGV2X3ByaXYtPmlycV9sb2NrKTsKLQkJZGV2 X3ByaXYtPnJwcy5wbV9paXIgfD0gcG1faWlyICYgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHM7CiAJ CWdlbjZfZGlzYWJsZV9wbV9pcnEoZGV2X3ByaXYsIHBtX2lpciAmIGRldl9wcml2LT5wbV9ycHNf ZXZlbnRzKTsKKwkJaWYgKGRldl9wcml2LT5ycHMuaW50ZXJydXB0c19lbmFibGVkKSB7CisJCQlk ZXZfcHJpdi0+cnBzLnBtX2lpciB8PSBwbV9paXIgJiBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50czsK KwkJCXF1ZXVlX3dvcmsoZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYtPnJwcy53b3JrKTsKKwkJfQog CQlzcGluX3VubG9jaygmZGV2X3ByaXYtPmlycV9sb2NrKTsKLQotCQlxdWV1ZV93b3JrKGRldl9w cml2LT53cSwgJmRldl9wcml2LT5ycHMud29yayk7CiAJfQogCiAJaWYgKElOVEVMX0lORk8oZGV2 X3ByaXYpLT5nZW4gPj0gOCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGY1NTU4MTAuLmRj ZGQyNjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNjE3OSw5ICs2MTc5LDE3IEBAIHZv aWQgaW50ZWxfc3VzcGVuZF9ndF9wb3dlcnNhdmUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkv KiBJbnRlcnJ1cHRzIHNob3VsZCBiZSBkaXNhYmxlZCBhbHJlYWR5IHRvIGF2b2lkIHJlLWFybWlu Zy4gKi8KIAlXQVJOX09OKGludGVsX2lycXNfZW5hYmxlZChkZXZfcHJpdikpOwogCisJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuIDwgNikKKwkJcmV0dXJuOworCiAJZmx1c2hfZGVsYXllZF93b3Jr KCZkZXZfcHJpdi0+cnBzLmRlbGF5ZWRfcmVzdW1lX3dvcmspOwogCi0JY2FuY2VsX3dvcmtfc3lu YygmZGV2X3ByaXYtPnJwcy53b3JrKTsKKwkvKgorCSAqIFRPRE86IGRpc2FibGUgUlBTIGludGVy cnVwdHMgb24gR0VOOSB0b28gb25jZSBSUFMgc3VwcG9ydAorCSAqIGlzIGFkZGVkIGZvciBpdC4K KwkgKi8KKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gIT0gOSkKKwkJZ2VuNl9kaXNhYmxlX3Jw c19pbnRlcnJ1cHRzKGRldik7CiAKIAkvKiBGb3JjZSBHUFUgdG8gbWluIGZyZXEgZHVyaW5nIHN1 c3BlbmQgKi8KIAlnZW42X3Jwc19pZGxlKGRldl9wcml2KTsKQEAgLTYyMTAsMTMgKzYyMTgsNiBA QCB2b2lkIGludGVsX2Rpc2FibGVfZ3RfcG93ZXJzYXZlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCWVsc2UKIAkJCWdlbjZfZGlzYWJsZV9ycHMoZGV2KTsKIAotCQkvKgotCQkgKiBUT0RPOiBk aXNhYmxlIFJQUyBpbnRlcnJ1cHRzIG9uIEdFTjkgdG9vIG9uY2UgUlBTIHN1cHBvcnQKLQkJICog aXMgYWRkZWQgZm9yIGl0LgotCQkgKi8KLQkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuICE9IDkp Ci0JCQlnZW42X2Rpc2FibGVfcnBzX2ludGVycnVwdHMoZGV2KTsKLQogCQlkZXZfcHJpdi0+cnBz LmVuYWJsZWQgPSBmYWxzZTsKIAkJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2sp OwogCX0KLS0gCjEuOC40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=