From: Sagar Arun Kamble Subject: [PATCH 04/31] drm/i915: Separate RPS and RC6 handling for VLV Date: Tue, 19 Sep 2017 23:11:40 +0530 Message-ID: <1505842927-13327-5-git-send-email-sagar.a.kamble@intel.com> References: <1505842927-13327-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id E6FE06E607 for ; Tue, 19 Sep 2017 17:38:51 +0000 (UTC) In-Reply-To: <1505842927-13327-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 VGhpcyBwYXRjaCBzZXBhcmF0ZXMgZW5hYmxlL2Rpc2FibGUgb2YgUkM2IGFuZCBSUFMgZm9yIFZM Vi4KCkNjOiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogU2FnYXIgQXJ1biBLYW1i bGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYyB8IDEyICstLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jICAgICB8IDU3ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDIgZmls ZXMgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCAzZTQ2NzdiLi44MTI2YzJjIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMTQ1NCwyMSArMTQ1NCwxMSBAQCBzdGF0aWMgdm9pZCBw cmludF9yYzZfcmVzKHN0cnVjdCBzZXFfZmlsZSAqbSwKIHN0YXRpYyBpbnQgdmx2X2RycGNfaW5m byhzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gbm9kZV90b19pOTE1KG0tPnByaXZhdGUpOwotCXUzMiBycG1vZGVjdGwxLCByY2N0bDEs IHB3X3N0YXR1czsKKwl1MzIgcmNjdGwxLCBwd19zdGF0dXM7CiAKIAlwd19zdGF0dXMgPSBJOTE1 X1JFQUQoVkxWX0dUTENfUFdfU1RBVFVTKTsKLQlycG1vZGVjdGwxID0gSTkxNV9SRUFEKEdFTjZf UlBfQ09OVFJPTCk7CiAJcmNjdGwxID0gSTkxNV9SRUFEKEdFTjZfUkNfQ09OVFJPTCk7CiAKLQlz ZXFfcHJpbnRmKG0sICJWaWRlbyBUdXJibyBNb2RlOiAlc1xuIiwKLQkJICAgeWVzbm8ocnBtb2Rl Y3RsMSAmIEdFTjZfUlBfTUVESUFfVFVSQk8pKTsKLQlzZXFfcHJpbnRmKG0sICJUdXJibyBlbmFi bGVkOiAlc1xuIiwKLQkJICAgeWVzbm8ocnBtb2RlY3RsMSAmIEdFTjZfUlBfRU5BQkxFKSk7Ci0J c2VxX3ByaW50ZihtLCAiSFcgY29udHJvbCBlbmFibGVkOiAlc1xuIiwKLQkJICAgeWVzbm8ocnBt b2RlY3RsMSAmIEdFTjZfUlBfRU5BQkxFKSk7Ci0Jc2VxX3ByaW50ZihtLCAiU1cgY29udHJvbCBl bmFibGVkOiAlc1xuIiwKLQkJICAgeWVzbm8oKHJwbW9kZWN0bDEgJiBHRU42X1JQX01FRElBX01P REVfTUFTSykgPT0KLQkJCSAgR0VONl9SUF9NRURJQV9TV19NT0RFKSk7CiAJc2VxX3ByaW50Ziht LCAiUkM2IEVuYWJsZWQ6ICVzXG4iLAogCQkgICB5ZXNubyhyY2N0bDEgJiAoR0VON19SQ19DVExf VE9fTU9ERSB8CiAJCQkJCUdFTjZfUkNfQ1RMX0VJX01PREUoMSkpKSk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwppbmRleCA2ZGU2OWFlLi44YmJlMDM3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK QEAgLTYzNDIsNyArNjM0Miw3IEBAIHN0YXRpYyB2b2lkIGNoZXJyeXZpZXdfZGlzYWJsZV9ycHMo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCUk5MTVfV1JJVEUoR0VONl9SQ19D T05UUk9MLCAwKTsKIH0KIAotc3RhdGljIHZvaWQgdmFsbGV5dmlld19kaXNhYmxlX3JwcyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2Rp c2FibGVfcmM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAkvKiB3ZSdy ZSBkb2luZyBmb3JjZXdha2UgYmVmb3JlIERpc2FibGluZyBSQzYsCiAJICogVGhpcyB3aGF0IHRo ZSBCSU9TIGV4cGVjdHMgd2hlbiBnb2luZyBpbnRvIHN1c3BlbmQgKi8KQEAgLTYzNTMsNiArNjM1 MywxMSBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2Rpc2FibGVfcnBzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJp diwgRk9SQ0VXQUtFX0FMTCk7CiB9CiAKK3N0YXRpYyB2b2lkIHZhbGxleXZpZXdfZGlzYWJsZV9y cHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCUk5MTVfV1JJVEUoR0VO Nl9SUF9DT05UUk9MLCAwKTsKK30KKwogc3RhdGljIHZvaWQgaW50ZWxfcHJpbnRfcmM2X2luZm8o c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgbW9kZSkKIHsKIAlpZiAoSVNf VkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKQEAgLTcy ODAsMTEgKzcyODUsMTEgQEAgc3RhdGljIHZvaWQgY2hlcnJ5dmlld19lbmFibGVfcnBzKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1 dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiB9CiAKLXN0YXRpYyB2b2lkIHZhbGxleXZpZXdf ZW5hYmxlX3JwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9p ZCB2YWxsZXl2aWV3X2VuYWJsZV9yYzYoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAllbnVtIGludGVsX2VuZ2lu ZV9pZCBpZDsKLQl1MzIgZ3RmaWZvZGJnLCB2YWwsIHJjNl9tb2RlID0gMDsKKwl1MzIgZ3RmaWZv ZGJnLCByYzZfbW9kZSA9IDA7CiAKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmRldl9wcml2 LT5ycHMuaHdfbG9jaykpOwogCkBAIC03MzAzLDIyICs3MzA4LDYgQEAgc3RhdGljIHZvaWQgdmFs bGV5dmlld19lbmFibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkv KiAgRGlzYWJsZSBSQyBzdGF0ZXMuICovCiAJSTkxNV9XUklURShHRU42X1JDX0NPTlRST0wsIDAp OwogCi0JSTkxNV9XUklURShHRU42X1JQX0RPV05fVElNRU9VVCwgMTAwMDAwMCk7Ci0JSTkxNV9X UklURShHRU42X1JQX1VQX1RIUkVTSE9MRCwgNTk0MDApOwotCUk5MTVfV1JJVEUoR0VONl9SUF9E T1dOX1RIUkVTSE9MRCwgMjQ1MDAwKTsKLQlJOTE1X1dSSVRFKEdFTjZfUlBfVVBfRUksIDY2MDAw KTsKLQlJOTE1X1dSSVRFKEdFTjZfUlBfRE9XTl9FSSwgMzUwMDAwKTsKLQotCUk5MTVfV1JJVEUo R0VONl9SUF9JRExFX0hZU1RFUlNJUywgMTApOwotCi0JSTkxNV9XUklURShHRU42X1JQX0NPTlRS T0wsCi0JCSAgIEdFTjZfUlBfTUVESUFfVFVSQk8gfAotCQkgICBHRU42X1JQX01FRElBX0hXX05P Uk1BTF9NT0RFIHwKLQkJICAgR0VONl9SUF9NRURJQV9JU19HRlggfAotCQkgICBHRU42X1JQX0VO QUJMRSB8Ci0JCSAgIEdFTjZfUlBfVVBfQlVTWV9BVkcgfAotCQkgICBHRU42X1JQX0RPV05fSURM RV9DT05UKTsKLQogCUk5MTVfV1JJVEUoR0VONl9SQzZfV0FLRV9SQVRFX0xJTUlULCAweDAwMjgw MDAwKTsKIAlJOTE1X1dSSVRFKEdFTjZfUkNfRVZBTFVBVElPTl9JTlRFUlZBTCwgMTI1MDAwKTsK IAlJOTE1X1dSSVRFKEdFTjZfUkNfSURMRV9IWVNURVJTSVMsIDI1KTsKQEAgLTczNDMsNiArNzMz MiwzNCBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2VuYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCiAJSTkxNV9XUklURShHRU42X1JDX0NPTlRST0wsIHJjNl9t b2RlKTsKIAorCWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0Vf QUxMKTsKK30KKworc3RhdGljIHZvaWQgdmFsbGV5dmlld19lbmFibGVfcnBzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwl1MzIgdmFsOworCisJV0FSTl9PTighbXV0ZXhf aXNfbG9ja2VkKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spKTsKKworCS8qIElmIFZMViwgRm9yY2V3 YWtlIGFsbCB3ZWxscywgZWxzZSByZS1kaXJlY3QgdG8gcmVndWxhciBwYXRoICovCisJaW50ZWxf dW5jb3JlX2ZvcmNld2FrZV9nZXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOworCisJSTkxNV9X UklURShHRU42X1JQX0RPV05fVElNRU9VVCwgMTAwMDAwMCk7CisJSTkxNV9XUklURShHRU42X1JQ X1VQX1RIUkVTSE9MRCwgNTk0MDApOworCUk5MTVfV1JJVEUoR0VONl9SUF9ET1dOX1RIUkVTSE9M RCwgMjQ1MDAwKTsKKwlJOTE1X1dSSVRFKEdFTjZfUlBfVVBfRUksIDY2MDAwKTsKKwlJOTE1X1dS SVRFKEdFTjZfUlBfRE9XTl9FSSwgMzUwMDAwKTsKKworCUk5MTVfV1JJVEUoR0VONl9SUF9JRExF X0hZU1RFUlNJUywgMTApOworCisJSTkxNV9XUklURShHRU42X1JQX0NPTlRST0wsCisJCSAgIEdF TjZfUlBfTUVESUFfVFVSQk8gfAorCQkgICBHRU42X1JQX01FRElBX0hXX05PUk1BTF9NT0RFIHwK KwkJICAgR0VONl9SUF9NRURJQV9JU19HRlggfAorCQkgICBHRU42X1JQX0VOQUJMRSB8CisJCSAg IEdFTjZfUlBfVVBfQlVTWV9BVkcgfAorCQkgICBHRU42X1JQX0RPV05fSURMRV9DT05UKTsKKwog CS8qIFNldHRpbmcgRml4ZWQgQmlhcyAqLwogCXZhbCA9IFZMVl9PVkVSUklERV9FTiB8CiAJCSAg VkxWX1NPQ19URFBfRU4gfApAQCAtNzk0Miw2ICs3OTU5LDcgQEAgdm9pZCBpbnRlbF9kaXNhYmxl X2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfSBlbHNl IGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQljaGVycnl2aWV3X2Rpc2FibGVfcnBz KGRldl9wcml2KTsKIAl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKSB7CisJCXZh bGxleXZpZXdfZGlzYWJsZV9yYzYoZGV2X3ByaXYpOwogCQl2YWxsZXl2aWV3X2Rpc2FibGVfcnBz KGRldl9wcml2KTsKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikgewogCQln ZW42X2Rpc2FibGVfcmM2KGRldl9wcml2KTsKQEAgLTc5NzEsNiArNzk4OSw3IEBAIHZvaWQgaW50 ZWxfZW5hYmxlX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWNoZXJyeXZpZXdfZW5hYmxlX3Jw cyhkZXZfcHJpdik7CiAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkgeworCQl2 YWxsZXl2aWV3X2VuYWJsZV9yYzYoZGV2X3ByaXYpOwogCQl2YWxsZXl2aWV3X2VuYWJsZV9ycHMo ZGV2X3ByaXYpOwogCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7CiAJCWdl bjlfZW5hYmxlX3JjNihkZXZfcHJpdik7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==