From: Imre Deak Subject: [PATCH 4/5] drm/i915/gen9+: Don't remove secondary power well requests Date: Thu, 29 Jun 2017 18:37:01 +0300 Message-ID: <1498750622-14023-5-git-send-email-imre.deak@intel.com> References: <1498750622-14023-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 713016E68F for ; Thu, 29 Jun 2017 15:37:07 +0000 (UTC) In-Reply-To: <1498750622-14023-1-git-send-email-imre.deak@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 U28gZmFyIGluIGFuIGF0dGVtcHQgdG8gbWFrZSBzdXJlIGFsbCBwb3dlciB3ZWxscyBnZXQgZGlz YWJsZWQgZHVyaW5nCmRpc3BsYXkgdW5pbml0aWFsaXphdGlvbiB0aGUgZHJpdmVyIHJlbW92ZWQg YW55IHNlY29uZGFyeSByZXF1ZXN0IGJpdHMKKEJJT1MsIEtWTVIsIERFQlVHKSB0aGF0IHdlcmUg c2V0IGZvciBhIGdpdmVuIHBvd2VyIHdlbGwuIFRoZSBrbm93bgpzb3VyY2UgZm9yIHRoZXNlIHJl cXVlc3RzIHdhcyBETUMncyByZXF1ZXN0IG9uIHBvd2VyIHdlbGwgMSBhbmQgdGhlIG1pc2MKSU8g cG93ZXIgd2VsbC4gU2luY2UgRE1DIGlzIGluYWN0aXZlIChEQyBzdGF0ZXMgYXJlIGRpc2FibGVk KSBhdCB0aGUKcG9pbnQgd2UgZGlzYWJsZSB0aGVzZSBwb3dlciB3ZWxscywgdGhlcmUgc2hvdWxk bid0IGJlIGFueSByZWFzb24gdG8KbGVhdmUgdGhlbSBvbi4gSG93ZXZlciB0aGVyZSBhcmUgdHdv IHByb2JsZW1zIHdpdGggdGhlIGFib3ZlCmFzc3VtcHRpb246IEJzcGVjIHJlcXVpcmVzIHRoYXQg dGhlIG1pc2MgSU8gcG93ZXIgd2VsbCBzdGF5cyBlbmFibGVkCih3aXRob3V0IHByb3ZpZGluZyBh IHJlYXNvbikgYW5kIHRoZXJlIGNhbiBiZSBLVk1SIHJlcXVlc3RzIHRoYXQgd2UKY2FuJ3QgcmVt b3ZlIGFueXdheSAodGhlIEtWTVIgcmVxdWVzdCByZWdpc3RlciBpcyBSL08pLiBBdG0sIGEgS1ZN UgpyZXF1ZXN0IGNhbiB0cmlnZ2VyIGEgdGltZW91dCBXQVJOIHdoZW4gdHJ5aW5nIHRvIGRpc2Fi bGUgcG93ZXIgd2VsbHMuCgpUbyBtYWtlIHRoZSBjb2RlIGFsaWduZWQgdG8gQnNwZWMgYW5kIHRv IGdldCByaWQgb2YgdGhlIEtWTVIgV0FSTiwgZG9uJ3QKdHJ5IHRvIHJlbW92ZSB0aGUgc2Vjb25k YXJ5IHJlcXVlc3RzLCBvbmx5IGRldGVjdCB0aGVtIGFuZCBzdG9wIHBvbGxpbmcKZm9yIHRoZSBw b3dlciB3ZWxsIGRpc2FibGVkIHN0YXRlIHdoZW4gYW55IG9uZSBpcyBzZXQuCgpBbHNvIGFkZCBh IGNvbW1lbnQgYWJvdXQgdGhlIHRpbWVvdXQgdmFsdWVzIHJlcXVpcmVkIGJ5IEJzcGVjIHdoZW4K ZW5hYmxpbmcgcG93ZXIgd2VsbHMgYW5kIHRoZSBmYWN0IHRoYXQgd2FpdGluZyBmb3IgdGhlbSB0 byBnZXQgZGlzYWJsZWQKaXMgbm90IHJlcXVpcmVkIGJ5IEJzcGVjLgoKQnVnemlsbGE6IGh0dHBz Oi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTk4NTY0ClNpZ25lZC1vZmYt Ynk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgfCAxMDkgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2MyBpbnNlcnRpb25zKCspLCA0NiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKaW5kZXggMWZjNzVlNi4uMmZl NzE1YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwpAQCAtMzQxLDYg KzM0MSw1OSBAQCBzdGF0aWMgdm9pZCBza2xfcG93ZXJfd2VsbF9wcmVfZGlzYWJsZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJCQkxIDw8IFBJUEVfQyB8IDEgPDwgUElQ RV9CKTsKIH0KIAorc3RhdGljIHZvaWQgZ2VuOV93YWl0X2Zvcl9wb3dlcl93ZWxsX2VuYWJsZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCSAgICBzdHJ1Y3QgaTkxNV9w b3dlcl93ZWxsICpwb3dlcl93ZWxsKQoreworCWludCBpZCA9IHBvd2VyX3dlbGwtPmlkOworCisJ LyogVGltZW91dCBmb3IgUFcxOjEwIHVzLCBBVVg6bm90IHNwZWNpZmllZCwgb3RoZXIgUFdzOjIw IHVzLiAqLworCVdBUk5fT04oaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoZGV2X3ByaXYsCisJCQkJ CUhTV19QV1JfV0VMTF9EUklWRVIsCisJCQkJCVNLTF9QT1dFUl9XRUxMX1NUQVRFKGlkKSwKKwkJ CQkJU0tMX1BPV0VSX1dFTExfU1RBVEUoaWQpLAorCQkJCQkxKSk7Cit9CisKK3N0YXRpYyB1MzIg Z2VuOV9wb3dlcl93ZWxsX3JlcXVlc3RlcnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCBpbnQgaWQpCit7CisJdTMyIHJlcV9tYXNrID0gU0tMX1BPV0VSX1dFTExfUkVRKGlkKTsK Kwl1MzIgcmV0OworCisJcmV0ID0gSTkxNV9SRUFEKEhTV19QV1JfV0VMTF9CSU9TKSAmIHJlcV9t YXNrID8gMSA6IDA7CisJcmV0IHw9IEk5MTVfUkVBRChIU1dfUFdSX1dFTExfRFJJVkVSKSAmIHJl cV9tYXNrID8gMiA6IDA7CisJcmV0IHw9IEk5MTVfUkVBRChIU1dfUFdSX1dFTExfS1ZNUikgJiBy ZXFfbWFzayA/IDQgOiAwOworCXJldCB8PSBJOTE1X1JFQUQoSFNXX1BXUl9XRUxMX0RFQlVHKSAm IHJlcV9tYXNrID8gOCA6IDA7CisKKwlyZXR1cm4gcmV0OworfQorCitzdGF0aWMgdm9pZCBnZW45 X3dhaXRfZm9yX3Bvd2VyX3dlbGxfZGlzYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCisJCQkJCSAgICAgc3RydWN0IGk5MTVfcG93ZXJfd2VsbCAqcG93ZXJfd2VsbCkKK3sK KwlpbnQgaWQgPSBwb3dlcl93ZWxsLT5pZDsKKwlib29sIGRpc2FibGVkOworCXUzMiByZXFzOwor CisJLyoKKwkgKiBCc3BlYyBkb2Vzbid0IHJlcXVpcmUgd2FpdGluZyBmb3IgUFdzIHRvIGdldCBk aXNhYmxlZCwgYnV0IHN0aWxsIGRvCisJICogdGhpcyBmb3IgcGFyYW5vaWEuIFRoZSBrbm93biBj YXNlcyB3aGVyZSBhIFBXIHdpbGwgYmUgZm9yY2VkIG9uOgorCSAqIC0gYSBLVk1SIHJlcXVlc3Qg b24gYW55IHBvd2VyIHdlbGwgdmlhIHRoZSBLVk1SIHJlcXVlc3QgcmVnaXN0ZXIKKwkgKiAtIGEg RE1DIHJlcXVlc3Qgb24gUFcxIGFuZCBNSVNDX0lPIHBvd2VyIHdlbGxzIHZpYSB0aGUgQklPUyBh bmQKKwkgKiAgIERFQlVHIHJlcXVlc3QgcmVnaXN0ZXJzCisJICogU2tpcCB0aGUgd2FpdCBpbiBj YXNlIGFueSBvZiB0aGUgcmVxdWVzdCBiaXRzIGFyZSBzZXQgYW5kIHByaW50IGEKKwkgKiBkaWFn bm9zdGljIG1lc3NhZ2UuCisJICovCisJd2FpdF9mb3IoKGRpc2FibGVkID0gIShJOTE1X1JFQUQo SFNXX1BXUl9XRUxMX0RSSVZFUikgJgorCQkJICAgICAgIFNLTF9QT1dFUl9XRUxMX1NUQVRFKGlk KSkpIHx8CisJCSAocmVxcyA9IGdlbjlfcG93ZXJfd2VsbF9yZXF1ZXN0ZXJzKGRldl9wcml2LCBp ZCkpLCAxKTsKKwlpZiAoZGlzYWJsZWQpCisJCXJldHVybjsKKworCURSTV9ERUJVR19LTVMoIiVz IGZvcmNlZCBvbiAoYmlvczolZCBkcml2ZXI6JWQga3ZtcjolZCBkZWJ1ZzolZClcbiIsCisJCSAg ICAgIHBvd2VyX3dlbGwtPm5hbWUsCisJCSAgICAgICEhKHJlcXMgJiAxKSwgISEocmVxcyAmIDIp LCAhIShyZXFzICYgNCksICEhKHJlcXMgJiA4KSk7Cit9CisKIHN0YXRpYyB2b2lkIGhzd19zZXRf cG93ZXJfd2VsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAgICAg c3RydWN0IGk5MTVfcG93ZXJfd2VsbCAqcG93ZXJfd2VsbCwgYm9vbCBlbmFibGUpCiB7CkBAIC03 NDYsNDUgKzc5OSw2IEBAIHZvaWQgc2tsX2Rpc2FibGVfZGM2KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAlnZW45X3NldF9kY19zdGF0ZShkZXZfcHJpdiwgRENfU1RBVEVfRElT QUJMRSk7CiB9CiAKLXN0YXRpYyB2b2lkCi1nZW45X3Nhbml0aXplX3Bvd2VyX3dlbGxfcmVxdWVz dHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSAgc3RydWN0IGk5MTVf cG93ZXJfd2VsbCAqcG93ZXJfd2VsbCkKLXsKLQllbnVtIHNrbF9kaXNwX3Bvd2VyX3dlbGxzIHBv d2VyX3dlbGxfaWQgPSBwb3dlcl93ZWxsLT5pZDsKLQl1MzIgdmFsOwotCXUzMiBtYXNrOwotCi0J bWFzayA9IFNLTF9QT1dFUl9XRUxMX1JFUShwb3dlcl93ZWxsX2lkKTsKLQotCXZhbCA9IEk5MTVf UkVBRChIU1dfUFdSX1dFTExfS1ZNUik7Ci0JaWYgKFdBUk5fT05DRSh2YWwgJiBtYXNrLCAiQ2xl YXJpbmcgdW5leHBlY3RlZCBLVk1SIHJlcXVlc3QgZm9yICVzXG4iLAotCQkgICAgICBwb3dlcl93 ZWxsLT5uYW1lKSkKLQkJSTkxNV9XUklURShIU1dfUFdSX1dFTExfS1ZNUiwgdmFsICYgfm1hc2sp OwotCi0JdmFsID0gSTkxNV9SRUFEKEhTV19QV1JfV0VMTF9CSU9TKTsKLQl2YWwgfD0gSTkxNV9S RUFEKEhTV19QV1JfV0VMTF9ERUJVRyk7Ci0KLQlpZiAoISh2YWwgJiBtYXNrKSkKLQkJcmV0dXJu OwotCi0JLyoKLQkgKiBETUMgaXMga25vd24gdG8gZm9yY2Ugb24gdGhlIHJlcXVlc3QgYml0cyBm b3IgcG93ZXIgd2VsbCAxIG9uIFNLTAotCSAqIGFuZCBCWFQgYW5kIHRoZSBtaXNjIElPIHBvd2Vy IHdlbGwgb24gU0tMIGJ1dCB3ZSBkb24ndCBleHBlY3QgYW55Ci0JICogb3RoZXIgcmVxdWVzdCBi aXRzIHRvIGJlIHNldCwgc28gV0FSTiBmb3IgdGhvc2UuCi0JICovCi0JaWYgKHBvd2VyX3dlbGxf aWQgPT0gU0tMX0RJU1BfUFdfMSB8fAotCSAgICAoSVNfR0VOOV9CQyhkZXZfcHJpdikgJiYKLQkg ICAgIHBvd2VyX3dlbGxfaWQgPT0gU0tMX0RJU1BfUFdfTUlTQ19JTykpCi0JCURSTV9ERUJVR19E UklWRVIoIkNsZWFyaW5nIGF1eGlsaWFyeSByZXF1ZXN0cyBmb3IgJXMgZm9yY2VkIG9uICIKLQkJ CQkgImJ5IERNQ1xuIiwgcG93ZXJfd2VsbC0+bmFtZSk7Ci0JZWxzZQotCQlXQVJOX09OQ0UoMSwg IkNsZWFyaW5nIHVuZXhwZWN0ZWQgYXV4aWxpYXJ5IHJlcXVlc3RzIGZvciAlc1xuIiwKLQkJCSAg cG93ZXJfd2VsbC0+bmFtZSk7Ci0KLQlJOTE1X1dSSVRFKEhTV19QV1JfV0VMTF9CSU9TLCB2YWwg JiB+bWFzayk7Ci0JSTkxNV9XUklURShIU1dfUFdSX1dFTExfREVCVUcsIHZhbCAmIH5tYXNrKTsK LX0KLQogc3RhdGljIHZvaWQgc2tsX3NldF9wb3dlcl93ZWxsKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgICBzdHJ1Y3QgaTkxNV9wb3dlcl93ZWxsICpwb3dlcl93 ZWxsLCBib29sIGVuYWJsZSkKIHsKQEAgLTg0OCw2ICs4NjIsOCBAQCBzdGF0aWMgdm9pZCBza2xf c2V0X3Bvd2VyX3dlbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJRFJN X0RFQlVHX0tNUygiRW5hYmxpbmcgJXNcbiIsIHBvd2VyX3dlbGwtPm5hbWUpOwogCQkJY2hlY2tf ZnVzZV9zdGF0dXMgPSB0cnVlOwogCQl9CisKKwkJZ2VuOV93YWl0X2Zvcl9wb3dlcl93ZWxsX2Vu YWJsZShkZXZfcHJpdiwgcG93ZXJfd2VsbCk7CiAJfSBlbHNlIHsKIAkJaWYgKGVuYWJsZV9yZXF1 ZXN0ZWQpIHsKIAkJCUk5MTVfV1JJVEUoSFNXX1BXUl9XRUxMX0RSSVZFUiwJdG1wICYgfnJlcV9t YXNrKTsKQEAgLTg1NSwxNCArODcxLDkgQEAgc3RhdGljIHZvaWQgc2tsX3NldF9wb3dlcl93ZWxs KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCURSTV9ERUJVR19LTVMoIkRp c2FibGluZyAlc1xuIiwgcG93ZXJfd2VsbC0+bmFtZSk7CiAJCX0KIAotCQlnZW45X3Nhbml0aXpl X3Bvd2VyX3dlbGxfcmVxdWVzdHMoZGV2X3ByaXYsIHBvd2VyX3dlbGwpOworCQlnZW45X3dhaXRf Zm9yX3Bvd2VyX3dlbGxfZGlzYWJsZShkZXZfcHJpdiwgcG93ZXJfd2VsbCk7CiAJfQogCi0JaWYg KHdhaXRfZm9yKCEhKEk5MTVfUkVBRChIU1dfUFdSX1dFTExfRFJJVkVSKSAmIHN0YXRlX21hc2sp ID09IGVuYWJsZSwKLQkJICAgICAxKSkKLQkJRFJNX0VSUk9SKCIlcyAlcyB0aW1lb3V0XG4iLAot CQkJICBwb3dlcl93ZWxsLT5uYW1lLCBlbmFibGUgPyAiZW5hYmxlIiA6ICJkaXNhYmxlIik7Ci0K IAlpZiAoY2hlY2tfZnVzZV9zdGF0dXMpIHsKIAkJaWYgKHBvd2VyX3dlbGwtPmlkID09IFNLTF9E SVNQX1BXXzEpIHsKIAkJCWlmIChpbnRlbF93YWl0X2Zvcl9yZWdpc3RlcihkZXZfcHJpdiwKQEAg LTI2OTksNiArMjcxMCw4IEBAIHN0YXRpYyB2b2lkIHNrbF9kaXNwbGF5X2NvcmVfdW5pbml0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkvKgogCSAqIEJTcGVjIHNheXMgdG8g a2VlcCB0aGUgTUlTQyBJTyBwb3dlciB3ZWxsIGVuYWJsZWQgaGVyZSwgb25seQogCSAqIHJlbW92 ZSBvdXIgcmVxdWVzdCBmb3IgcG93ZXIgd2VsbCAxLgorCSAqIE5vdGUgdGhhdCBldmVuIHRob3Vn aCB0aGUgZHJpdmVyJ3MgcmVxdWVzdCBpcyByZW1vdmVkIHBvd2VyIHdlbGwgMQorCSAqIG1heSBz dGF5IGVuYWJsZWQgYWZ0ZXIgdGhpcyBkdWUgdG8gRE1DJ3Mgb3duIHJlcXVlc3Qgb24gaXQuCiAJ ICovCiAJd2VsbCA9IGxvb2t1cF9wb3dlcl93ZWxsKGRldl9wcml2LCBTS0xfRElTUF9QV18xKTsK IAlpbnRlbF9wb3dlcl93ZWxsX2Rpc2FibGUoZGV2X3ByaXYsIHdlbGwpOwpAQCAtMjc1Niw3ICsy NzY5LDExIEBAIHZvaWQgYnh0X2Rpc3BsYXlfY29yZV91bmluaXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCiAJLyogVGhlIHNwZWMgZG9lc24ndCBjYWxsIGZvciByZW1vdmlu ZyB0aGUgcmVzZXQgaGFuZHNoYWtlIGZsYWcgKi8KIAotCS8qIERpc2FibGUgUEcxICovCisJLyoK KwkgKiBEaXNhYmxlIFBXMSAoUEcxKS4KKwkgKiBOb3RlIHRoYXQgZXZlbiB0aG91Z2ggdGhlIGRy aXZlcidzIHJlcXVlc3QgaXMgcmVtb3ZlZCBwb3dlciB3ZWxsIDEKKwkgKiBtYXkgc3RheSBlbmFi bGVkIGFmdGVyIHRoaXMgZHVlIHRvIERNQydzIG93biByZXF1ZXN0IG9uIGl0LgorCSAqLwogCW11 dGV4X2xvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOwogCiAJd2VsbCA9IGxvb2t1cF9wb3dlcl93 ZWxsKGRldl9wcml2LCBTS0xfRElTUF9QV18xKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK