From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 1/2] drm/i915: Introduce intel_runtime_pm_disable to pair intel_runtime_pm_enable Date: Thu, 16 Aug 2018 15:37:56 +0300 Message-ID: <20180816123757.3286-1-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 567286E162 for ; Thu, 16 Aug 2018 12:38:55 +0000 (UTC) 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 RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpDdXJyZW50bHks IHdlIGNhbmNlbCB0aGUgZXh0cmEgd2FrZXJlZiB3ZSBoYXZlIGZvciAhcnVudGltZS1wbSBkZXZp Y2VzCmluc2lkZSBwb3dlcl93ZWxsc19maW5pX2h3LiBIb3dldmVyLCB0aGlzIGlzIG5vdCBzdHJp Y3RseSBwYWlyZWQgd2l0aAp0aGUgYWNxdWlzaXRpb24gb2YgdGhhdCB3YWtlcmVmIGluIHJ1bnRp bWVfcG1fZW5hYmxlIChhcyB0aGUgZmluaV9odyBtYXkKYmUgY2FsbGVkIG9uIGVycm9ycyBwYXRo cyBiZWZvcmUgd2UgZXZlbiBjYWxsIHJ1bnRpbWVfcG1fZW5hYmxlKS4gTWFrZQp0aGUgc3ltbWV0 cnkgbW9yZSBleHBsaWNpdCBhbmQgaW5jbHVkZSBhIGNoZWNrIHRoYXQgd2UgZG8gcmVsZWFzZSBh bGwgb2YKb3VyIHJwbSB3YWtlcmVmcy4KCnYyOiBGaXh1cCB0cmFuc2ZlciBvZiBvd25lcnNoaXAg YmFjayB0byBjb3JlIHdoaWxzdCBrZWVwaW5nIG91ciB3YWtlcmVmCmNvdW50IGJhbGFuY2VkLgoK U2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNj OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBJbXJlIERlYWsg PGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YyAgICAgICAgIHwgMjcgKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCAgICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y dW50aW1lX3BtLmMgfCA0MyArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDMgZmls ZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKaW5kZXggNDExMTFmMmE5YzM5Li4wMjEzMDRlMjUyZWIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYwpAQCAtMTI4MSw2ICsxMjgxLDggQEAgc3RhdGljIHZvaWQgaTkxNV9kcml2 ZXJfcmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCSAqLwogCWlm IChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzKQogCQlkcm1fa21zX2hlbHBlcl9wb2xs X2luaXQoZGV2KTsKKworCWludGVsX3J1bnRpbWVfcG1fZW5hYmxlKGRldl9wcml2KTsKIH0KIAog LyoqCkBAIC0xMjg5LDYgKzEyOTEsOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2RyaXZlcl9yZWdpc3Rl cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAgKi8KIHN0YXRpYyB2b2lkIGk5 MTVfZHJpdmVyX3VucmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog eworCWludGVsX3J1bnRpbWVfcG1fZGlzYWJsZShkZXZfcHJpdik7CisKIAlpbnRlbF9mYmRldl91 bnJlZ2lzdGVyKGRldl9wcml2KTsKIAlpbnRlbF9hdWRpb19kZWluaXQoZGV2X3ByaXYpOwogCkBA IC0xMzY2LDE2ICsxMzcwLDYgQEAgaW50IGk5MTVfZHJpdmVyX2xvYWQoc3RydWN0IHBjaV9kZXYg KnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiAJCWdvdG8gb3V0X2Zpbmk7 CiAKIAlwY2lfc2V0X2RydmRhdGEocGRldiwgJmRldl9wcml2LT5kcm0pOwotCS8qCi0JICogRGlz YWJsZSB0aGUgc3lzdGVtIHN1c3BlbmQgZGlyZWN0IGNvbXBsZXRlIG9wdGltaXphdGlvbiwgd2hp Y2ggY2FuCi0JICogbGVhdmUgdGhlIGRldmljZSBzdXNwZW5kZWQgc2tpcHBpbmcgdGhlIGRyaXZl cidzIHN1c3BlbmQgaGFuZGxlcnMKLQkgKiBpZiB0aGUgZGV2aWNlIHdhcyBhbHJlYWR5IHJ1bnRp bWUgc3VzcGVuZGVkLiBUaGlzIGlzIG5lZWRlZCBkdWUgdG8KLQkgKiB0aGUgZGlmZmVyZW5jZSBp biBvdXIgcnVudGltZSBhbmQgc3lzdGVtIHN1c3BlbmQgc2VxdWVuY2UgYW5kCi0JICogYmVjYXVl IHRoZSBIREEgZHJpdmVyIG1heSByZXF1aXJlIHVzIHRvIGVuYWJsZSB0aGUgYXVkaW8gcG93ZXIK LQkgKiBkb21haW4gZHVyaW5nIHN5c3RlbSBzdXNwZW5kLgotCSAqLwotCWRldl9wbV9zZXRfZHJp dmVyX2ZsYWdzKCZwZGV2LT5kZXYsIERQTV9GTEFHX05FVkVSX1NLSVApOwotCiAJcmV0ID0gaTkx NV9kcml2ZXJfaW5pdF9lYXJseShkZXZfcHJpdiwgZW50KTsKIAlpZiAocmV0IDwgMCkKIAkJZ290 byBvdXRfcGNpX2Rpc2FibGU7CkBAIC0xNDA4LDggKzE0MDIsNiBAQCBpbnQgaTkxNV9kcml2ZXJf bG9hZChzdHJ1Y3QgcGNpX2RldiAqcGRldiwgY29uc3Qgc3RydWN0IHBjaV9kZXZpY2VfaWQgKmVu dCkKIAogCWk5MTVfZHJpdmVyX3JlZ2lzdGVyKGRldl9wcml2KTsKIAotCWludGVsX3J1bnRpbWVf cG1fZW5hYmxlKGRldl9wcml2KTsKLQogCWludGVsX2luaXRfaXBjKGRldl9wcml2KTsKIAogCWlu dGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKQEAgLTE0NDEsMTMgKzE0MzMsMTMgQEAgdm9p ZCBpOTE1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IHBjaV9kZXYg KnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAKLQlpOTE1X2RyaXZlcl91bnJlZ2lzdGVyKGRl dl9wcml2KTsKLQotCWlmIChpOTE1X2dlbV9zdXNwZW5kKGRldl9wcml2KSkKLQkJRFJNX0VSUk9S KCJmYWlsZWQgdG8gaWRsZSBoYXJkd2FyZTsgY29udGludWluZyB0byB1bmxvYWQhXG4iKTsKLQog CWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fSU5JVCk7CiAK KwlpOTE1X2RyaXZlcl91bnJlZ2lzdGVyKGRldl9wcml2KTsKKworCWlmIChpOTE1X2dlbV9zdXNw ZW5kKGRldl9wcml2KSkKKwkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gaWRsZSBoYXJkd2FyZTsgY29u dGludWluZyB0byB1bmxvYWQhXG4iKTsKKwogCWRybV9hdG9taWNfaGVscGVyX3NodXRkb3duKGRl dik7CiAKIAlpbnRlbF9ndnRfY2xlYW51cChkZXZfcHJpdik7CkBAIC0xNDc0LDYgKzE0NjYsNyBA QCB2b2lkIGk5MTVfZHJpdmVyX3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWk5MTVf ZHJpdmVyX2NsZWFudXBfbW1pbyhkZXZfcHJpdik7CiAKIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1 dChkZXZfcHJpdiwgUE9XRVJfRE9NQUlOX0lOSVQpOworCVdBUk5fT04oYXRvbWljX3JlYWQoJmRl dl9wcml2LT5ydW50aW1lX3BtLndha2VyZWZfY291bnQpKTsKIH0KIAogc3RhdGljIHZvaWQgaTkx NV9kcml2ZXJfcmVsZWFzZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaAppbmRleCA3Yjk4NGFlZmNlOTguLjNmMDEyNzE2ZjJkYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKQEAgLTE5NTksNiArMTk1OSw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfZG9tYWlu c192ZXJpZnlfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQg Ynh0X2Rpc3BsYXlfY29yZV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg Ym9vbCByZXN1bWUpOwogdm9pZCBieHRfZGlzcGxheV9jb3JlX3VuaW5pdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9ydW50aW1lX3BtX2VuYWJsZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwordm9pZCBpbnRlbF9ydW50aW1lX3BtX2Rp c2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGNvbnN0IGNoYXIgKgog aW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW5fc3RyKGVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9k b21haW4gZG9tYWluKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCmlu ZGV4IGUyMDllZGJjNTYxZC4uYzA5ODNmMGU0NmFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcnVudGltZV9wbS5jCkBAIC0zNzkzLDI5ICszNzkzLDE5IEBAIHZvaWQgaW50ZWxfcG93ZXJf ZG9tYWluc19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCBy ZXN1bWUpCiAgKi8KIHZvaWQgaW50ZWxfcG93ZXJfZG9tYWluc19maW5pX2h3KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZGV2aWNlICprZGV2ID0gJmRldl9w cml2LT5kcm0ucGRldi0+ZGV2OwotCiAJLyoKIAkgKiBUaGUgaTkxNS5rbyBtb2R1bGUgaXMgc3Rp bGwgbm90IHByZXBhcmVkIHRvIGJlIGxvYWRlZCB3aGVuCiAJICogdGhlIHBvd2VyIHdlbGwgaXMg bm90IGVuYWJsZWQsIHNvIGp1c3QgZW5hYmxlIGl0IGluIGNhc2UKIAkgKiB3ZSdyZSBnb2luZyB0 byB1bmxvYWQvcmVsb2FkLgotCSAqIFRoZSBmb2xsb3dpbmcgYWxzbyByZWFjcXVpcmVzIHRoZSBS UE0gcmVmZXJlbmNlIHRoZSBjb3JlIHBhc3NlZAotCSAqIHRvIHRoZSBkcml2ZXIgZHVyaW5nIGxv YWRpbmcsIHdoaWNoIGlzIGRyb3BwZWQgaW4KLQkgKiBpbnRlbF9ydW50aW1lX3BtX2VuYWJsZSgp LiBXZSBoYXZlIHRvIGhhbmQgYmFjayB0aGUgY29udHJvbCBvZiB0aGUKLQkgKiBkZXZpY2UgdG8g dGhlIGNvcmUgd2l0aCB0aGlzIHJlZmVyZW5jZSBoZWxkLgogCSAqLwotCWludGVsX2Rpc3BsYXlf c2V0X2luaXRfcG93ZXIoZGV2X3ByaXYsIHRydWUpOworCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0 KGRldl9wcml2LCBQT1dFUl9ET01BSU5fSU5JVCk7CisKKwkvKiBLZWVwIHRoZSBwb3dlciB3ZWxs IGVuYWJsZWQsIGJ1dCBjYW5jZWwgaXRzIHJwbSB3YWtlcmVmLiAqLworCWludGVsX3J1bnRpbWVf cG1fcHV0KGRldl9wcml2KTsKIAogCS8qIFJlbW92ZSB0aGUgcmVmY291bnQgd2UgdG9vayB0byBr ZWVwIHBvd2VyIHdlbGwgc3VwcG9ydCBkaXNhYmxlZC4gKi8KIAlpZiAoIWk5MTVfbW9kcGFyYW1z LmRpc2FibGVfcG93ZXJfd2VsbCkKIAkJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2X3ByaXYs IFBPV0VSX0RPTUFJTl9JTklUKTsKLQotCS8qCi0JICogUmVtb3ZlIHRoZSByZWZjb3VudCB3ZSB0 b29rIGluIGludGVsX3J1bnRpbWVfcG1fZW5hYmxlKCkgaW4gY2FzZQotCSAqIHRoZSBwbGF0Zm9y bSBkb2Vzbid0IHN1cHBvcnQgcnVudGltZSBQTS4KLQkgKi8KLQlpZiAoIUhBU19SVU5USU1FX1BN KGRldl9wcml2KSkKLQkJcG1fcnVudGltZV9wdXQoa2Rldik7CiB9CiAKIC8qKgpAQCAtNDA0OCw2 ICs0MDM4LDE2IEBAIHZvaWQgaW50ZWxfcnVudGltZV9wbV9lbmFibGUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRy bS5wZGV2OwogCXN0cnVjdCBkZXZpY2UgKmtkZXYgPSAmcGRldi0+ZGV2OwogCisJLyoKKwkgKiBE aXNhYmxlIHRoZSBzeXN0ZW0gc3VzcGVuZCBkaXJlY3QgY29tcGxldGUgb3B0aW1pemF0aW9uLCB3 aGljaCBjYW4KKwkgKiBsZWF2ZSB0aGUgZGV2aWNlIHN1c3BlbmRlZCBza2lwcGluZyB0aGUgZHJp dmVyJ3Mgc3VzcGVuZCBoYW5kbGVycworCSAqIGlmIHRoZSBkZXZpY2Ugd2FzIGFscmVhZHkgcnVu dGltZSBzdXNwZW5kZWQuIFRoaXMgaXMgbmVlZGVkIGR1ZSB0bworCSAqIHRoZSBkaWZmZXJlbmNl IGluIG91ciBydW50aW1lIGFuZCBzeXN0ZW0gc3VzcGVuZCBzZXF1ZW5jZSBhbmQKKwkgKiBiZWNh dWUgdGhlIEhEQSBkcml2ZXIgbWF5IHJlcXVpcmUgdXMgdG8gZW5hYmxlIHRoZSBhdWRpbyBwb3dl cgorCSAqIGRvbWFpbiBkdXJpbmcgc3lzdGVtIHN1c3BlbmQuCisJICovCisJZGV2X3BtX3NldF9k cml2ZXJfZmxhZ3Moa2RldiwgRFBNX0ZMQUdfTkVWRVJfU0tJUCk7CisKIAlwbV9ydW50aW1lX3Nl dF9hdXRvc3VzcGVuZF9kZWxheShrZGV2LCAxMDAwMCk7IC8qIDEwcyAqLwogCXBtX3J1bnRpbWVf bWFya19sYXN0X2J1c3koa2Rldik7CiAKQEAgLTQwNzQsMyArNDA3NCwxOCBAQCB2b2lkIGludGVs X3J1bnRpbWVfcG1fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkg Ki8KIAlwbV9ydW50aW1lX3B1dF9hdXRvc3VzcGVuZChrZGV2KTsKIH0KKwordm9pZCBpbnRlbF9y dW50aW1lX3BtX2Rpc2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorewor CXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OworCXN0cnVjdCBkZXZp Y2UgKmtkZXYgPSAmcGRldi0+ZGV2OworCisJLyogVHJhbnNmZXIgcnBtIG93bmVyc2hpcCBiYWNr IHRvIGNvcmUgKi8KKwlXQVJOKHBtX3J1bnRpbWVfZ2V0X3N5bmMoJmRldl9wcml2LT5kcm0ucGRl di0+ZGV2KSA8IDAsCisJICAgICAiRmFpbGVkIHRvIHBhc3MgcnBtIG93bmVyc2hpcCBiYWNrIHRv IGNvcmVcbiIpOworCisJcG1fcnVudGltZV9kb250X3VzZV9hdXRvc3VzcGVuZChrZGV2KTsKKwor CWlmICghSEFTX1JVTlRJTUVfUE0oZGV2X3ByaXYpKQorCQlwbV9ydW50aW1lX3B1dChrZGV2KTsK K30KLS0gCjIuMTMuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==