From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 11/46] drm/i915/guc: Track the rpm wakeref Date: Mon, 7 Jan 2019 11:54:34 +0000 Message-ID: <20190107115509.12523-11-chris@chris-wilson.co.uk> References: <20190107115509.12523-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4FBD46EBAB for ; Mon, 7 Jan 2019 11:55:49 +0000 (UTC) In-Reply-To: <20190107115509.12523-1-chris@chris-wilson.co.uk> 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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org S2VlcCB0cmFjayBvZiBvdXIgYWNxdWlyZWQgd2FrZXJlZiBmb3IgaW50ZXJhY3Rpbmcgd2l0aCB0 aGUgZ3VjLCBzbyB0aGF0CndlIGNhbiBjYW5jZWwgaXQgdXBvbiByZWxlYXNlIGFuZCBzbyBjbGVh cmx5IGlkZW50aWZ5IGxlYWtzLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0Bj aHJpcy13aWxzb24uY28udWs+CkNjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYyB8IDE1ICsrKysrKysr Ky0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgICAgIHwgIDUgKysrLS0K IDIgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKaW5kZXggMWIxNTgxYTQyYWExLi4yMGMwYjM2ZDc0 OGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKQEAgLTQzNiw2ICs0MzYsNyBA QCBzdGF0aWMgdm9pZCBndWNfbG9nX2NhcHR1cmVfbG9ncyhzdHJ1Y3QgaW50ZWxfZ3VjX2xvZyAq bG9nKQogewogCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9IGxvZ190b19ndWMobG9nKTsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOworCWludGVs X3dha2VyZWZfdCB3YWtlcmVmOwogCiAJZ3VjX3JlYWRfdXBkYXRlX2xvZ19idWZmZXIobG9nKTsK IApAQCAtNDQzLDkgKzQ0NCw5IEBAIHN0YXRpYyB2b2lkIGd1Y19sb2dfY2FwdHVyZV9sb2dzKHN0 cnVjdCBpbnRlbF9ndWNfbG9nICpsb2cpCiAJICogR2VuZXJhbGx5IGRldmljZSBpcyBleHBlY3Rl ZCB0byBiZSBhY3RpdmUgb25seSBhdCB0aGlzCiAJICogdGltZSwgc28gZ2V0L3B1dCBzaG91bGQg YmUgcmVhbGx5IHF1aWNrLgogCSAqLwotCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsK Kwl3YWtlcmVmID0gaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwogCWd1Y19hY3Rpb25f Zmx1c2hfbG9nX2NvbXBsZXRlKGd1Yyk7Ci0JaW50ZWxfcnVudGltZV9wbV9wdXRfdW5jaGVja2Vk KGRldl9wcml2KTsKKwlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdiwgd2FrZXJlZik7CiB9 CiAKIGludCBpbnRlbF9ndWNfbG9nX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjX2xvZyAqbG9nKQpA QCAtNTA1LDYgKzUwNiw3IEBAIGludCBpbnRlbF9ndWNfbG9nX3NldF9sZXZlbChzdHJ1Y3QgaW50 ZWxfZ3VjX2xvZyAqbG9nLCB1MzIgbGV2ZWwpCiB7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0g bG9nX3RvX2d1Yyhsb2cpOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1 Y190b19pOTE1KGd1Yyk7CisJaW50ZWxfd2FrZXJlZl90IHdha2VyZWY7CiAJaW50IHJldDsKIAog CUJVSUxEX0JVR19PTihHVUNfTE9HX1ZFUkJPU0lUWV9NSU4gIT0gMCk7CkBAIC01MjQsMTEgKzUy NiwxMSBAQCBpbnQgaW50ZWxfZ3VjX2xvZ19zZXRfbGV2ZWwoc3RydWN0IGludGVsX2d1Y19sb2cg KmxvZywgdTMyIGxldmVsKQogCQlnb3RvIG91dF91bmxvY2s7CiAJfQogCi0JaW50ZWxfcnVudGlt ZV9wbV9nZXQoZGV2X3ByaXYpOworCXdha2VyZWYgPSBpbnRlbF9ydW50aW1lX3BtX2dldChkZXZf cHJpdik7CiAJcmV0ID0gZ3VjX2FjdGlvbl9jb250cm9sX2xvZyhndWMsIEdVQ19MT0dfTEVWRUxf SVNfVkVSQk9TRShsZXZlbCksCiAJCQkJICAgICBHVUNfTE9HX0xFVkVMX0lTX0VOQUJMRUQobGV2 ZWwpLAogCQkJCSAgICAgR1VDX0xPR19MRVZFTF9UT19WRVJCT1NJVFkobGV2ZWwpKTsKLQlpbnRl bF9ydW50aW1lX3BtX3B1dF91bmNoZWNrZWQoZGV2X3ByaXYpOworCWludGVsX3J1bnRpbWVfcG1f cHV0KGRldl9wcml2LCB3YWtlcmVmKTsKIAlpZiAocmV0KSB7CiAJCURSTV9ERUJVR19EUklWRVIo Imd1Y19sb2dfY29udHJvbCBhY3Rpb24gZmFpbGVkICVkXG4iLCByZXQpOwogCQlnb3RvIG91dF91 bmxvY2s7CkBAIC02MDEsNiArNjAzLDcgQEAgdm9pZCBpbnRlbF9ndWNfbG9nX3JlbGF5X2ZsdXNo KHN0cnVjdCBpbnRlbF9ndWNfbG9nICpsb2cpCiB7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0g bG9nX3RvX2d1Yyhsb2cpOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gZ3VjX3Rv X2k5MTUoZ3VjKTsKKwlpbnRlbF93YWtlcmVmX3Qgd2FrZXJlZjsKIAogCS8qCiAJICogQmVmb3Jl IGluaXRpYXRpbmcgdGhlIGZvcmNlZnVsIGZsdXNoLCB3YWl0IGZvciBhbnkgcGVuZGluZy9vbmdv aW5nCkBAIC02MDgsOSArNjExLDkgQEAgdm9pZCBpbnRlbF9ndWNfbG9nX3JlbGF5X2ZsdXNoKHN0 cnVjdCBpbnRlbF9ndWNfbG9nICpsb2cpCiAJICovCiAJZmx1c2hfd29yaygmbG9nLT5yZWxheS5m bHVzaF93b3JrKTsKIAotCWludGVsX3J1bnRpbWVfcG1fZ2V0KGk5MTUpOworCXdha2VyZWYgPSBp bnRlbF9ydW50aW1lX3BtX2dldChpOTE1KTsKIAlndWNfYWN0aW9uX2ZsdXNoX2xvZyhndWMpOwot CWludGVsX3J1bnRpbWVfcG1fcHV0X3VuY2hlY2tlZChpOTE1KTsKKwlpbnRlbF9ydW50aW1lX3Bt X3B1dChpOTE1LCB3YWtlcmVmKTsKIAogCS8qIEd1QyB3b3VsZCBoYXZlIHVwZGF0ZWQgbG9nIGJ1 ZmZlciBieSBub3csIHNvIGNhcHR1cmUgaXQgKi8KIAlndWNfbG9nX2NhcHR1cmVfbG9ncyhsb2cp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwppbmRleCBjMmIwNzZlOWJhZGEuLjNlOGMxOGI2YTQy ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKQEAgLTExNSwxNCArMTE1LDE1IEBAIGludCBp bnRlbF9odWNfYXV0aChzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiBpbnQgaW50ZWxfaHVjX2NoZWNr X3N0YXR1cyhzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gaHVjX3RvX2k5MTUoaHVjKTsKKwlpbnRlbF93YWtlcmVmX3Qgd2FrZXJl ZjsKIAlib29sIHN0YXR1czsKIAogCWlmICghSEFTX0hVQyhkZXZfcHJpdikpCiAJCXJldHVybiAt RU5PREVWOwogCi0JaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOworCXdha2VyZWYgPSBp bnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAJc3RhdHVzID0gSTkxNV9SRUFEKEhVQ19T VEFUVVMyKSAmIEhVQ19GV19WRVJJRklFRDsKLQlpbnRlbF9ydW50aW1lX3BtX3B1dF91bmNoZWNr ZWQoZGV2X3ByaXYpOworCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2LCB3YWtlcmVmKTsK IAogCXJldHVybiBzdGF0dXM7CiB9Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=