From: Sagar Arun Kamble Subject: drm/i915: Remove RPM suspend dependency on rps.enabled and related changes Date: Sun, 21 Aug 2016 11:49:54 +0530 Message-ID: <1471760418-27509-2-git-send-email-sagar.a.kamble@intel.com> References: <1471669765-5935-1-git-send-email-sagar.a.kamble@intel.com> <1471760418-27509-1-git-send-email-sagar.a.kamble@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA4F36E169 for ; Sun, 21 Aug 2016 06:17:58 +0000 (UTC) In-Reply-To: <1471760418-27509-1-git-send-email-sagar.a.kamble@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 Rm9yIEdlbjksIFJQTSBzdXNwZW5kIGlzIGZhaWxpbmcgaWYgcnBzLmVuYWJsZWQ9ZmFsc2UuIFRo aXMgaXMgbmVlZGVkIGZvcgpvdGhlciBwbGF0Zm9ybXMgYXMgUkM2IGFuZCBSUFMgZW5hYmxpbmcg aXMgaW5kaWNhdGVkIGJ5IHJwcy5lbmFibGVkLiBSUE0KU3VzcGVuZCBkZXBlbmRzIG9ubHkgb24g UkM2LCBzbyB3ZSBuZWVkIHRvIHJlbW92ZSB0aGUgY2hlY2sgb2YgcnBzLmVuYWJsZWQuCkZvciBH ZW45IFJDNiBhbmQgUlBTIGVuYWJsaW5nIGlzIHNlcGFyYXRlZCBoZW5jZSBkbyBycHMuZW5hYmxl ZCBjaGVjayBvbmx5CmZvciBub24tR2VuOSBwbGF0Zm9ybXMuIE9uY2UgUkM2IGFuZCBSUFMgZW5h YmxpbmcgaXMgc2VwYXJhdGVkIGZvciBvdGhlcgpHRU5zIHRoaXMgY2hlY2sgY2FuIGJlIGNvbXBs ZXRlbHkgcmVtb3ZlZC4KTW92ZWQgc2V0dGluZyBvZiBycHMuZW5hYmxlZCB0byBwbGF0Zm9ybSBs ZXZlbCBmdW5jdGlvbnMgYXMgdGhlcmUgaXMgY2FzZQpvZiBkaXNhYmxpbmcgb2YgUlBTIGluIGdl bjlfZW5hYmxlX3Jwcy4KCnYyOiBDaGFuZ2luZyBwYXJhbWV0ZXIgdG8gZGV2X3ByaXYgZm9yIElT X0dFTjkgYW5kIEhBU19SVU5USU1FX1BNIGFuZCBsaW5lCiAgICBzcGFjaW5nIGNoYW5nZXMuIChE YXZpZCkKICAgIGFuZCBjb21taXQgbWVzc2FnZSB1cGRhdGUgZm9yIGNoZWNrcGF0Y2ggaXNzdWVz LgoKUmV2aWV3ZWQtYnk6IERhdmlkIFdlaW5laGFsbCA8ZGF2aWQud2VpbmVoYWxsQGxpbnV4Lmlu dGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxl QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgICAg fCAxNCArKysrKysrKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAg ICAgIHwgMjAgKysrKysrKysrKysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3J1bnRpbWVfcG0uYyB8ICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyks IDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggMTNhZTM0MC4uZDVk MGE1MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0yMjg0LDEwICsyMjg0LDE4IEBAIHN0 YXRpYyBpbnQgaW50ZWxfcnVudGltZV9zdXNwZW5kKHN0cnVjdCBkZXZpY2UgKmRldmljZSkKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJaW50IHJl dDsKIAotCWlmIChXQVJOX09OX09OQ0UoIShkZXZfcHJpdi0+cnBzLmVuYWJsZWQgJiYgaW50ZWxf ZW5hYmxlX3JjNigpKSkpCisJaWYgKFdBUk5fT05fT05DRSghaW50ZWxfZW5hYmxlX3JjNigpKSkK IAkJcmV0dXJuIC1FTk9ERVY7CiAKLQlpZiAoV0FSTl9PTl9PTkNFKCFIQVNfUlVOVElNRV9QTShk ZXYpKSkKKwkvKgorCSAqIE9uY2UgUkM2IGFuZCBSUFMgZW5hYmxpbmcgaXMgc2VwYXJhdGVkIGZv ciBub24tR0VOOSBwbGF0Zm9ybXMKKwkgKiBiZWxvdyBjaGVjayBzaG91bGQgYmUgcmVtb3ZlZC4K KwkqLworCWlmICghSVNfR0VOOShkZXZfcHJpdikpCisJCWlmIChXQVJOX09OX09OQ0UoIWRldl9w cml2LT5ycHMuZW5hYmxlZCkpCisJCQlyZXR1cm4gLUVOT0RFVjsKKworCWlmIChXQVJOX09OX09O Q0UoIUhBU19SVU5USU1FX1BNKGRldl9wcml2KSkpCiAJCXJldHVybiAtRU5PREVWOwogCiAJRFJN X0RFQlVHX0tNUygiU3VzcGVuZGluZyBkZXZpY2VcbiIpOwpAQCAtMjM5MSw3ICsyMzk5LDcgQEAg c3RhdGljIGludCBpbnRlbF9ydW50aW1lX3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICpkZXZpY2UpCiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCWludCBy ZXQgPSAwOwogCi0JaWYgKFdBUk5fT05fT05DRSghSEFTX1JVTlRJTUVfUE0oZGV2KSkpCisJaWYg KFdBUk5fT05fT05DRSghSEFTX1JVTlRJTUVfUE0oZGV2X3ByaXYpKSkKIAkJcmV0dXJuIC1FTk9E RVY7CiAKIAlEUk1fREVCVUdfS01TKCJSZXN1bWluZyBkZXZpY2VcbiIpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKaW5kZXggOGE2NzUxZS4uNWE3MzY3MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CkBAIC00OTc5LDYgKzQ5NzksOCBAQCBzdGF0aWMgdm9pZCBnZW45X2Rpc2FibGVfcmM2KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHN0YXRpYyB2b2lkIGdlbjlfZGlzYWJsZV9y cHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCUk5MTVfV1JJVEUoR0VO Nl9SUF9DT05UUk9MLCAwKTsKKworCWRldl9wcml2LT5ycHMuZW5hYmxlZCA9IGZhbHNlOwogfQog CiBzdGF0aWMgdm9pZCBnZW42X2Rpc2FibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKQEAgLTQ5ODYsMTEgKzQ5ODgsMTUgQEAgc3RhdGljIHZvaWQgZ2VuNl9kaXNhYmxl X3JwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJSTkxNV9XUklURShHRU42 X1JDX0NPTlRST0wsIDApOwogCUk5MTVfV1JJVEUoR0VONl9SUE5TV1JFUSwgMSA8PCAzMSk7CiAJ STkxNV9XUklURShHRU42X1JQX0NPTlRST0wsIDApOworCisJZGV2X3ByaXYtPnJwcy5lbmFibGVk ID0gZmFsc2U7CiB9CiAKIHN0YXRpYyB2b2lkIGNoZXJyeXZpZXdfZGlzYWJsZV9ycHMoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCUk5MTVfV1JJVEUoR0VONl9SQ19DT05U Uk9MLCAwKTsKKworCWRldl9wcml2LT5ycHMuZW5hYmxlZCA9IGZhbHNlOwogfQogCiBzdGF0aWMg dm9pZCB2YWxsZXl2aWV3X2Rpc2FibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKQEAgLTUwMDIsNiArNTAwOCw4IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfZGlzYWJs ZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCUk5MTVfV1JJVEUoR0VO Nl9SQ19DT05UUk9MLCAwKTsKIAogCWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2 LCBGT1JDRVdBS0VfQUxMKTsKKworCWRldl9wcml2LT5ycHMuZW5hYmxlZCA9IGZhbHNlOwogfQog CiBzdGF0aWMgdm9pZCBpbnRlbF9wcmludF9yYzZfaW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsIHUzMiBtb2RlKQpAQCAtNTIxOSw2ICs1MjI3LDggQEAgc3RhdGljIHZvaWQg Z2VuOV9lbmFibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXNl dF9ycHMoZGV2X3ByaXYsIGdlbjZfc2V0X3Jwcyk7CiAKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtl X3B1dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CisKKwlkZXZfcHJpdi0+cnBzLmVuYWJsZWQg PSB0cnVlOwogfQogCiBzdGF0aWMgdm9pZCBnZW45X2VuYWJsZV9yYzYoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQpAQCAtNTM2Miw2ICs1MzcyLDggQEAgc3RhdGljIHZvaWQgZ2Vu OF9lbmFibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXNldF9y cHMoZGV2X3ByaXYsIGdlbjZfc2V0X3Jwcyk7CiAKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1 dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CisKKwlkZXZfcHJpdi0+cnBzLmVuYWJsZWQgPSB0 cnVlOwogfQogCiBzdGF0aWMgdm9pZCBnZW42X2VuYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQpAQCAtNTQ1OCw2ICs1NDcwLDggQEAgc3RhdGljIHZvaWQgZ2VuNl9l bmFibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAl9CiAKIAlpbnRl bF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CisKKwlkZXZf cHJpdi0+cnBzLmVuYWJsZWQgPSB0cnVlOwogfQogCiBzdGF0aWMgdm9pZCBnZW42X3VwZGF0ZV9y aW5nX2ZyZXEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpAQCAtNTkzMiw2ICs1 OTQ2LDggQEAgc3RhdGljIHZvaWQgY2hlcnJ5dmlld19lbmFibGVfcnBzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXNldF9ycHMoZGV2X3ByaXYsIHZhbGxleXZpZXdfc2V0 X3Jwcyk7CiAKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgRk9SQ0VXQUtF X0FMTCk7CisKKwlkZXZfcHJpdi0+cnBzLmVuYWJsZWQgPSB0cnVlOwogfQogCiBzdGF0aWMgdm9p ZCB2YWxsZXl2aWV3X2VuYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQpAQCAtNjAxMiw2ICs2MDI4LDggQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19lbmFibGVfcnBz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXNldF9ycHMoZGV2X3ByaXYs IHZhbGxleXZpZXdfc2V0X3Jwcyk7CiAKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZf cHJpdiwgRk9SQ0VXQUtFX0FMTCk7CisKKwlkZXZfcHJpdi0+cnBzLmVuYWJsZWQgPSB0cnVlOwog fQogCiBzdGF0aWMgdW5zaWduZWQgbG9uZyBpbnRlbF9weGZyZXEodTMyIHZpZGZyZXEpCkBAIC02 NjAxLDcgKzY2MTksNiBAQCB2b2lkIGludGVsX2Rpc2FibGVfZ3RfcG93ZXJzYXZlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJaXJvbmxha2VfZGlzYWJsZV9kcnBzKGRldl9w cml2KTsKIAl9CiAKLQlkZXZfcHJpdi0+cnBzLmVuYWJsZWQgPSBmYWxzZTsKIAltdXRleF91bmxv Y2soJmRldl9wcml2LT5ycHMuaHdfbG9jayk7CiB9CiAKQEAgLTY2NDUsNyArNjY2Miw2IEBAIHZv aWQgaW50ZWxfZW5hYmxlX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJV0FSTl9PTihkZXZfcHJpdi0+cnBzLmVmZmljaWVudF9mcmVxIDwgZGV2X3ByaXYt PnJwcy5taW5fZnJlcSk7CiAJV0FSTl9PTihkZXZfcHJpdi0+cnBzLmVmZmljaWVudF9mcmVxID4g ZGV2X3ByaXYtPnJwcy5tYXhfZnJlcSk7CiAKLQlkZXZfcHJpdi0+cnBzLmVuYWJsZWQgPSB0cnVl OwogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnJwcy5od19sb2NrKTsKIH0KIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCmluZGV4IGExZDczYzIuLmQ4NmQ5ZTkgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAgLTI3NjgsNyArMjc2OCw3IEBA IHZvaWQgaW50ZWxfcnVudGltZV9wbV9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCSAqIHNvIHRoZSBkcml2ZXIncyBvd24gUlBNIHJlZmVyZW5jZSB0cmFja2luZyBh c3NlcnRzIGFsc28gd29yayBvbgogCSAqIHBsYXRmb3JtcyB3aXRob3V0IFJQTSBzdXBwb3J0Lgog CSAqLwotCWlmICghSEFTX1JVTlRJTUVfUE0oZGV2KSkgeworCWlmICghSEFTX1JVTlRJTUVfUE0o ZGV2X3ByaXYpKSB7CiAJCXBtX3J1bnRpbWVfZG9udF91c2VfYXV0b3N1c3BlbmQoZGV2aWNlKTsK IAkJcG1fcnVudGltZV9nZXRfc3luYyhkZXZpY2UpOwogCX0gZWxzZSB7Ci0tIAoxLjkuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==