From: Sagar Arun Kamble Subject: [PATCH 02/31] drm/i915: Separate RPS and RC6 handling for gen6+ Date: Tue, 19 Sep 2017 23:11:38 +0530 Message-ID: <1505842927-13327-3-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 A313B6E5F3 for ; Tue, 19 Sep 2017 17:38:48 +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 VGhpcyBwYXRjaCBzZXBhcmF0ZXMgZW5hYmxlL2Rpc2FibGUgb2YgUkM2IGFuZCBSUFMgZm9yIGdl bjYrCnBsYXRmb3JtcyBwcmlvciB0byBWTFYuCgpDYzogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50 ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25l ZC1vZmYtYnk6IFNhZ2FyIEFydW4gS2FtYmxlIDxzYWdhci5hLmthbWJsZUBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgfCAxNyArKysrKysrLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgfCA0NCArKysrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDM4IGluc2VydGlvbnMo KyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXgg Y2E2ZmE2ZC4uM2U0Njc3YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTEx MzYsNiArMTEzNiwxMyBAQCBzdGF0aWMgaW50IGk5MTVfZnJlcXVlbmN5X2luZm8oc3RydWN0IHNl cV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAJCQlwbV9paXIgPSBJOTE1X1JFQUQoR0VOOF9HVF9J SVIoMikpOwogCQkJcG1fbWFzayA9IEk5MTVfUkVBRChHRU42X1BNSU5UUk1TSyk7CiAJCX0KKwkJ c2VxX3ByaW50ZihtLCAiVmlkZW8gVHVyYm8gTW9kZTogJXNcbiIsCisJCQkgICB5ZXNubyhycG1v ZGVjdGwgJiBHRU42X1JQX01FRElBX1RVUkJPKSk7CisJCXNlcV9wcmludGYobSwgIkhXIGNvbnRy b2wgZW5hYmxlZDogJXNcbiIsCisJCQkgICB5ZXNubyhycG1vZGVjdGwgJiBHRU42X1JQX0VOQUJM RSkpOworCQlzZXFfcHJpbnRmKG0sICJTVyBjb250cm9sIGVuYWJsZWQ6ICVzXG4iLAorCQkJICAg eWVzbm8oKHJwbW9kZWN0bCAmIEdFTjZfUlBfTUVESUFfTU9ERV9NQVNLKSA9PQorCQkJCSAgR0VO Nl9SUF9NRURJQV9TV19NT0RFKSk7CiAJCXNlcV9wcmludGYobSwgIlBNIElFUj0weCUwOHggSU1S PTB4JTA4eCBJU1I9MHglMDh4IElJUj0weCUwOHgsIE1BU0s9MHglMDh4XG4iLAogCQkJICAgcG1f aWVyLCBwbV9pbXIsIHBtX2lzciwgcG1faWlyLCBwbV9tYXNrKTsKIAkJc2VxX3ByaW50ZihtLCAi cG1faW50cm1za19tYno6IDB4JTA4eFxuIiwKQEAgLTE0NzksNyArMTQ4Niw3IEBAIHN0YXRpYyBp bnQgdmx2X2RycGNfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCiBzdGF0aWMgaW50IGdlbjZfZHJw Y19pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBub2RlX3RvX2k5MTUobS0+cHJpdmF0ZSk7Ci0JdTMyIHJwbW9kZWN0bDEsIGd0 X2NvcmVfc3RhdHVzLCByY2N0bDEsIHJjNnZpZHMgPSAwOworCXUzMiBndF9jb3JlX3N0YXR1cywg cmNjdGwxLCByYzZ2aWRzID0gMDsKIAl1MzIgZ2VuOV9wb3dlcmdhdGVfZW5hYmxlID0gMCwgZ2Vu OV9wb3dlcmdhdGVfc3RhdHVzID0gMDsKIAl1bnNpZ25lZCBmb3JjZXdha2VfY291bnQ7CiAJaW50 IGNvdW50ID0gMDsKQEAgLTE0OTgsNyArMTUwNSw2IEBAIHN0YXRpYyBpbnQgZ2VuNl9kcnBjX2lu Zm8oc3RydWN0IHNlcV9maWxlICptKQogCWd0X2NvcmVfc3RhdHVzID0gSTkxNV9SRUFEX0ZXKEdF TjZfR1RfQ09SRV9TVEFUVVMpOwogCXRyYWNlX2k5MTVfcmVnX3J3KGZhbHNlLCBHRU42X0dUX0NP UkVfU1RBVFVTLCBndF9jb3JlX3N0YXR1cywgNCwgdHJ1ZSk7CiAKLQlycG1vZGVjdGwxID0gSTkx NV9SRUFEKEdFTjZfUlBfQ09OVFJPTCk7CiAJcmNjdGwxID0gSTkxNV9SRUFEKEdFTjZfUkNfQ09O VFJPTCk7CiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkgewogCQlnZW45X3Bvd2VyZ2F0 ZV9lbmFibGUgPSBJOTE1X1JFQUQoR0VOOV9QR19FTkFCTEUpOwpAQCAtMTUwOSwxMyArMTUxNSw2 IEBAIHN0YXRpYyBpbnQgZ2VuNl9kcnBjX2luZm8oc3RydWN0IHNlcV9maWxlICptKQogCXNhbmR5 YnJpZGdlX3Bjb2RlX3JlYWQoZGV2X3ByaXYsIEdFTjZfUENPREVfUkVBRF9SQzZWSURTLCAmcmM2 dmlkcyk7CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spOwogCi0Jc2VxX3By aW50ZihtLCAiVmlkZW8gVHVyYm8gTW9kZTogJXNcbiIsCi0JCSAgIHllc25vKHJwbW9kZWN0bDEg JiBHRU42X1JQX01FRElBX1RVUkJPKSk7Ci0Jc2VxX3ByaW50ZihtLCAiSFcgY29udHJvbCBlbmFi bGVkOiAlc1xuIiwKLQkJICAgeWVzbm8ocnBtb2RlY3RsMSAmIEdFTjZfUlBfRU5BQkxFKSk7Ci0J c2VxX3ByaW50ZihtLCAiU1cgY29udHJvbCBlbmFibGVkOiAlc1xuIiwKLQkJICAgeWVzbm8oKHJw bW9kZWN0bDEgJiBHRU42X1JQX01FRElBX01PREVfTUFTSykgPT0KLQkJCSAgR0VONl9SUF9NRURJ QV9TV19NT0RFKSk7CiAJc2VxX3ByaW50ZihtLCAiUkMxZSBFbmFibGVkOiAlc1xuIiwKIAkJICAg eWVzbm8ocmNjdGwxICYgR0VONl9SQ19DVExfUkMxZV9FTkFCTEUpKTsKIAlzZXFfcHJpbnRmKG0s ICJSQzYgRW5hYmxlZDogJXNcbiIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBhZGZlYjdi Li5mNzhhMWU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTYzMjYsOSArNjMyNiwxMyBA QCBzdGF0aWMgdm9pZCBnZW45X2Rpc2FibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAlJOTE1X1dSSVRFKEdFTjZfUlBfQ09OVFJPTCwgMCk7CiB9CiAKLXN0YXRpYyB2 b2lkIGdlbjZfZGlzYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQor c3RhdGljIHZvaWQgZ2VuNl9kaXNhYmxlX3JjNihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiB7CiAJSTkxNV9XUklURShHRU42X1JDX0NPTlRST0wsIDApOworfQorCitzdGF0aWMg dm9pZCBnZW42X2Rpc2FibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK K3sKIAlJOTE1X1dSSVRFKEdFTjZfUlBOU1dSRVEsIDEgPDwgMzEpOwogCUk5MTVfV1JJVEUoR0VO Nl9SUF9DT05UUk9MLCAwKTsKIH0KQEAgLTY2ODYsNyArNjY5MCw3IEBAIHN0YXRpYyB2b2lkIGdl bjhfZW5hYmxlX3JwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaW50ZWxf dW5jb3JlX2ZvcmNld2FrZV9wdXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwogfQogCi1zdGF0 aWMgdm9pZCBnZW42X2VuYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQorc3RhdGljIHZvaWQgZ2VuNl9lbmFibGVfcmM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJZW51bSBpbnRl bF9lbmdpbmVfaWQgaWQ7CkBAIC02Njk3LDEyICs2NzAxLDYgQEAgc3RhdGljIHZvaWQgZ2VuNl9l bmFibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCVdBUk5fT04o IW11dGV4X2lzX2xvY2tlZCgmZGV2X3ByaXYtPnJwcy5od19sb2NrKSk7CiAKLQkvKiBIZXJlIGJl Z2lucyBhIG1hZ2ljIHNlcXVlbmNlIG9mIHJlZ2lzdGVyIHdyaXRlcyB0byBlbmFibGUKLQkgKiBh dXRvLWRvd25jbG9ja2luZy4KLQkgKgotCSAqIFBlcmhhcHMgdGhlcmUgbWlnaHQgYmUgc29tZSB2 YWx1ZSBpbiBleHBvc2luZyB0aGVzZSB0bwotCSAqIHVzZXJzcGFjZS4uLgotCSAqLwogCUk5MTVf V1JJVEUoR0VONl9SQ19TVEFURSwgMCk7CiAKIAkvKiBDbGVhciB0aGUgREJHIG5vdyBzbyB3ZSBk b24ndCBjb25mdXNlIGVhcmxpZXIgZXJyb3JzICovCkBAIC02NzU2LDEyICs2NzU0LDYgQEAgc3Rh dGljIHZvaWQgZ2VuNl9lbmFibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAkJICAgR0VONl9SQ19DVExfRUlfTU9ERSgxKSB8CiAJCSAgIEdFTjZfUkNfQ1RMX0hXX0VO QUJMRSk7CiAKLQkvKiBQb3dlciBkb3duIGlmIGNvbXBsZXRlbHkgaWRsZSBmb3Igb3ZlciA1MG1z ICovCi0JSTkxNV9XUklURShHRU42X1JQX0RPV05fVElNRU9VVCwgNTAwMDApOwotCUk5MTVfV1JJ VEUoR0VONl9SUF9JRExFX0hZU1RFUlNJUywgMTApOwotCi0JcmVzZXRfcnBzKGRldl9wcml2LCBn ZW42X3NldF9ycHMpOwotCiAJcmM2dmlkcyA9IDA7CiAJcmV0ID0gc2FuZHlicmlkZ2VfcGNvZGVf cmVhZChkZXZfcHJpdiwgR0VONl9QQ09ERV9SRUFEX1JDNlZJRFMsICZyYzZ2aWRzKTsKIAlpZiAo SVNfR0VONihkZXZfcHJpdikgJiYgcmV0KSB7CkBAIC02Nzc5LDYgKzY3NzEsMjggQEAgc3RhdGlj IHZvaWQgZ2VuNl9lbmFibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiB9 CiAKKworc3RhdGljIHZvaWQgZ2VuNl9lbmFibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKK3sKKwlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmRldl9wcml2LT5ycHMu aHdfbG9jaykpOworCisJLyogSGVyZSBiZWdpbnMgYSBtYWdpYyBzZXF1ZW5jZSBvZiByZWdpc3Rl ciB3cml0ZXMgdG8gZW5hYmxlCisJICogYXV0by1kb3duY2xvY2tpbmcuCisJICoKKwkgKiBQZXJo YXBzIHRoZXJlIG1pZ2h0IGJlIHNvbWUgdmFsdWUgaW4gZXhwb3NpbmcgdGhlc2UgdG8KKwkgKiB1 c2Vyc3BhY2UuLi4KKwkgKi8KKwlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZfcHJpdiwg Rk9SQ0VXQUtFX0FMTCk7CisKKwkvKiBQb3dlciBkb3duIGlmIGNvbXBsZXRlbHkgaWRsZSBmb3Ig b3ZlciA1MG1zICovCisJSTkxNV9XUklURShHRU42X1JQX0RPV05fVElNRU9VVCwgNTAwMDApOwor CUk5MTVfV1JJVEUoR0VONl9SUF9JRExFX0hZU1RFUlNJUywgMTApOworCisJcmVzZXRfcnBzKGRl dl9wcml2LCBnZW42X3NldF9ycHMpOworCisJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9wdXQoZGV2 X3ByaXYsIEZPUkNFV0FLRV9BTEwpOworfQorCiBzdGF0aWMgdm9pZCBnZW42X3VwZGF0ZV9yaW5n X2ZyZXEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCWludCBtaW5fZnJl cSA9IDE1OwpAQCAtNzkyOCw2ICs3OTQyLDcgQEAgdm9pZCBpbnRlbF9kaXNhYmxlX2d0X3Bvd2Vy c2F2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfSBlbHNlIGlmIChJU19W QUxMRVlWSUVXKGRldl9wcml2KSkgewogCQl2YWxsZXl2aWV3X2Rpc2FibGVfcnBzKGRldl9wcml2 KTsKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikgeworCQlnZW42X2Rpc2Fi bGVfcmM2KGRldl9wcml2KTsKIAkJZ2VuNl9kaXNhYmxlX3JwcyhkZXZfcHJpdik7CiAJfSAgZWxz ZSBpZiAoSVNfSVJPTkxBS0VfTShkZXZfcHJpdikpIHsKIAkJaXJvbmxha2VfZGlzYWJsZV9kcnBz KGRldl9wcml2KTsKQEAgLTc5NjQsNiArNzk3OSw3IEBAIHZvaWQgaW50ZWxfZW5hYmxlX2d0X3Bv d2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWdlbjhfZW5hYmxl X3JwcyhkZXZfcHJpdik7CiAJCWdlbjZfdXBkYXRlX3JpbmdfZnJlcShkZXZfcHJpdik7CiAJfSBl bHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpIHsKKwkJZ2VuNl9lbmFibGVfcmM2KGRl dl9wcml2KTsKIAkJZ2VuNl9lbmFibGVfcnBzKGRldl9wcml2KTsKIAkJZ2VuNl91cGRhdGVfcmlu Z19mcmVxKGRldl9wcml2KTsKIAl9IGVsc2UgaWYgKElTX0lST05MQUtFX00oZGV2X3ByaXYpKSB7 Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==