From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sagar Arun Kamble Subject: [PATCH 03/10] drm/i915: Separate RPS and RC6 handling for VLV Date: Wed, 4 Oct 2017 19:37:18 +0530 Message-ID: <1507126045-24526-4-git-send-email-sagar.a.kamble@intel.com> References: <1507126045-24526-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA6126E6E2 for ; Wed, 4 Oct 2017 14:04:06 +0000 (UTC) In-Reply-To: <1507126045-24526-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+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMgfCAyNCArKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgICAgIHwgNjEgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMiBmaWxl cyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IGFiYjg1MjQuLjE3ZDI1ZjkgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jCkBAIC0xMDQxLDkgKzEwNDEsMTkgQEAgc3RhdGljIGludCBpOTE1 X2ZyZXF1ZW5jeV9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCQlzZXFf cHJpbnRmKG0sICJDdXJyZW50IFAtc3RhdGU6ICVkXG4iLAogCQkJICAgKHJndnN0YXQgJiBNRU1T VEFUX1BTVEFURV9NQVNLKSA+PiBNRU1TVEFUX1BTVEFURV9TSElGVCk7CiAJfSBlbHNlIGlmIChJ U19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewotCQl1 MzIgZnJlcV9zdHM7CisJCXUzMiBycG1vZGVjdGwsIGZyZXFfc3RzOwogCiAJCW11dGV4X2xvY2so JmRldl9wcml2LT5ycHMuaHdfbG9jayk7CisKKwkJcnBtb2RlY3RsID0gSTkxNV9SRUFEKEdFTjZf UlBfQ09OVFJPTCk7CisJCXNlcV9wcmludGYobSwgIlZpZGVvIFR1cmJvIE1vZGU6ICVzXG4iLAor CQkJICAgeWVzbm8ocnBtb2RlY3RsICYgR0VONl9SUF9NRURJQV9UVVJCTykpOworCQlzZXFfcHJp bnRmKG0sICJIVyBjb250cm9sIGVuYWJsZWQ6ICVzXG4iLAorCQkJICAgeWVzbm8ocnBtb2RlY3Rs ICYgR0VONl9SUF9FTkFCTEUpKTsKKwkJc2VxX3ByaW50ZihtLCAiU1cgY29udHJvbCBlbmFibGVk OiAlc1xuIiwKKwkJCSAgIHllc25vKChycG1vZGVjdGwgJiBHRU42X1JQX01FRElBX01PREVfTUFT SykgPT0KKwkJCQkgIEdFTjZfUlBfTUVESUFfU1dfTU9ERSkpOworCiAJCWZyZXFfc3RzID0gdmx2 X3B1bml0X3JlYWQoZGV2X3ByaXYsIFBVTklUX1JFR19HUFVfRlJFUV9TVFMpOwogCQlzZXFfcHJp bnRmKG0sICJQVU5JVF9SRUdfR1BVX0ZSRVFfU1RTOiAweCUwOHhcbiIsIGZyZXFfc3RzKTsKIAkJ c2VxX3ByaW50ZihtLCAiRERSIGZyZXE6ICVkIE1IelxuIiwgZGV2X3ByaXYtPm1lbV9mcmVxKTsK QEAgLTE0NTQsMjEgKzE0NjQsMTEgQEAgc3RhdGljIHZvaWQgcHJpbnRfcmM2X3JlcyhzdHJ1Y3Qg c2VxX2ZpbGUgKm0sCiBzdGF0aWMgaW50IHZsdl9kcnBjX2luZm8oc3RydWN0IHNlcV9maWxlICpt KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IG5vZGVfdG9faTkxNSht LT5wcml2YXRlKTsKLQl1MzIgcnBtb2RlY3RsMSwgcmNjdGwxLCBwd19zdGF0dXM7CisJdTMyIHJj Y3RsMSwgcHdfc3RhdHVzOwogCiAJcHdfc3RhdHVzID0gSTkxNV9SRUFEKFZMVl9HVExDX1BXX1NU QVRVUyk7Ci0JcnBtb2RlY3RsMSA9IEk5MTVfUkVBRChHRU42X1JQX0NPTlRST0wpOwogCXJjY3Rs MSA9IEk5MTVfUkVBRChHRU42X1JDX0NPTlRST0wpOwogCi0Jc2VxX3ByaW50ZihtLCAiVmlkZW8g VHVyYm8gTW9kZTogJXNcbiIsCi0JCSAgIHllc25vKHJwbW9kZWN0bDEgJiBHRU42X1JQX01FRElB X1RVUkJPKSk7Ci0Jc2VxX3ByaW50ZihtLCAiVHVyYm8gZW5hYmxlZDogJXNcbiIsCi0JCSAgIHll c25vKHJwbW9kZWN0bDEgJiBHRU42X1JQX0VOQUJMRSkpOwotCXNlcV9wcmludGYobSwgIkhXIGNv bnRyb2wgZW5hYmxlZDogJXNcbiIsCi0JCSAgIHllc25vKHJwbW9kZWN0bDEgJiBHRU42X1JQX0VO QUJMRSkpOwotCXNlcV9wcmludGYobSwgIlNXIGNvbnRyb2wgZW5hYmxlZDogJXNcbiIsCi0JCSAg IHllc25vKChycG1vZGVjdGwxICYgR0VONl9SUF9NRURJQV9NT0RFX01BU0spID09Ci0JCQkgIEdF TjZfUlBfTUVESUFfU1dfTU9ERSkpOwogCXNlcV9wcmludGYobSwgIlJDNiBFbmFibGVkOiAlc1xu IiwKIAkJICAgeWVzbm8ocmNjdGwxICYgKEdFTjdfUkNfQ1RMX1RPX01PREUgfAogCQkJCQlHRU42 X1JDX0NUTF9FSV9NT0RFKDEpKSkpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggOTA4ZDM4 NC4uMTQ5NGFhOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC02MzQyLDkgKzYzNDIsOSBA QCBzdGF0aWMgdm9pZCBjaGVycnl2aWV3X2Rpc2FibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAlJOTE1X1dSSVRFKEdFTjZfUkNfQ09OVFJPTCwgMCk7CiB9CiAKLXN0 YXRpYyB2b2lkIHZhbGxleXZpZXdfZGlzYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQorc3RhdGljIHZvaWQgdmFsbGV5dmlld19kaXNhYmxlX3JjNihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JLyogd2UncmUgZG9pbmcgZm9yY2V3YWtlIGJl Zm9yZSBEaXNhYmxpbmcgUkM2LAorCS8qIFdlJ3JlIGRvaW5nIGZvcmNld2FrZSBiZWZvcmUgRGlz YWJsaW5nIFJDNiwKIAkgKiBUaGlzIHdoYXQgdGhlIEJJT1MgZXhwZWN0cyB3aGVuIGdvaW5nIGlu dG8gc3VzcGVuZCAqLwogCWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KGRldl9wcml2LCBGT1JD RVdBS0VfQUxMKTsKIApAQCAtNjM1Myw2ICs2MzUzLDExIEBAIHN0YXRpYyB2b2lkIHZhbGxleXZp ZXdfZGlzYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWludGVs X3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIH0KIAorc3Rh dGljIHZvaWQgdmFsbGV5dmlld19kaXNhYmxlX3JwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCit7CisJSTkxNV9XUklURShHRU42X1JQX0NPTlRST0wsIDApOworfQorCiBzdGF0 aWMgdm9pZCBpbnRlbF9wcmludF9yYzZfaW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIHUzMiBtb2RlKQogewogCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19D SEVSUllWSUVXKGRldl9wcml2KSkgewpAQCAtNzI3OCwxMSArNzI4MywxMSBAQCBzdGF0aWMgdm9p ZCBjaGVycnl2aWV3X2VuYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsK IH0KIAotc3RhdGljIHZvaWQgdmFsbGV5dmlld19lbmFibGVfcnBzKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIHZhbGxleXZpZXdfZW5hYmxlX3JjNihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lOwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwotCXUzMiBndGZpZm9kYmcsIHZh bCwgcmM2X21vZGUgPSAwOworCXUzMiBndGZpZm9kYmcsIHJjNl9tb2RlID0gMDsKIAogCVdBUk5f T04oIW11dGV4X2lzX2xvY2tlZCgmZGV2X3ByaXYtPnJwcy5od19sb2NrKSk7CiAKQEAgLTcyOTUs MjggKzczMDAsMTEgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19lbmFibGVfcnBzKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJSTkxNV9XUklURShHVEZJRk9EQkcsIGd0Zmlm b2RiZyk7CiAJfQogCi0JLyogSWYgVkxWLCBGb3JjZXdha2UgYWxsIHdlbGxzLCBlbHNlIHJlLWRp cmVjdCB0byByZWd1bGFyIHBhdGggKi8KIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZf cHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiAKIAkvKiAgRGlzYWJsZSBSQyBzdGF0ZXMuICovCiAJSTkx NV9XUklURShHRU42X1JDX0NPTlRST0wsIDApOwogCi0JSTkxNV9XUklURShHRU42X1JQX0RPV05f VElNRU9VVCwgMTAwMDAwMCk7Ci0JSTkxNV9XUklURShHRU42X1JQX1VQX1RIUkVTSE9MRCwgNTk0 MDApOwotCUk5MTVfV1JJVEUoR0VONl9SUF9ET1dOX1RIUkVTSE9MRCwgMjQ1MDAwKTsKLQlJOTE1 X1dSSVRFKEdFTjZfUlBfVVBfRUksIDY2MDAwKTsKLQlJOTE1X1dSSVRFKEdFTjZfUlBfRE9XTl9F SSwgMzUwMDAwKTsKLQotCUk5MTVfV1JJVEUoR0VONl9SUF9JRExFX0hZU1RFUlNJUywgMTApOwot Ci0JSTkxNV9XUklURShHRU42X1JQX0NPTlRST0wsCi0JCSAgIEdFTjZfUlBfTUVESUFfVFVSQk8g fAotCQkgICBHRU42X1JQX01FRElBX0hXX05PUk1BTF9NT0RFIHwKLQkJICAgR0VONl9SUF9NRURJ QV9JU19HRlggfAotCQkgICBHRU42X1JQX0VOQUJMRSB8Ci0JCSAgIEdFTjZfUlBfVVBfQlVTWV9B VkcgfAotCQkgICBHRU42X1JQX0RPV05fSURMRV9DT05UKTsKLQogCUk5MTVfV1JJVEUoR0VONl9S QzZfV0FLRV9SQVRFX0xJTUlULCAweDAwMjgwMDAwKTsKIAlJOTE1X1dSSVRFKEdFTjZfUkNfRVZB TFVBVElPTl9JTlRFUlZBTCwgMTI1MDAwKTsKIAlJOTE1X1dSSVRFKEdFTjZfUkNfSURMRV9IWVNU RVJTSVMsIDI1KTsKQEAgLTczMjYsNyArNzMxNCw3IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdf ZW5hYmxlX3JwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlJOTE1X1dS SVRFKEdFTjZfUkM2X1RIUkVTSE9MRCwgMHg1NTcpOwogCi0JLyogYWxsb3dzIFJDNiByZXNpZGVu Y3kgY291bnRlciB0byB3b3JrICovCisJLyogQWxsb3dzIFJDNiByZXNpZGVuY3kgY291bnRlciB0 byB3b3JrICovCiAJSTkxNV9XUklURShWTFZfQ09VTlRFUl9DT05UUk9MLAogCQkgICBfTUFTS0VE X0JJVF9FTkFCTEUoVkxWX0NPVU5UX1JBTkdFX0hJR0ggfAogCQkJCSAgICAgIFZMVl9NRURJQV9S QzBfQ09VTlRfRU4gfApAQCAtNzM0MSw2ICs3MzI5LDMzIEBAIHN0YXRpYyB2b2lkIHZhbGxleXZp ZXdfZW5hYmxlX3JwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlJOTE1 X1dSSVRFKEdFTjZfUkNfQ09OVFJPTCwgcmM2X21vZGUpOwogCisJaW50ZWxfdW5jb3JlX2ZvcmNl d2FrZV9wdXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOworfQorCitzdGF0aWMgdm9pZCB2YWxs ZXl2aWV3X2VuYWJsZV9ycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorewor CXUzMiB2YWw7CisKKwlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmRldl9wcml2LT5ycHMuaHdf bG9jaykpOworCisJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9nZXQoZGV2X3ByaXYsIEZPUkNFV0FL RV9BTEwpOworCisJSTkxNV9XUklURShHRU42X1JQX0RPV05fVElNRU9VVCwgMTAwMDAwMCk7CisJ STkxNV9XUklURShHRU42X1JQX1VQX1RIUkVTSE9MRCwgNTk0MDApOworCUk5MTVfV1JJVEUoR0VO Nl9SUF9ET1dOX1RIUkVTSE9MRCwgMjQ1MDAwKTsKKwlJOTE1X1dSSVRFKEdFTjZfUlBfVVBfRUks IDY2MDAwKTsKKwlJOTE1X1dSSVRFKEdFTjZfUlBfRE9XTl9FSSwgMzUwMDAwKTsKKworCUk5MTVf V1JJVEUoR0VONl9SUF9JRExFX0hZU1RFUlNJUywgMTApOworCisJSTkxNV9XUklURShHRU42X1JQ X0NPTlRST0wsCisJCSAgIEdFTjZfUlBfTUVESUFfVFVSQk8gfAorCQkgICBHRU42X1JQX01FRElB X0hXX05PUk1BTF9NT0RFIHwKKwkJICAgR0VONl9SUF9NRURJQV9JU19HRlggfAorCQkgICBHRU42 X1JQX0VOQUJMRSB8CisJCSAgIEdFTjZfUlBfVVBfQlVTWV9BVkcgfAorCQkgICBHRU42X1JQX0RP V05fSURMRV9DT05UKTsKKwogCS8qIFNldHRpbmcgRml4ZWQgQmlhcyAqLwogCXZhbCA9IFZMVl9P VkVSUklERV9FTiB8CiAJCSAgVkxWX1NPQ19URFBfRU4gfApAQCAtNzk0MCw2ICs3OTU1LDcgQEAg dm9pZCBpbnRlbF9kaXNhYmxlX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQljaGVy cnl2aWV3X2Rpc2FibGVfcnBzKGRldl9wcml2KTsKIAl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVco ZGV2X3ByaXYpKSB7CisJCXZhbGxleXZpZXdfZGlzYWJsZV9yYzYoZGV2X3ByaXYpOwogCQl2YWxs ZXl2aWV3X2Rpc2FibGVfcnBzKGRldl9wcml2KTsKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gNikgewogCQlnZW42X2Rpc2FibGVfcmM2KGRldl9wcml2KTsKQEAgLTc5NjksNiAr Nzk4NSw3IEBAIHZvaWQgaW50ZWxfZW5hYmxlX2d0X3Bvd2Vyc2F2ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWNo ZXJyeXZpZXdfZW5hYmxlX3JwcyhkZXZfcHJpdik7CiAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVX KGRldl9wcml2KSkgeworCQl2YWxsZXl2aWV3X2VuYWJsZV9yYzYoZGV2X3ByaXYpOwogCQl2YWxs ZXl2aWV3X2VuYWJsZV9ycHMoZGV2X3ByaXYpOwogCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9w cml2KSA+PSA5KSB7CiAJCWdlbjlfZW5hYmxlX3JjNihkZXZfcHJpdik7Ci0tIAoxLjkuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==