From: Imre Deak Subject: [PATCH v3 2/2] drm/i915: sanitize RPS resetting during GPU reset Date: Mon, 15 Dec 2014 18:59:28 +0200 Message-ID: <1418662768-29085-2-git-send-email-imre.deak@intel.com> References: <1418662768-29085-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 567526E56E for ; Mon, 15 Dec 2014 08:59:45 -0800 (PST) In-Reply-To: <1418662768-29085-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, Jani Nikula List-Id: intel-gfx@lists.freedesktop.org QXRtLCB3ZSBkb24ndCBkaXNhYmxlIFJQUyBpbnRlcnJ1cHRzIGFuZCByZWxhdGVkIHdvcmsgaXRl bXMgYmVmb3JlCnJlc2V0dGluZyB0aGUgR1BVLiBUaGlzIG1heSBpbnRlcmZlcmUgd2l0aCB0aGUg Zm9sbG93aW5nIEdQVQppbml0aWFsaXphdGlvbiBhbmQgY2F1c2UgUlBTIGludGVycnVwdHMgdG8g c2hvdyB1cCBpbiBQTV9JSVIgdG9vIGVhcmx5CmJlZm9yZSBjYWxsaW5nIGdlbjZfZW5hYmxlX3Jw c19pbnRlcnJ1cHRzKCkgKHRyaWdnZXJpbmcgYSBXQVJOIHRoZXJlKS4KClNvbHZlIHRoaXMgYnkg ZGlzYWJsaW5nIFJQUyBpbnRlcnJ1cHRzIGFuZCBmbHVzaGluZyBhbnkgcmVsYXRlZCB3b3JrCml0 ZW1zIGJlZm9yZSByZXNldHRpbmcgdGhlIEdQVS4KCnYyOgotIHNwbGl0IG91dCB0aGUgY29tbW9u IHBhcnRzIG9mIHRoZSBndCBzdXNwZW5kIGFuZCB0aGUgbmV3IGd0IHJlc2V0CiAgZnVuY3Rpb25z IChQYXVsbykKdjM6Ci0gcmVtb3ZlIHRoZSBjaGVjayBmb3IgVU1TLCBpdCdzIGEgTk9QIG5vd2Fk YXlzIChEYW5pZWwpCgpSZXBvcnRlZC1ieTogSGUsIFNodWFuZyA8c2h1YW5nLmhlQGludGVsLmNv bT4KVGVzdGNhc2U6IGlndC9nZW1fcmVzZXRfc3RhdHMvYmFuLXJlbmRlcgpCdWd6aWxsYTogaHR0 cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY2NDQKU2lnbmVkLW9m Zi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogUGF1bG8g WmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYyB8ICA0ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg fCAyOCArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIyIGlu c2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4 IGY5OTBhYjQuLmZjOGNmZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtODExLDYgKzgx MSw4IEBAIGludCBpOTE1X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKCFpOTE1 LnJlc2V0KQogCQlyZXR1cm4gMDsKIAorCWludGVsX3Jlc2V0X2d0X3Bvd2Vyc2F2ZShkZXYpOwor CiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCiAJaTkxNV9nZW1fcmVzZXQoZGV2 KTsKQEAgLTg4MCw3ICs4ODIsNyBAQCBpbnQgaTkxNV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCQkgKiBvZiByZS1pbml0IGFmdGVyIHJlc2V0LgogCQkgKi8KIAkJaWYgKElOVEVMX0lO Rk8oZGV2KS0+Z2VuID4gNSkKLQkJCWludGVsX3Jlc2V0X2d0X3Bvd2Vyc2F2ZShkZXYpOworCQkJ aW50ZWxfZW5hYmxlX2d0X3Bvd2Vyc2F2ZShkZXYpOwogCX0gZWxzZSB7CiAJCW11dGV4X3VubG9j aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDFm NGI1NmUuLjk2NGIyOGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNjE5MSw2ICs2MTkx LDIwIEBAIHZvaWQgaW50ZWxfY2xlYW51cF9ndF9wb3dlcnNhdmUoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJdmFsbGV5dmlld19jbGVhbnVwX2d0X3Bvd2Vyc2F2ZShkZXYpOwogfQogCitzdGF0 aWMgdm9pZCBnZW42X3N1c3BlbmRfcnBzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKworCWZs dXNoX2RlbGF5ZWRfd29yaygmZGV2X3ByaXYtPnJwcy5kZWxheWVkX3Jlc3VtZV93b3JrKTsKKwor CS8qCisJICogVE9ETzogZGlzYWJsZSBSUFMgaW50ZXJydXB0cyBvbiBHRU45KyB0b28gb25jZSBS UFMgc3VwcG9ydAorCSAqIGlzIGFkZGVkIGZvciBpdC4KKwkgKi8KKwlpZiAoSU5URUxfSU5GTyhk ZXYpLT5nZW4gPCA5KQorCQlnZW42X2Rpc2FibGVfcnBzX2ludGVycnVwdHMoZGV2KTsKK30KKwog LyoqCiAgKiBpbnRlbF9zdXNwZW5kX2d0X3Bvd2Vyc2F2ZSAtIHN1c3BlbmQgUE0gd29yayBhbmQg aGVscGVyIHRocmVhZHMKICAqIEBkZXY6IGRybSBkZXZpY2UKQEAgLTYyMDYsMTQgKzYyMjAsNyBA QCB2b2lkIGludGVsX3N1c3BlbmRfZ3RfcG93ZXJzYXZlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNikKIAkJcmV0dXJuOwogCi0JZmx1c2hfZGVs YXllZF93b3JrKCZkZXZfcHJpdi0+cnBzLmRlbGF5ZWRfcmVzdW1lX3dvcmspOwotCi0JLyoKLQkg KiBUT0RPOiBkaXNhYmxlIFJQUyBpbnRlcnJ1cHRzIG9uIEdFTjkrIHRvbyBvbmNlIFJQUyBzdXBw b3J0Ci0JICogaXMgYWRkZWQgZm9yIGl0LgotCSAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdl biA8IDkpCi0JCWdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhkZXYpOworCWdlbjZfc3VzcGVu ZF9ycHMoZGV2KTsKIAogCS8qIEZvcmNlIEdQVSB0byBtaW4gZnJlcSBkdXJpbmcgc3VzcGVuZCAq LwogCWdlbjZfcnBzX2lkbGUoZGV2X3ByaXYpOwpAQCAtNjMxNiw4ICs2MzIzLDExIEBAIHZvaWQg aW50ZWxfcmVzZXRfZ3RfcG93ZXJzYXZlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAorCWlm IChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDYpCisJCXJldHVybjsKKworCWdlbjZfc3VzcGVuZF9y cHMoZGV2KTsKIAlkZXZfcHJpdi0+cnBzLmVuYWJsZWQgPSBmYWxzZTsKLQlpbnRlbF9lbmFibGVf Z3RfcG93ZXJzYXZlKGRldik7CiB9CiAKIHN0YXRpYyB2b2lkIGlieF9pbml0X2Nsb2NrX2dhdGlu ZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQotLSAKMS44LjQKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==