From: Imre Deak Subject: [PATCH v2 2/2] drm/i915: sanitize RPS resetting during GPU reset Date: Thu, 4 Dec 2014 14:59:32 +0200 Message-ID: <1417697972-29493-3-git-send-email-imre.deak@intel.com> References: <1417697972-29493-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id A27D36E6B3 for ; Thu, 4 Dec 2014 04:59:38 -0800 (PST) In-Reply-To: <1417697972-29493-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 QXRtLCB3ZSBkb24ndCBkaXNhYmxlIFJQUyBpbnRlcnJ1cHRzIGFuZCByZWxhdGVkIHdvcmsgaXRl bXMgYmVmb3JlCnJlc2V0dGluZyB0aGUgR1BVLiBUaGlzIG1heSBpbnRlcmZlcmUgd2l0aCB0aGUg Zm9sbG93aW5nIEdQVQppbml0aWFsaXphdGlvbiBhbmQgY2F1c2UgUlBTIGludGVycnVwdHMgdG8g c2hvdyB1cCBpbiBQTV9JSVIgdG9vIGVhcmx5CmJlZm9yZSBjYWxsaW5nIGdlbjZfZW5hYmxlX3Jw c19pbnRlcnJ1cHRzKCkgKHRyaWdnZXJpbmcgYSBXQVJOIHRoZXJlKS4KClNvbHZlIHRoaXMgYnkg ZGlzYWJsaW5nIFJQUyBpbnRlcnJ1cHRzIGFuZCBmbHVzaGluZyBhbnkgcmVsYXRlZCB3b3JrCml0 ZW1zIGJlZm9yZSByZXNldHRpbmcgdGhlIEdQVS4KCnYyOgotIHNwbGl0IG91dCB0aGUgY29tbW9u IHBhcnRzIG9mIHRoZSBndCBzdXNwZW5kIGFuZCB0aGUgbmV3IGd0IHJlc2V0CiAgZnVuY3Rpb25z IChQYXVsbykKClJlcG9ydGVkLWJ5OiBIZSwgU2h1YW5nIDxzaHVhbmcuaGVAaW50ZWwuY29tPgpU ZXN0Y2FzZTogaWd0L2dlbV9yZXNldF9zdGF0cy9iYW4tcmVuZGVyCkJ1Z3ppbGxhOiBodHRwczov L2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD04NjY0NApTaWduZWQtb2ZmLWJ5 OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYyB8ICA1ICsrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j IHwgMjggKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyMyBp bnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRl eCA3MWJlM2M5Li44Mzc3MjQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTgxMCw2ICs4 MTAsOSBAQCBpbnQgaTkxNV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmICghaTkx NS5yZXNldCkKIAkJcmV0dXJuIDA7CiAKKwlpZiAoZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYs IERSSVZFUl9NT0RFU0VUKSkKKwkJaW50ZWxfcmVzZXRfZ3RfcG93ZXJzYXZlKGRldik7CisKIAlt dXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKIAlpOTE1X2dlbV9yZXNldChkZXYpOwpA QCAtODgxLDcgKzg4NCw3IEBAIGludCBpOTE1X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCSAqIG9mIHJlLWluaXQgYWZ0ZXIgcmVzZXQuCiAJCSAqLwogCQlpZiAoSU5URUxfSU5GTyhk ZXYpLT5nZW4gPiA1KQotCQkJaW50ZWxfcmVzZXRfZ3RfcG93ZXJzYXZlKGRldik7CisJCQlpbnRl bF9lbmFibGVfZ3RfcG93ZXJzYXZlKGRldik7CiAJfSBlbHNlIHsKIAkJbXV0ZXhfdW5sb2NrKCZk ZXYtPnN0cnVjdF9tdXRleCk7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggNzg5MTFl Mi4uNDVjNzg2ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC02MDcyLDYgKzYwNzIsMjAg QEAgdm9pZCBpbnRlbF9jbGVhbnVwX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCQl2YWxsZXl2aWV3X2NsZWFudXBfZ3RfcG93ZXJzYXZlKGRldik7CiB9CiAKK3N0YXRpYyB2 b2lkIGdlbjZfc3VzcGVuZF9ycHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCisJZmx1c2hf ZGVsYXllZF93b3JrKCZkZXZfcHJpdi0+cnBzLmRlbGF5ZWRfcmVzdW1lX3dvcmspOworCisJLyoK KwkgKiBUT0RPOiBkaXNhYmxlIFJQUyBpbnRlcnJ1cHRzIG9uIEdFTjkrIHRvbyBvbmNlIFJQUyBz dXBwb3J0CisJICogaXMgYWRkZWQgZm9yIGl0LgorCSAqLworCWlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA8IDkpCisJCWdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhkZXYpOworfQorCiAvKioK ICAqIGludGVsX3N1c3BlbmRfZ3RfcG93ZXJzYXZlIC0gc3VzcGVuZCBQTSB3b3JrIGFuZCBoZWxw ZXIgdGhyZWFkcwogICogQGRldjogZHJtIGRldmljZQpAQCAtNjA4NywxNCArNjEwMSw3IEBAIHZv aWQgaW50ZWxfc3VzcGVuZF9ndF9wb3dlcnNhdmUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlp ZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA2KQogCQlyZXR1cm47CiAKLQlmbHVzaF9kZWxheWVk X3dvcmsoJmRldl9wcml2LT5ycHMuZGVsYXllZF9yZXN1bWVfd29yayk7Ci0KLQkvKgotCSAqIFRP RE86IGRpc2FibGUgUlBTIGludGVycnVwdHMgb24gR0VOOSsgdG9vIG9uY2UgUlBTIHN1cHBvcnQK LQkgKiBpcyBhZGRlZCBmb3IgaXQuCi0JICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwg OSkKLQkJZ2VuNl9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRzKGRldik7CisJZ2VuNl9zdXNwZW5kX3Jw cyhkZXYpOwogCiAJLyogRm9yY2UgR1BVIHRvIG1pbiBmcmVxIGR1cmluZyBzdXNwZW5kICovCiAJ Z2VuNl9ycHNfaWRsZShkZXZfcHJpdik7CkBAIC02MTk3LDggKzYyMDQsMTEgQEAgdm9pZCBpbnRl bF9yZXNldF9ndF9wb3dlcnNhdmUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCisJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuIDwgNikKKwkJcmV0dXJuOworCisJZ2VuNl9zdXNwZW5kX3Jwcyhk ZXYpOwogCWRldl9wcml2LT5ycHMuZW5hYmxlZCA9IGZhbHNlOwotCWludGVsX2VuYWJsZV9ndF9w b3dlcnNhdmUoZGV2KTsKIH0KIAogc3RhdGljIHZvaWQgaWJ4X2luaXRfY2xvY2tfZ2F0aW5nKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCi0tIAoxLjguNAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK