From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 2/2] drm/i915: sanitize RPS resetting during GPU reset Date: Thu, 20 Nov 2014 23:01:48 +0200 Message-ID: <1416517308-12934-2-git-send-email-imre.deak@intel.com> References: <1416517308-12934-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 11FB96ECCE for ; Thu, 20 Nov 2014 13:02:51 -0800 (PST) In-Reply-To: <1416517308-12934-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 QXRtLCB3ZSBkb24ndCBkaXNhYmxlIFJQUyBpbnRlcnJ1cHRzIGFuZCByZWxhdGVkIHdvcmsgaXRl bXMgYmVmb3JlCnJlc2V0dGluZyB0aGUgR1BVLiBUaGlzIG1heSBpbnRlcmZlcmUgd2l0aCB0aGUg Zm9sbG93aW5nIEdQVQppbml0aWFsaXphdGlvbiBhbmQgY2F1c2UgUlBTIGludGVycnVwdHMgdG8g c2hvdyB1cCBpbiBQTV9JSVIgdG9vIGVhcmx5CmJlZm9yZSBjYWxsaW5nIGdlbjZfZW5hYmxlX3Jw c19pbnRlcnJ1cHRzKCkgKHRyaWdnZXJpbmcgYSBXQVJOIHRoZXJlKS4KClNvbHZlIHRoaXMgYnkg ZGlzYWJsaW5nIFJQUyBpbnRlcnJ1cHRzIGFuZCBmbHVzaGluZyBhbnkgcmVsYXRlZCB3b3JrCml0 ZW1zIGJlZm9yZSByZXNldHRpbmcgdGhlIEdQVS4KClJlcG9ydGVkLWJ5OiBIZSwgU2h1YW5nIDxz aHVhbmcuaGVAaW50ZWwuY29tPgpUZXN0Y2FzZTogaWd0L2dlbV9yZXNldF9zdGF0cy9iYW4tcmVu ZGVyClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIHwgIDUgKysrKy0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMgfCAxNCArKysrKysrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAx NyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmlu ZGV4IDFkZjQwNzkuLjkzZjNkZjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtODEwLDYg KzgxMCw5IEBAIGludCBpOTE1X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKCFp OTE1LnJlc2V0KQogCQlyZXR1cm4gMDsKIAorCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJlKGRl diwgRFJJVkVSX01PREVTRVQpKQorCQlpbnRlbF9yZXNldF9ndF9wb3dlcnNhdmUoZGV2KTsKKwog CW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAogCWk5MTVfZ2VtX3Jlc2V0KGRldik7 CkBAIC04NzksNyArODgyLDcgQEAgaW50IGk5MTVfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkJICogb2YgcmUtaW5pdCBhZnRlciByZXNldC4KIAkJICovCiAJCWlmIChJTlRFTF9JTkZP KGRldiktPmdlbiA+IDUpCi0JCQlpbnRlbF9yZXNldF9ndF9wb3dlcnNhdmUoZGV2KTsKKwkJCWlu dGVsX2VuYWJsZV9ndF9wb3dlcnNhdmUoZGV2KTsKIAl9IGVsc2UgewogCQltdXRleF91bmxvY2so JmRldi0+c3RydWN0X211dGV4KTsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBlMzYx MDE0Li45NDE3ZjhmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTYzMTYsOCArNjMxNiwy MCBAQCB2b2lkIGludGVsX3Jlc2V0X2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CiAKKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA2KQorCQlyZXR1cm47CisKKwlmbHVz aF9kZWxheWVkX3dvcmsoJmRldl9wcml2LT5ycHMuZGVsYXllZF9yZXN1bWVfd29yayk7CisKKwkv KgorCSAqIFRPRE86IGRpc2FibGUgUlBTIGludGVycnVwdHMgb24gR0VOOSsgdG9vIG9uY2UgUlBT IHN1cHBvcnQKKwkgKiBpcyBhZGRlZCBmb3IgaXQuCisJICovCisJaWYgKElOVEVMX0lORk8oZGV2 KS0+Z2VuIDwgOSkKKwkJZ2VuNl9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRzKGRldik7CisKIAlkZXZf cHJpdi0+cnBzLmVuYWJsZWQgPSBmYWxzZTsKLQlpbnRlbF9lbmFibGVfZ3RfcG93ZXJzYXZlKGRl dik7CisKIH0KIAogc3RhdGljIHZvaWQgaWJ4X2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCi0tIAoxLjguNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK