From: Sagar Arun Kamble Subject: [PATCH v3 04/12] drm/i915: Separate RPS and RC6 handling for VLV Date: Sat, 7 Oct 2017 12:37:27 +0530 Message-ID: <1507360055-19948-5-git-send-email-sagar.a.kamble@intel.com> References: <1507360055-19948-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 992AD6EA0A for ; Sat, 7 Oct 2017 07:04:18 +0000 (UTC) In-Reply-To: <1507360055-19948-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 Vi4KCnYyOiBSZW1vdmVkIHVubmVjZXNzYXJ5IGNvbW1lbnRzIGFib3V0IGZvcmNld2FrZXMgd2hp bGUgZW5hYmxpbmcKUkM2L1JQUy4gQWRkZWQgY2hhbmdlcyB0byBvdXRwdXQgdHVyYm8gY29udHJv bCBzdGF0dXMgZm9yIFZMViBpbgppOTE1X2ZyZXF1ZW5jeV9pbmZvLgoKU2lnbmVkLW9mZi1ieTog U2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KQ2M6IEltcmUgRGVh ayA8aW1yZS5kZWFrQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls c29uLmNvLnVrPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50 ZWwuY29tPgpSZXZpZXdlZC1ieTogUmFkb3NsYXcgU3p3aWNodGVuYmVyZyA8cmFkb3NsYXcuc3p3 aWNodGVuYmVyZ0BpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu YyB8IDI0ICsrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAg ICAgfCA2MSArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNo YW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMKaW5kZXggY2E2NTYwMC4uMTQyNDc0YSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMKQEAgLTEwNDIsOSArMTA0MiwxOSBAQCBzdGF0aWMgaW50IGk5MTVfZnJl cXVlbmN5X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAJCXNlcV9wcmlu dGYobSwgIkN1cnJlbnQgUC1zdGF0ZTogJWRcbiIsCiAJCQkgICAocmd2c3RhdCAmIE1FTVNUQVRf UFNUQVRFX01BU0spID4+IE1FTVNUQVRfUFNUQVRFX1NISUZUKTsKIAl9IGVsc2UgaWYgKElTX1ZB TExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7Ci0JCXUzMiBm cmVxX3N0czsKKwkJdTMyIHJwbW9kZWN0bCwgZnJlcV9zdHM7CiAKIAkJbXV0ZXhfbG9jaygmZGV2 X3ByaXYtPnJwcy5od19sb2NrKTsKKworCQlycG1vZGVjdGwgPSBJOTE1X1JFQUQoR0VONl9SUF9D T05UUk9MKTsKKwkJc2VxX3ByaW50ZihtLCAiVmlkZW8gVHVyYm8gTW9kZTogJXNcbiIsCisJCQkg ICB5ZXNubyhycG1vZGVjdGwgJiBHRU42X1JQX01FRElBX1RVUkJPKSk7CisJCXNlcV9wcmludGYo bSwgIkhXIGNvbnRyb2wgZW5hYmxlZDogJXNcbiIsCisJCQkgICB5ZXNubyhycG1vZGVjdGwgJiBH RU42X1JQX0VOQUJMRSkpOworCQlzZXFfcHJpbnRmKG0sICJTVyBjb250cm9sIGVuYWJsZWQ6ICVz XG4iLAorCQkJICAgeWVzbm8oKHJwbW9kZWN0bCAmIEdFTjZfUlBfTUVESUFfTU9ERV9NQVNLKSA9 PQorCQkJCSAgR0VONl9SUF9NRURJQV9TV19NT0RFKSk7CisKIAkJZnJlcV9zdHMgPSB2bHZfcHVu aXRfcmVhZChkZXZfcHJpdiwgUFVOSVRfUkVHX0dQVV9GUkVRX1NUUyk7CiAJCXNlcV9wcmludGYo bSwgIlBVTklUX1JFR19HUFVfRlJFUV9TVFM6IDB4JTA4eFxuIiwgZnJlcV9zdHMpOwogCQlzZXFf cHJpbnRmKG0sICJERFIgZnJlcTogJWQgTUh6XG4iLCBkZXZfcHJpdi0+bWVtX2ZyZXEpOwpAQCAt MTQ1NSwyMSArMTQ2NSwxMSBAQCBzdGF0aWMgdm9pZCBwcmludF9yYzZfcmVzKHN0cnVjdCBzZXFf ZmlsZSAqbSwKIHN0YXRpYyBpbnQgdmx2X2RycGNfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCiB7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gbm9kZV90b19pOTE1KG0tPnBy aXZhdGUpOwotCXUzMiBycG1vZGVjdGwxLCByY2N0bDEsIHB3X3N0YXR1czsKKwl1MzIgcmNjdGwx LCBwd19zdGF0dXM7CiAKIAlwd19zdGF0dXMgPSBJOTE1X1JFQUQoVkxWX0dUTENfUFdfU1RBVFVT KTsKLQlycG1vZGVjdGwxID0gSTkxNV9SRUFEKEdFTjZfUlBfQ09OVFJPTCk7CiAJcmNjdGwxID0g STkxNV9SRUFEKEdFTjZfUkNfQ09OVFJPTCk7CiAKLQlzZXFfcHJpbnRmKG0sICJWaWRlbyBUdXJi byBNb2RlOiAlc1xuIiwKLQkJICAgeWVzbm8ocnBtb2RlY3RsMSAmIEdFTjZfUlBfTUVESUFfVFVS Qk8pKTsKLQlzZXFfcHJpbnRmKG0sICJUdXJibyBlbmFibGVkOiAlc1xuIiwKLQkJICAgeWVzbm8o cnBtb2RlY3RsMSAmIEdFTjZfUlBfRU5BQkxFKSk7Ci0Jc2VxX3ByaW50ZihtLCAiSFcgY29udHJv bCBlbmFibGVkOiAlc1xuIiwKLQkJICAgeWVzbm8ocnBtb2RlY3RsMSAmIEdFTjZfUlBfRU5BQkxF KSk7Ci0Jc2VxX3ByaW50ZihtLCAiU1cgY29udHJvbCBlbmFibGVkOiAlc1xuIiwKLQkJICAgeWVz bm8oKHJwbW9kZWN0bDEgJiBHRU42X1JQX01FRElBX01PREVfTUFTSykgPT0KLQkJCSAgR0VONl9S UF9NRURJQV9TV19NT0RFKSk7CiAJc2VxX3ByaW50ZihtLCAiUkM2IEVuYWJsZWQ6ICVzXG4iLAog CQkgICB5ZXNubyhyY2N0bDEgJiAoR0VON19SQ19DVExfVE9fTU9ERSB8CiAJCQkJCUdFTjZfUkNf Q1RMX0VJX01PREUoMSkpKSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA2NWE2NmZmLi4y NzdkZWRiYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC02MzQ4LDkgKzYzNDgsOSBAQCBz dGF0aWMgdm9pZCBjaGVycnl2aWV3X2Rpc2FibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAlJOTE1X1dSSVRFKEdFTjZfUkNfQ09OVFJPTCwgMCk7CiB9CiAKLXN0YXRp YyB2b2lkIHZhbGxleXZpZXdfZGlzYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQorc3RhdGljIHZvaWQgdmFsbGV5dmlld19kaXNhYmxlX3JjNihzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JLyogd2UncmUgZG9pbmcgZm9yY2V3YWtlIGJlZm9y ZSBEaXNhYmxpbmcgUkM2LAorCS8qIFdlJ3JlIGRvaW5nIGZvcmNld2FrZSBiZWZvcmUgRGlzYWJs aW5nIFJDNiwKIAkgKiBUaGlzIHdoYXQgdGhlIEJJT1MgZXhwZWN0cyB3aGVuIGdvaW5nIGludG8g c3VzcGVuZCAqLwogCWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdB S0VfQUxMKTsKIApAQCAtNjM1OSw2ICs2MzU5LDExIEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdf ZGlzYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWludGVsX3Vu Y29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIH0KIAorc3RhdGlj IHZvaWQgdmFsbGV5dmlld19kaXNhYmxlX3JwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCit7CisJSTkxNV9XUklURShHRU42X1JQX0NPTlRST0wsIDApOworfQorCiBzdGF0aWMg dm9pZCBpbnRlbF9wcmludF9yYzZfaW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIHUzMiBtb2RlKQogewogCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVS UllWSUVXKGRldl9wcml2KSkgewpAQCAtNzI4MSwxMSArNzI4NiwxMSBAQCBzdGF0aWMgdm9pZCBj aGVycnl2aWV3X2VuYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIH0K IAotc3RhdGljIHZvaWQgdmFsbGV5dmlld19lbmFibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIHZhbGxleXZpZXdfZW5hYmxlX3JjNihzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lOwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwotCXUzMiBndGZpZm9kYmcsIHZhbCwg cmM2X21vZGUgPSAwOworCXUzMiBndGZpZm9kYmcsIHJjNl9tb2RlID0gMDsKIAogCVdBUk5fT04o IW11dGV4X2lzX2xvY2tlZCgmZGV2X3ByaXYtPnJwcy5od19sb2NrKSk7CiAKQEAgLTcyOTgsMjgg KzczMDMsMTEgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19lbmFibGVfcnBzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJSTkxNV9XUklURShHVEZJRk9EQkcsIGd0Zmlmb2Ri Zyk7CiAJfQogCi0JLyogSWYgVkxWLCBGb3JjZXdha2UgYWxsIHdlbGxzLCBlbHNlIHJlLWRpcmVj dCB0byByZWd1bGFyIHBhdGggKi8KIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZfcHJp diwgRk9SQ0VXQUtFX0FMTCk7CiAKIAkvKiAgRGlzYWJsZSBSQyBzdGF0ZXMuICovCiAJSTkxNV9X UklURShHRU42X1JDX0NPTlRST0wsIDApOwogCi0JSTkxNV9XUklURShHRU42X1JQX0RPV05fVElN RU9VVCwgMTAwMDAwMCk7Ci0JSTkxNV9XUklURShHRU42X1JQX1VQX1RIUkVTSE9MRCwgNTk0MDAp OwotCUk5MTVfV1JJVEUoR0VONl9SUF9ET1dOX1RIUkVTSE9MRCwgMjQ1MDAwKTsKLQlJOTE1X1dS SVRFKEdFTjZfUlBfVVBfRUksIDY2MDAwKTsKLQlJOTE1X1dSSVRFKEdFTjZfUlBfRE9XTl9FSSwg MzUwMDAwKTsKLQotCUk5MTVfV1JJVEUoR0VONl9SUF9JRExFX0hZU1RFUlNJUywgMTApOwotCi0J STkxNV9XUklURShHRU42X1JQX0NPTlRST0wsCi0JCSAgIEdFTjZfUlBfTUVESUFfVFVSQk8gfAot CQkgICBHRU42X1JQX01FRElBX0hXX05PUk1BTF9NT0RFIHwKLQkJICAgR0VONl9SUF9NRURJQV9J U19HRlggfAotCQkgICBHRU42X1JQX0VOQUJMRSB8Ci0JCSAgIEdFTjZfUlBfVVBfQlVTWV9BVkcg fAotCQkgICBHRU42X1JQX0RPV05fSURMRV9DT05UKTsKLQogCUk5MTVfV1JJVEUoR0VONl9SQzZf V0FLRV9SQVRFX0xJTUlULCAweDAwMjgwMDAwKTsKIAlJOTE1X1dSSVRFKEdFTjZfUkNfRVZBTFVB VElPTl9JTlRFUlZBTCwgMTI1MDAwKTsKIAlJOTE1X1dSSVRFKEdFTjZfUkNfSURMRV9IWVNURVJT SVMsIDI1KTsKQEAgLTczMjksNyArNzMxNyw3IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfZW5h YmxlX3JwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlJOTE1X1dSSVRF KEdFTjZfUkM2X1RIUkVTSE9MRCwgMHg1NTcpOwogCi0JLyogYWxsb3dzIFJDNiByZXNpZGVuY3kg Y291bnRlciB0byB3b3JrICovCisJLyogQWxsb3dzIFJDNiByZXNpZGVuY3kgY291bnRlciB0byB3 b3JrICovCiAJSTkxNV9XUklURShWTFZfQ09VTlRFUl9DT05UUk9MLAogCQkgICBfTUFTS0VEX0JJ VF9FTkFCTEUoVkxWX0NPVU5UX1JBTkdFX0hJR0ggfAogCQkJCSAgICAgIFZMVl9NRURJQV9SQzBf Q09VTlRfRU4gfApAQCAtNzM0NCw2ICs3MzMyLDMzIEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdf ZW5hYmxlX3JwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlJOTE1X1dS SVRFKEdFTjZfUkNfQ09OVFJPTCwgcmM2X21vZGUpOwogCisJaW50ZWxfdW5jb3JlX2ZvcmNld2Fr ZV9wdXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOworfQorCitzdGF0aWMgdm9pZCB2YWxsZXl2 aWV3X2VuYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXUz MiB2YWw7CisKKwlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmRldl9wcml2LT5ycHMuaHdfbG9j aykpOworCisJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9nZXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9B TEwpOworCisJSTkxNV9XUklURShHRU42X1JQX0RPV05fVElNRU9VVCwgMTAwMDAwMCk7CisJSTkx NV9XUklURShHRU42X1JQX1VQX1RIUkVTSE9MRCwgNTk0MDApOworCUk5MTVfV1JJVEUoR0VONl9S UF9ET1dOX1RIUkVTSE9MRCwgMjQ1MDAwKTsKKwlJOTE1X1dSSVRFKEdFTjZfUlBfVVBfRUksIDY2 MDAwKTsKKwlJOTE1X1dSSVRFKEdFTjZfUlBfRE9XTl9FSSwgMzUwMDAwKTsKKworCUk5MTVfV1JJ VEUoR0VONl9SUF9JRExFX0hZU1RFUlNJUywgMTApOworCisJSTkxNV9XUklURShHRU42X1JQX0NP TlRST0wsCisJCSAgIEdFTjZfUlBfTUVESUFfVFVSQk8gfAorCQkgICBHRU42X1JQX01FRElBX0hX X05PUk1BTF9NT0RFIHwKKwkJICAgR0VONl9SUF9NRURJQV9JU19HRlggfAorCQkgICBHRU42X1JQ X0VOQUJMRSB8CisJCSAgIEdFTjZfUlBfVVBfQlVTWV9BVkcgfAorCQkgICBHRU42X1JQX0RPV05f SURMRV9DT05UKTsKKwogCS8qIFNldHRpbmcgRml4ZWQgQmlhcyAqLwogCXZhbCA9IFZMVl9PVkVS UklERV9FTiB8CiAJCSAgVkxWX1NPQ19URFBfRU4gfApAQCAtNzk0Myw2ICs3OTU4LDcgQEAgdm9p ZCBpbnRlbF9kaXNhYmxlX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQljaGVycnl2 aWV3X2Rpc2FibGVfcnBzKGRldl9wcml2KTsKIAl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2 X3ByaXYpKSB7CisJCXZhbGxleXZpZXdfZGlzYWJsZV9yYzYoZGV2X3ByaXYpOwogCQl2YWxsZXl2 aWV3X2Rpc2FibGVfcnBzKGRldl9wcml2KTsKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJp dikgPj0gNikgewogCQlnZW42X2Rpc2FibGVfcmM2KGRldl9wcml2KTsKQEAgLTc5NzIsNiArNzk4 OCw3IEBAIHZvaWQgaW50ZWxfZW5hYmxlX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWNoZXJy eXZpZXdfZW5hYmxlX3JwcyhkZXZfcHJpdik7CiAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2KSkgeworCQl2YWxsZXl2aWV3X2VuYWJsZV9yYzYoZGV2X3ByaXYpOwogCQl2YWxsZXl2 aWV3X2VuYWJsZV9ycHMoZGV2X3ByaXYpOwogCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA+PSA5KSB7CiAJCWdlbjlfZW5hYmxlX3JjNihkZXZfcHJpdik7Ci0tIAoxLjkuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==