From: Nick Hoath Subject: [RFC 3/5] drm/i915: Simplify runtime_pm reference for execlists Date: Thu, 9 Jul 2015 11:57:42 +0100 Message-ID: <1436439464-17122-3-git-send-email-nicholas.hoath@intel.com> References: <1436439464-17122-1-git-send-email-nicholas.hoath@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B3AB6E435 for ; Thu, 9 Jul 2015 03:57:55 -0700 (PDT) In-Reply-To: <1436439464-17122-1-git-send-email-nicholas.hoath@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 Tm8gbG9uZ2VyIHRha2UgYSBydW50aW1lX3BtIHJlZmVyZW5jZSBmb3IgZWFjaCBleGVjbGlzdCBy ZXF1ZXN0LiAgT25seQp0YWtlIGEgc2luZ2xlIHJlZmVyZW5jZSB3aGVuIHRoZSBleGVjbGlzdCBx dWV1ZSBiZWNvbWVzIG5vbmVtcHR5IGFuZApyZWxlYXNlIGl0IHdoZW4gaXQgYmVjb21lcyBlbXB0 eS4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBEYW5pZWwgPHRob21hcy5kYW5pZWxAaW50ZWwuY29t PgpTaWduZWQtb2ZmLWJ5OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgfCAxMCArKysrKysrLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyB8IDE1ICsrKysrKysrKysrKystLQogMiBmaWxl cyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCmluZGV4IDM2ODFhMzMuLmQ5ZjVlNGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwpAQCAtMjc1OCw2ICsyNzU4LDEzIEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3Jlc2V0X3Jpbmdf Y2xlYW51cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJfQogCiAJLyoKKwkg KiBJZiB3ZSBjb21lIGluIGhlcmUsIGFuZCB0aGUgbGlzdCB3YXNuJ3QgZW1wdHksIHRoZW4gdGhl cmUgd2FzCisJICogYSBwbSB0YWtlbiwgc28gZnJlZSBpdCB1cCBub3cKKwkgKi8KKwlpZiAoIWxp c3RfZW1wdHkoJnJpbmctPmV4ZWNsaXN0X3F1ZXVlKSkKKwkJaW50ZWxfcnVudGltZV9wbV9wdXQo ZGV2X3ByaXYpOworCisJLyoKIAkgKiBDbGVhciB0aGUgZXhlY2xpc3RzIHF1ZXVlIHVwIGJlZm9y ZSBmcmVlaW5nIHRoZSByZXF1ZXN0cywgYXMgdGhvc2UKIAkgKiBhcmUgdGhlIG9uZXMgdGhhdCBr ZWVwIHRoZSBjb250ZXh0IGFuZCByaW5nYnVmZmVyIGJhY2tpbmcgb2JqZWN0cwogCSAqIHBpbm5l ZCBpbiBwbGFjZS4KQEAgLTI4NjYsOCArMjg3Myw2IEBAIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0 c19yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAKIAkJaWYgKGk5MTUuZW5hYmxl X2V4ZWNsaXN0cykgewogCQkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IHJlcXVlc3QtPmN0 eDsKLQkJCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9Ci0JCQkJcmluZy0+ZGV2 LT5kZXZfcHJpdmF0ZTsKIAkJCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJCQlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9CiAJCQkJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRl OwpAQCAtMjg3Nyw3ICsyODgyLDYgQEAgaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3Jpbmcoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJCWlmIChjdHhfb2JqICYmIChjdHggIT0gcmlu Zy0+ZGVmYXVsdF9jb250ZXh0KSkKIAkJCQlpbnRlbF9scl9jb250ZXh0X3VucGluKHJpbmcsIGN0 eCk7CiAKLQkJCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKIAkJCXNwaW5fdW5sb2Nr X2lycXJlc3RvcmUoJnJpbmctPmV4ZWNsaXN0X2xvY2ssIGZsYWdzKTsKIAkJfQogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jCmluZGV4IDgzNzM5MDAuLmFkYzQ5NDIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCkBAIC0zOTksOCArMzk5LDE2IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250 ZXh0X3VucXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkgKi8KIAlXQVJOX09O KCFpbnRlbF9pcnFzX2VuYWJsZWQocmluZy0+ZGV2LT5kZXZfcHJpdmF0ZSkpOwogCi0JaWYgKGxp c3RfZW1wdHkoJnJpbmctPmV4ZWNsaXN0X3F1ZXVlKSkKKwlpZiAobGlzdF9lbXB0eSgmcmluZy0+ ZXhlY2xpc3RfcXVldWUpKSB7CisJCS8qCisJCSAqIFdlIGNhbiBvbmx5IGNvbWUgaW4gdG8gdGhp cyBmdW5jdGlvbiBpZiBhdCBzb21lCisJCSAqIHBvaW50IHRoZXJlIHdhcyBhIHJlcXVlc3QgcXVl dWVkLiBTbyBpZiB0aGVyZQorCQkgKiBhcmUgbm8gbG9uZ2VyIGFueSByZXF1ZXN0cyBxdWV1ZWQs IGl0J3MgdGltZSB0bworCQkgKiBwdXQgdGhlIHBtCisJCSAqLworCQlpbnRlbF9ydW50aW1lX3Bt X3B1dChyaW5nLT5kZXYtPmRldl9wcml2YXRlKTsKIAkJcmV0dXJuOworCX0KIAogCS8qIFRyeSB0 byByZWFkIGluIHBhaXJzICovCiAJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKGN1cnNvciwgdG1w LCAmcmluZy0+ZXhlY2xpc3RfcXVldWUsCkBAIC01NDYsNiArNTU0LDcgQEAgYm9vbCBpbnRlbF9s cmNfaXJxX2hhbmRsZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHN0YXRpYyBpbnQg ZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1 ZXN0KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXF1ZXN0LT5yaW5nOwor CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZh dGU7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpjdXJzb3I7CiAJaW50IG51bV9lbGVt ZW50cyA9IDA7CiAKQEAgLTU3Nyw4ICs1ODYsMTAgQEAgc3RhdGljIGludCBleGVjbGlzdHNfY29u dGV4dF9xdWV1ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJfQogCiAJ bGlzdF9hZGRfdGFpbCgmcmVxdWVzdC0+ZXhlY2xpc3RfbGluaywgJnJpbmctPmV4ZWNsaXN0X3F1 ZXVlKTsKLQlpZiAobnVtX2VsZW1lbnRzID09IDApCisJaWYgKG51bV9lbGVtZW50cyA9PSAwKSB7 CisJCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKIAkJZXhlY2xpc3RzX2NvbnRleHRf dW5xdWV1ZShyaW5nKTsKKwl9CiAKIAlzcGluX3VubG9ja19pcnEoJnJpbmctPmV4ZWNsaXN0X2xv Y2spOwogCi0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK