From: Imre Deak Subject: [PATCH v3 01/12] drm/i915: add helper to get a display power ref if it was already enabled Date: Wed, 17 Feb 2016 14:17:42 +0200 Message-ID: <1455711462-7442-1-git-send-email-imre.deak@intel.com> References: <1455545933-2940-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DC946E983 for ; Wed, 17 Feb 2016 12:17:45 +0000 (UTC) In-Reply-To: <1455545933-2940-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 Cc: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org V2UgaGF2ZSBtYW55IHBsYWNlcyBpbiB0aGUgY29kZSB3aGVyZSB3ZSBjaGVjayBpZiBhIGdpdmVu IGRpc3BsYXkgcG93ZXIKZG9tYWluIGlzIGVuYWJsZWQgYW5kIGlmIHNvIGFjY2VzcyByZWdpc3Rl cnMgYmFja2VkIGJ5IHRoaXMgcG93ZXIKZG9tYWluLiBXZSBhc3N1bWVkIHRoYXQgc29tZSBtb2Rl c2V0IGxvY2sgd2lsbCBwcmV2ZW50IHRoZSBwb3dlcgpyZWZlcmVuY2UgZnJvbSB2YW5pc2hpbmcg aW4gdGhlIG1pZGRsZSBvZiB0aGUgSFcgYWNjZXNzLCBidXQgdGhpcwphc3N1bXB0aW9uIGRvZXNu J3QgYWx3YXlzIGhvbGQuIEluIHN1Y2ggY2FzZXMgd2UgZ2V0IGVpdGhlciB0aGUgd2FrZXJlZgpu b3QgaGVsZCwgb3IgYW4gdW5jbGFpbWVkIHJlZ2lzdGVyIGFjY2VzcyBlcnJvciBtZXNzYWdlLiBU byBmaXggdGhpcyBpbgphIGZ1dHVyZS1wcm9vZiB3YXkgdGhhdCdzIGluZGVwZW5kZW50IG9mIG90 aGVyIGxvY2tzIHdyYXAgYW55IHN1Y2gKYWNjZXNzIHdpdGggYSBnZXRfcmVmX2lmX2VuYWJsZWQo KS9wdXRfcmVmKCkgcGFpci4KCkt1ZG9zIHRvIFZpbGxlIGFuZCBKb29uYXMgZm9yIHRoZSBpZGVh cyBvZiB0aGlzIG5ldyBpbnRlcmZhY2UuCgp2MjoKLSBpbml0IHRoZSBwb3dlcl9kb21haW5zIHB0 ciB3aGVuIGRlY2xhcmluZyBpdCBldmVyeXdoZXJlIChKb29uYXMpCnYzOgotIGRvbid0IHJlcG9y dCB0aGUgZGV2aWNlIHRvIGJlIHBvd2VyZWQgaWYgcnVudGltZSBQTSBpcyBkaXNhYmxlZAoKQ0M6 IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgpDQzogQ2hyaXMgV2lsc29u IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNDOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5s YWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNDOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0Bp bnRlbC5jb20+ClJldmlld2VkLWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBs aW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAg ICAgIHwgICAzICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyB8IDEy NCArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMDYg aW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApp bmRleCAzY2FlMzc2Li5mOTVmOGIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTQz Niw2ICsxNDM2LDggQEAgYm9vbCBfX2ludGVsX2Rpc3BsYXlfcG93ZXJfaXNfZW5hYmxlZChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJICAgICAgZW51bSBpbnRlbF9kaXNw bGF5X3Bvd2VyX2RvbWFpbiBkb21haW4pOwogdm9pZCBpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAgIGVudW0gaW50ZWxfZGlz cGxheV9wb3dlcl9kb21haW4gZG9tYWluKTsKK2Jvb2wgaW50ZWxfZGlzcGxheV9wb3dlcl9nZXRf aWZfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCWVudW0g aW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gZG9tYWluKTsKIHZvaWQgaW50ZWxfZGlzcGxheV9w b3dlcl9wdXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICBlbnVt IGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWluIGRvbWFpbik7CiAKQEAgLTE1MjIsNiArMTUyNCw3 IEBAIGVuYWJsZV9ycG1fd2FrZXJlZl9hc3NlcnRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAllbmFibGVfcnBtX3dha2VyZWZfYXNzZXJ0cyhkZXZfcHJpdikKIAogdm9pZCBp bnRlbF9ydW50aW1lX3BtX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwor Ym9vbCBpbnRlbF9ydW50aW1lX3BtX2dldF9pZl9pbl91c2Uoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfcnVudGltZV9wbV9nZXRfbm9yZXN1bWUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfcnVudGltZV9wbV9wdXQo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcnVudGltZV9wbS5jCmluZGV4IGJiY2E1MjcuLmEyZTM2N2MgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAgLTE0MzUsMzkgKzE0MzUsODQgQEAgc3RhdGlj IHZvaWQgY2h2X3BpcGVfcG93ZXJfd2VsbF9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAljaHZfc2V0X3BpcGVfcG93ZXJfd2VsbChkZXZfcHJpdiwgcG93ZXJfd2Vs bCwgZmFsc2UpOwogfQogCi0vKioKLSAqIGludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0IC0gZ3JhYiBh IHBvd2VyIGRvbWFpbiByZWZlcmVuY2UKLSAqIEBkZXZfcHJpdjogaTkxNSBkZXZpY2UgaW5zdGFu Y2UKLSAqIEBkb21haW46IHBvd2VyIGRvbWFpbiB0byByZWZlcmVuY2UKLSAqCi0gKiBUaGlzIGZ1 bmN0aW9uIGdyYWJzIGEgcG93ZXIgZG9tYWluIHJlZmVyZW5jZSBmb3IgQGRvbWFpbiBhbmQgZW5z dXJlcyB0aGF0IHRoZQotICogcG93ZXIgZG9tYWluIGFuZCBhbGwgaXRzIHBhcmVudHMgYXJlIHBv d2VyZWQgdXAuIFRoZXJlZm9yZSB1c2VycyBzaG91bGQgb25seQotICogZ3JhYiBhIHJlZmVyZW5j ZSB0byB0aGUgaW5uZXJtb3N0IHBvd2VyIGRvbWFpbiB0aGV5IG5lZWQuCi0gKgotICogQW55IHBv d2VyIGRvbWFpbiByZWZlcmVuY2Ugb2J0YWluZWQgYnkgdGhpcyBmdW5jdGlvbiBtdXN0IGhhdmUg YSBzeW1tZXRyaWMKLSAqIGNhbGwgdG8gaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoKSB0byByZWxl YXNlIHRoZSByZWZlcmVuY2UgYWdhaW4uCi0gKi8KLXZvaWQgaW50ZWxfZGlzcGxheV9wb3dlcl9n ZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJICAgICBlbnVtIGludGVs X2Rpc3BsYXlfcG93ZXJfZG9tYWluIGRvbWFpbikKK3N0YXRpYyB2b2lkCitfX2ludGVsX2Rpc3Bs YXlfcG93ZXJfZ2V0X2RvbWFpbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJ CQkJIGVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gZG9tYWluKQogewotCXN0cnVjdCBp OTE1X3Bvd2VyX2RvbWFpbnMgKnBvd2VyX2RvbWFpbnM7CisJc3RydWN0IGk5MTVfcG93ZXJfZG9t YWlucyAqcG93ZXJfZG9tYWlucyA9ICZkZXZfcHJpdi0+cG93ZXJfZG9tYWluczsKIAlzdHJ1Y3Qg aTkxNV9wb3dlcl93ZWxsICpwb3dlcl93ZWxsOwogCWludCBpOwogCi0JaW50ZWxfcnVudGltZV9w bV9nZXQoZGV2X3ByaXYpOwotCi0JcG93ZXJfZG9tYWlucyA9ICZkZXZfcHJpdi0+cG93ZXJfZG9t YWluczsKLQotCW11dGV4X2xvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOwotCiAJZm9yX2VhY2hf cG93ZXJfd2VsbChpLCBwb3dlcl93ZWxsLCBCSVQoZG9tYWluKSwgcG93ZXJfZG9tYWlucykgewog CQlpZiAoIXBvd2VyX3dlbGwtPmNvdW50KyspCiAJCQlpbnRlbF9wb3dlcl93ZWxsX2VuYWJsZShk ZXZfcHJpdiwgcG93ZXJfd2VsbCk7CiAJfQogCiAJcG93ZXJfZG9tYWlucy0+ZG9tYWluX3VzZV9j b3VudFtkb21haW5dKys7Cit9CisKKy8qKgorICogaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQgLSBn cmFiIGEgcG93ZXIgZG9tYWluIHJlZmVyZW5jZQorICogQGRldl9wcml2OiBpOTE1IGRldmljZSBp bnN0YW5jZQorICogQGRvbWFpbjogcG93ZXIgZG9tYWluIHRvIHJlZmVyZW5jZQorICoKKyAqIFRo aXMgZnVuY3Rpb24gZ3JhYnMgYSBwb3dlciBkb21haW4gcmVmZXJlbmNlIGZvciBAZG9tYWluIGFu ZCBlbnN1cmVzIHRoYXQgdGhlCisgKiBwb3dlciBkb21haW4gYW5kIGFsbCBpdHMgcGFyZW50cyBh cmUgcG93ZXJlZCB1cC4gVGhlcmVmb3JlIHVzZXJzIHNob3VsZCBvbmx5CisgKiBncmFiIGEgcmVm ZXJlbmNlIHRvIHRoZSBpbm5lcm1vc3QgcG93ZXIgZG9tYWluIHRoZXkgbmVlZC4KKyAqCisgKiBB bnkgcG93ZXIgZG9tYWluIHJlZmVyZW5jZSBvYnRhaW5lZCBieSB0aGlzIGZ1bmN0aW9uIG11c3Qg aGF2ZSBhIHN5bW1ldHJpYworICogY2FsbCB0byBpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dCgpIHRv IHJlbGVhc2UgdGhlIHJlZmVyZW5jZSBhZ2Fpbi4KKyAqLwordm9pZCBpbnRlbF9kaXNwbGF5X3Bv d2VyX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgIGVudW0g aW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gZG9tYWluKQoreworCXN0cnVjdCBpOTE1X3Bvd2Vy X2RvbWFpbnMgKnBvd2VyX2RvbWFpbnMgPSAmZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnM7CisKKwlp bnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CisKKwltdXRleF9sb2NrKCZwb3dlcl9kb21h aW5zLT5sb2NrKTsKKworCV9faW50ZWxfZGlzcGxheV9wb3dlcl9nZXRfZG9tYWluKGRldl9wcml2 LCBkb21haW4pOworCisJbXV0ZXhfdW5sb2NrKCZwb3dlcl9kb21haW5zLT5sb2NrKTsKK30KKwor LyoqCisgKiBpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldF9pZl9lbmFibGVkIC0gZ3JhYiBhIHJlZmVy ZW5jZSBmb3IgYW4gZW5hYmxlZCBkaXNwbGF5IHBvd2VyIGRvbWFpbgorICogQGRldl9wcml2OiBp OTE1IGRldmljZSBpbnN0YW5jZQorICogQGRvbWFpbjogcG93ZXIgZG9tYWluIHRvIHJlZmVyZW5j ZQorICoKKyAqIFRoaXMgZnVuY3Rpb24gZ3JhYnMgYSBwb3dlciBkb21haW4gcmVmZXJlbmNlIGZv ciBAZG9tYWluIGFuZCBlbnN1cmVzIHRoYXQgdGhlCisgKiBwb3dlciBkb21haW4gYW5kIGFsbCBp dHMgcGFyZW50cyBhcmUgcG93ZXJlZCB1cC4gVGhlcmVmb3JlIHVzZXJzIHNob3VsZCBvbmx5Cisg KiBncmFiIGEgcmVmZXJlbmNlIHRvIHRoZSBpbm5lcm1vc3QgcG93ZXIgZG9tYWluIHRoZXkgbmVl ZC4KKyAqCisgKiBBbnkgcG93ZXIgZG9tYWluIHJlZmVyZW5jZSBvYnRhaW5lZCBieSB0aGlzIGZ1 bmN0aW9uIG11c3QgaGF2ZSBhIHN5bW1ldHJpYworICogY2FsbCB0byBpbnRlbF9kaXNwbGF5X3Bv d2VyX3B1dCgpIHRvIHJlbGVhc2UgdGhlIHJlZmVyZW5jZSBhZ2Fpbi4KKyAqLworYm9vbCBpbnRl bF9kaXNwbGF5X3Bvd2VyX2dldF9pZl9lbmFibGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKKwkJCQkJZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW4pCit7 CisJc3RydWN0IGk5MTVfcG93ZXJfZG9tYWlucyAqcG93ZXJfZG9tYWlucyA9ICZkZXZfcHJpdi0+ cG93ZXJfZG9tYWluczsKKwlib29sIGlzX2VuYWJsZWQ7CisKKwlpZiAoIWludGVsX3J1bnRpbWVf cG1fZ2V0X2lmX2luX3VzZShkZXZfcHJpdikpCisJCXJldHVybiBmYWxzZTsKKworCW11dGV4X2xv Y2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOworCisJaWYgKF9faW50ZWxfZGlzcGxheV9wb3dlcl9p c19lbmFibGVkKGRldl9wcml2LCBkb21haW4pKSB7CisJCV9faW50ZWxfZGlzcGxheV9wb3dlcl9n ZXRfZG9tYWluKGRldl9wcml2LCBkb21haW4pOworCQlpc19lbmFibGVkID0gdHJ1ZTsKKwl9IGVs c2UgeworCQlpc19lbmFibGVkID0gZmFsc2U7CisJfQogCiAJbXV0ZXhfdW5sb2NrKCZwb3dlcl9k b21haW5zLT5sb2NrKTsKKworCWlmICghaXNfZW5hYmxlZCkKKwkJaW50ZWxfcnVudGltZV9wbV9w dXQoZGV2X3ByaXYpOworCisJcmV0dXJuIGlzX2VuYWJsZWQ7CiB9CiAKIC8qKgpAQCAtMjIzOSw2 ICsyMjg0LDQzIEBAIHZvaWQgaW50ZWxfcnVudGltZV9wbV9nZXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogfQogCiAvKioKKyAqIGludGVsX3J1bnRpbWVfcG1fZ2V0X2lmX2lu X3VzZSAtIGdyYWIgYSBydW50aW1lIHBtIHJlZmVyZW5jZSBpZiBkZXZpY2UgaW4gdXNlCisgKiBA ZGV2X3ByaXY6IGk5MTUgZGV2aWNlIGluc3RhbmNlCisgKgorICogVGhpcyBmdW5jdGlvbiBncmFi cyBhIGRldmljZS1sZXZlbCBydW50aW1lIHBtIHJlZmVyZW5jZSBpZiB0aGUgZGV2aWNlIGlzCisg KiBhbHJlYWR5IGluIHVzZSBhbmQgZW5zdXJlcyB0aGF0IGl0IGlzIHBvd2VyZWQgdXAuCisgKgor ICogQW55IHJ1bnRpbWUgcG0gcmVmZXJlbmNlIG9idGFpbmVkIGJ5IHRoaXMgZnVuY3Rpb24gbXVz dCBoYXZlIGEgc3ltbWV0cmljCisgKiBjYWxsIHRvIGludGVsX3J1bnRpbWVfcG1fcHV0KCkgdG8g cmVsZWFzZSB0aGUgcmVmZXJlbmNlIGFnYWluLgorICovCitib29sIGludGVsX3J1bnRpbWVfcG1f Z2V0X2lmX2luX3VzZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7CisJc3RydWN0IGRldmljZSAqZGV2 aWNlID0gJmRldi0+cGRldi0+ZGV2OworCWludCByZXQ7CisKKwlpZiAoIUlTX0VOQUJMRUQoQ09O RklHX1BNKSkKKwkJcmV0dXJuIHRydWU7CisKKwlyZXQgPSBwbV9ydW50aW1lX2dldF9pZl9pbl91 c2UoZGV2aWNlKTsKKworCS8qCisJICogSW4gY2FzZXMgcnVudGltZSBQTSBpcyBkaXNhYmxlZCBi eSB0aGUgUlBNIGNvcmUgYW5kIHdlIGdldCBhbgorCSAqIC1FSU5WQUwgcmV0dXJuIHZhbHVlIHdl IGFyZSBub3Qgc3VwcG9zZWQgdG8gY2FsbCB0aGlzIGZ1bmN0aW9uLAorCSAqIHNpbmNlIHRoZSBw b3dlciBzdGF0ZSBpcyB1bmRlZmluZWQuIFRoaXMgYXBwbGllcyBhdG0gdG8gdGhlCisJICogbGF0 ZS9lYXJseSBzeXN0ZW0gc3VzcGVuZC9yZXN1bWUgaGFuZGxlcnMuCisJICovCisJV0FSTl9PTl9P TkNFKHJldCA8IDApOworCWlmIChyZXQgPD0gMCkKKwkJcmV0dXJuIGZhbHNlOworCisJYXRvbWlj X2luYygmZGV2X3ByaXYtPnBtLndha2VyZWZfY291bnQpOworCWFzc2VydF9ycG1fd2FrZWxvY2tf aGVsZChkZXZfcHJpdik7CisKKwlyZXR1cm4gdHJ1ZTsKK30KKworLyoqCiAgKiBpbnRlbF9ydW50 aW1lX3BtX2dldF9ub3Jlc3VtZSAtIGdyYWIgYSBydW50aW1lIHBtIHJlZmVyZW5jZQogICogQGRl dl9wcml2OiBpOTE1IGRldmljZSBpbnN0YW5jZQogICoKLS0gCjIuNS4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK