From: Imre Deak Subject: [PATCH 01/12] drm/i915: add helper to get a display power ref if it was already enabled Date: Fri, 12 Feb 2016 18:55:10 +0200 Message-ID: <1455296121-4742-2-git-send-email-imre.deak@intel.com> References: <1455296121-4742-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A5D1A6EB18 for ; Fri, 12 Feb 2016 08:55:29 -0800 (PST) In-Reply-To: <1455296121-4742-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 cyBvZiB0aGlzIG5ldyBpbnRlcmZhY2UuCgpDQzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFs YUBpbnRlbC5jb20+CkNDOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K Q0M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ0M6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1v ZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgICAgfCAgIDMgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcnVudGltZV9wbS5jIHwgMTExICsrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDk2IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggODc4MTcyYS4uOTM4MGZmZSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKQEAgLTE0MzYsNiArMTQzNiw4IEBAIGJvb2wgX19pbnRlbF9kaXNwbGF5 X3Bvd2VyX2lzX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJ CSAgICAgIGVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gZG9tYWluKTsKIHZvaWQgaW50 ZWxfZGlzcGxheV9wb3dlcl9nZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQkJICAgICBlbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWluIGRvbWFpbik7Citib29sIGlu dGVsX2Rpc3BsYXlfcG93ZXJfZ2V0X2lmX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAorCQkJCQllbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWluIGRvbWFpbik7 CiB2b2lkIGludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAkJCSAgICAgZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW4p OwogCkBAIC0xNTIyLDYgKzE1MjQsNyBAQCBlbmFibGVfcnBtX3dha2VyZWZfYXNzZXJ0cyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZW5hYmxlX3JwbV93YWtlcmVmX2Fzc2Vy dHMoZGV2X3ByaXYpCiAKIHZvaWQgaW50ZWxfcnVudGltZV9wbV9nZXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKK2Jvb2wgaW50ZWxfcnVudGltZV9wbV9nZXRfaWZfaW5fdXNl KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX3J1bnRpbWVf cG1fZ2V0X25vcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lk IGludGVsX3J1bnRpbWVfcG1fcHV0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwppbmRleCBiYmNhNTI3Li5h ODFmOTY1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3Bt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC0xNDM1 LDM5ICsxNDM1LDkwIEBAIHN0YXRpYyB2b2lkIGNodl9waXBlX3Bvd2VyX3dlbGxfZGlzYWJsZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJY2h2X3NldF9waXBlX3Bvd2VyX3dl bGwoZGV2X3ByaXYsIHBvd2VyX3dlbGwsIGZhbHNlKTsKIH0KIAotLyoqCi0gKiBpbnRlbF9kaXNw bGF5X3Bvd2VyX2dldCAtIGdyYWIgYSBwb3dlciBkb21haW4gcmVmZXJlbmNlCi0gKiBAZGV2X3By aXY6IGk5MTUgZGV2aWNlIGluc3RhbmNlCi0gKiBAZG9tYWluOiBwb3dlciBkb21haW4gdG8gcmVm ZXJlbmNlCi0gKgotICogVGhpcyBmdW5jdGlvbiBncmFicyBhIHBvd2VyIGRvbWFpbiByZWZlcmVu Y2UgZm9yIEBkb21haW4gYW5kIGVuc3VyZXMgdGhhdCB0aGUKLSAqIHBvd2VyIGRvbWFpbiBhbmQg YWxsIGl0cyBwYXJlbnRzIGFyZSBwb3dlcmVkIHVwLiBUaGVyZWZvcmUgdXNlcnMgc2hvdWxkIG9u bHkKLSAqIGdyYWIgYSByZWZlcmVuY2UgdG8gdGhlIGlubmVybW9zdCBwb3dlciBkb21haW4gdGhl eSBuZWVkLgotICoKLSAqIEFueSBwb3dlciBkb21haW4gcmVmZXJlbmNlIG9idGFpbmVkIGJ5IHRo aXMgZnVuY3Rpb24gbXVzdCBoYXZlIGEgc3ltbWV0cmljCi0gKiBjYWxsIHRvIGludGVsX2Rpc3Bs YXlfcG93ZXJfcHV0KCkgdG8gcmVsZWFzZSB0aGUgcmVmZXJlbmNlIGFnYWluLgotICovCi12b2lk IGludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKLQkJCSAgICAgZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW4pCitzdGF0 aWMgdm9pZAorX19pbnRlbF9kaXNwbGF5X3Bvd2VyX2dldF9kb21haW4oc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSBlbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWlu IGRvbWFpbikKIHsKIAlzdHJ1Y3QgaTkxNV9wb3dlcl9kb21haW5zICpwb3dlcl9kb21haW5zOwog CXN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgKnBvd2VyX3dlbGw7CiAJaW50IGk7CiAKLQlpbnRlbF9y dW50aW1lX3BtX2dldChkZXZfcHJpdik7Ci0KIAlwb3dlcl9kb21haW5zID0gJmRldl9wcml2LT5w b3dlcl9kb21haW5zOwogCi0JbXV0ZXhfbG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7Ci0KIAlm b3JfZWFjaF9wb3dlcl93ZWxsKGksIHBvd2VyX3dlbGwsIEJJVChkb21haW4pLCBwb3dlcl9kb21h aW5zKSB7CiAJCWlmICghcG93ZXJfd2VsbC0+Y291bnQrKykKIAkJCWludGVsX3Bvd2VyX3dlbGxf ZW5hYmxlKGRldl9wcml2LCBwb3dlcl93ZWxsKTsKIAl9CiAKIAlwb3dlcl9kb21haW5zLT5kb21h aW5fdXNlX2NvdW50W2RvbWFpbl0rKzsKK30KKworLyoqCisgKiBpbnRlbF9kaXNwbGF5X3Bvd2Vy X2dldCAtIGdyYWIgYSBwb3dlciBkb21haW4gcmVmZXJlbmNlCisgKiBAZGV2X3ByaXY6IGk5MTUg ZGV2aWNlIGluc3RhbmNlCisgKiBAZG9tYWluOiBwb3dlciBkb21haW4gdG8gcmVmZXJlbmNlCisg KgorICogVGhpcyBmdW5jdGlvbiBncmFicyBhIHBvd2VyIGRvbWFpbiByZWZlcmVuY2UgZm9yIEBk b21haW4gYW5kIGVuc3VyZXMgdGhhdCB0aGUKKyAqIHBvd2VyIGRvbWFpbiBhbmQgYWxsIGl0cyBw YXJlbnRzIGFyZSBwb3dlcmVkIHVwLiBUaGVyZWZvcmUgdXNlcnMgc2hvdWxkIG9ubHkKKyAqIGdy YWIgYSByZWZlcmVuY2UgdG8gdGhlIGlubmVybW9zdCBwb3dlciBkb21haW4gdGhleSBuZWVkLgor ICoKKyAqIEFueSBwb3dlciBkb21haW4gcmVmZXJlbmNlIG9idGFpbmVkIGJ5IHRoaXMgZnVuY3Rp b24gbXVzdCBoYXZlIGEgc3ltbWV0cmljCisgKiBjYWxsIHRvIGludGVsX2Rpc3BsYXlfcG93ZXJf cHV0KCkgdG8gcmVsZWFzZSB0aGUgcmVmZXJlbmNlIGFnYWluLgorICovCit2b2lkIGludGVsX2Rp c3BsYXlfcG93ZXJfZ2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAg ICAgZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW4pCit7CisJc3RydWN0IGk5 MTVfcG93ZXJfZG9tYWlucyAqcG93ZXJfZG9tYWluczsKKworCWludGVsX3J1bnRpbWVfcG1fZ2V0 KGRldl9wcml2KTsKKworCXBvd2VyX2RvbWFpbnMgPSAmZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnM7 CisKKwltdXRleF9sb2NrKCZwb3dlcl9kb21haW5zLT5sb2NrKTsKKworCV9faW50ZWxfZGlzcGxh eV9wb3dlcl9nZXRfZG9tYWluKGRldl9wcml2LCBkb21haW4pOworCisJbXV0ZXhfdW5sb2NrKCZw b3dlcl9kb21haW5zLT5sb2NrKTsKK30KKworLyoqCisgKiBpbnRlbF9kaXNwbGF5X3Bvd2VyX2dl dF9pZl9lbmFibGVkIC0gZ3JhYiBhIHJlZmVyZW5jZSBmb3IgYW4gZW5hYmxlZCBkaXNwbGF5IHBv d2VyIGRvbWFpbgorICogQGRldl9wcml2OiBpOTE1IGRldmljZSBpbnN0YW5jZQorICogQGRvbWFp bjogcG93ZXIgZG9tYWluIHRvIHJlZmVyZW5jZQorICoKKyAqIFRoaXMgZnVuY3Rpb24gZ3JhYnMg YSBwb3dlciBkb21haW4gcmVmZXJlbmNlIGZvciBAZG9tYWluIGFuZCBlbnN1cmVzIHRoYXQgdGhl CisgKiBwb3dlciBkb21haW4gYW5kIGFsbCBpdHMgcGFyZW50cyBhcmUgcG93ZXJlZCB1cC4gVGhl cmVmb3JlIHVzZXJzIHNob3VsZCBvbmx5CisgKiBncmFiIGEgcmVmZXJlbmNlIHRvIHRoZSBpbm5l cm1vc3QgcG93ZXIgZG9tYWluIHRoZXkgbmVlZC4KKyAqCisgKiBBbnkgcG93ZXIgZG9tYWluIHJl ZmVyZW5jZSBvYnRhaW5lZCBieSB0aGlzIGZ1bmN0aW9uIG11c3QgaGF2ZSBhIHN5bW1ldHJpYwor ICogY2FsbCB0byBpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dCgpIHRvIHJlbGVhc2UgdGhlIHJlZmVy ZW5jZSBhZ2Fpbi4KKyAqLworYm9vbCBpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldF9pZl9lbmFibGVk KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkJZW51bSBpbnRlbF9kaXNw bGF5X3Bvd2VyX2RvbWFpbiBkb21haW4pCit7CisJc3RydWN0IGk5MTVfcG93ZXJfZG9tYWlucyAq cG93ZXJfZG9tYWluczsKKwlib29sIGlzX2VuYWJsZWQ7CisKKwlpZiAoIWludGVsX3J1bnRpbWVf cG1fZ2V0X2lmX2luX3VzZShkZXZfcHJpdikpCisJCXJldHVybiBmYWxzZTsKKworCXBvd2VyX2Rv bWFpbnMgPSAmZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnM7CisKKwltdXRleF9sb2NrKCZwb3dlcl9k b21haW5zLT5sb2NrKTsKKworCWlmIChfX2ludGVsX2Rpc3BsYXlfcG93ZXJfaXNfZW5hYmxlZChk ZXZfcHJpdiwgZG9tYWluKSkgeworCQlfX2ludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0X2RvbWFpbihk ZXZfcHJpdiwgZG9tYWluKTsKKwkJaXNfZW5hYmxlZCA9IHRydWU7CisJfSBlbHNlIHsKKwkJaXNf ZW5hYmxlZCA9IGZhbHNlOworCX0KIAogCW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+bG9j ayk7CisKKwlpZiAoIWlzX2VuYWJsZWQpCisJCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2 KTsKKworCXJldHVybiBpc19lbmFibGVkOwogfQogCiAvKioKQEAgLTIyMzksNiArMjI5MCwzMCBA QCB2b2lkIGludGVsX3J1bnRpbWVfcG1fZ2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIH0KIAogLyoqCisgKiBpbnRlbF9ydW50aW1lX3BtX2dldF9pZl9pbl91c2UgLSBncmFi IGEgcnVudGltZSBwbSByZWZlcmVuY2UgaWYgZGV2aWNlIGluIHVzZQorICogQGRldl9wcml2OiBp OTE1IGRldmljZSBpbnN0YW5jZQorICoKKyAqIFRoaXMgZnVuY3Rpb24gZ3JhYnMgYSBkZXZpY2Ut bGV2ZWwgcnVudGltZSBwbSByZWZlcmVuY2UgaWYgdGhlIGRldmljZSBpcworICogYWxyZWFkeSBp biB1c2UgYW5kIGVuc3VyZXMgdGhhdCBpdCBpcyBwb3dlcmVkIHVwLgorICoKKyAqIEFueSBydW50 aW1lIHBtIHJlZmVyZW5jZSBvYnRhaW5lZCBieSB0aGlzIGZ1bmN0aW9uIG11c3QgaGF2ZSBhIHN5 bW1ldHJpYworICogY2FsbCB0byBpbnRlbF9ydW50aW1lX3BtX3B1dCgpIHRvIHJlbGVhc2UgdGhl IHJlZmVyZW5jZSBhZ2Fpbi4KKyAqLworYm9vbCBpbnRlbF9ydW50aW1lX3BtX2dldF9pZl9pbl91 c2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OworCXN0cnVjdCBkZXZpY2UgKmRldmljZSA9ICZkZXYt PnBkZXYtPmRldjsKKworCWlmIChJU19FTkFCTEVEKENPTkZJR19QTSkgJiYgIXBtX3J1bnRpbWVf Z2V0X2lmX2luX3VzZShkZXZpY2UpKQorCQlyZXR1cm4gZmFsc2U7CisKKwlhdG9taWNfaW5jKCZk ZXZfcHJpdi0+cG0ud2FrZXJlZl9jb3VudCk7CisJYXNzZXJ0X3JwbV93YWtlbG9ja19oZWxkKGRl dl9wcml2KTsKKworCXJldHVybiB0cnVlOworfQorCisvKioKICAqIGludGVsX3J1bnRpbWVfcG1f Z2V0X25vcmVzdW1lIC0gZ3JhYiBhIHJ1bnRpbWUgcG0gcmVmZXJlbmNlCiAgKiBAZGV2X3ByaXY6 IGk5MTUgZGV2aWNlIGluc3RhbmNlCiAgKgotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=