From: Imre Deak Subject: [PATCH v2 01/12] drm/i915: add helper to get a display power ref if it was already enabled Date: Mon, 15 Feb 2016 16:18:53 +0200 Message-ID: <1455545933-2940-1-git-send-email-imre.deak@intel.com> References: <1455296121-4742-2-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 6743C6E1AE for ; Mon, 15 Feb 2016 14:18:56 +0000 (UTC) In-Reply-To: <1455296121-4742-2-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 List-Id: intel-gfx@lists.freedesktop.org V2UgaGF2ZSBtYW55IHBsYWNlcyBpbiB0aGUgY29kZSB3aGVyZSB3ZSBjaGVjayBpZiBhIGdpdmVu IGRpc3BsYXkgcG93ZXIKZG9tYWluIGlzIGVuYWJsZWQgYW5kIGlmIHNvIGFjY2VzcyByZWdpc3Rl cnMgYmFja2VkIGJ5IHRoaXMgcG93ZXIKZG9tYWluLiBXZSBhc3N1bWVkIHRoYXQgc29tZSBtb2Rl c2V0IGxvY2sgd2lsbCBwcmV2ZW50IHRoZSBwb3dlcgpyZWZlcmVuY2UgZnJvbSB2YW5pc2hpbmcg aW4gdGhlIG1pZGRsZSBvZiB0aGUgSFcgYWNjZXNzLCBidXQgdGhpcwphc3N1bXB0aW9uIGRvZXNu J3QgYWx3YXlzIGhvbGQuIEluIHN1Y2ggY2FzZXMgd2UgZ2V0IGVpdGhlciB0aGUgd2FrZXJlZgpu b3QgaGVsZCwgb3IgYW4gdW5jbGFpbWVkIHJlZ2lzdGVyIGFjY2VzcyBlcnJvciBtZXNzYWdlLiBU byBmaXggdGhpcyBpbgphIGZ1dHVyZS1wcm9vZiB3YXkgdGhhdCdzIGluZGVwZW5kZW50IG9mIG90 aGVyIGxvY2tzIHdyYXAgYW55IHN1Y2gKYWNjZXNzIHdpdGggYSBnZXRfcmVmX2lmX2VuYWJsZWQo KS9wdXRfcmVmKCkgcGFpci4KCkt1ZG9zIHRvIFZpbGxlIGFuZCBKb29uYXMgZm9yIHRoZSBpZGVh cyBvZiB0aGlzIG5ldyBpbnRlcmZhY2UuCgp2MjoKLSBpbml0IHRoZSBwb3dlcl9kb21haW5zIHB0 ciB3aGVuIGRlY2xhcmluZyBpdCBldmVyeXdoZXJlIChKb29uYXMpCgpDQzogTWlrYSBLdW9wcGFs YSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+CkNDOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlz LXdpbHNvbi5jby51az4KQ0M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4 LmludGVsLmNvbT4KQ0M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KUmV2 aWV3ZWQtYnk6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgICAgfCAgIDMgKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIHwgMTExICsrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDkzIGluc2VydGlvbnMoKyks IDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggM2NhZTM3Ni4u Zjk1ZjhiMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTE0MzYsNiArMTQzNiw4IEBA IGJvb2wgX19pbnRlbF9kaXNwbGF5X3Bvd2VyX2lzX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCQkJCSAgICAgIGVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21h aW4gZG9tYWluKTsKIHZvaWQgaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICBlbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9t YWluIGRvbWFpbik7Citib29sIGludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0X2lmX2VuYWJsZWQoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCQllbnVtIGludGVsX2Rpc3BsYXlf cG93ZXJfZG9tYWluIGRvbWFpbik7CiB2b2lkIGludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgZW51bSBpbnRlbF9kaXNwbGF5 X3Bvd2VyX2RvbWFpbiBkb21haW4pOwogCkBAIC0xNTIyLDYgKzE1MjQsNyBAQCBlbmFibGVfcnBt X3dha2VyZWZfYXNzZXJ0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZW5h YmxlX3JwbV93YWtlcmVmX2Fzc2VydHMoZGV2X3ByaXYpCiAKIHZvaWQgaW50ZWxfcnVudGltZV9w bV9nZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK2Jvb2wgaW50ZWxfcnVu dGltZV9wbV9nZXRfaWZfaW5fdXNlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CiB2b2lkIGludGVsX3J1bnRpbWVfcG1fZ2V0X25vcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX3J1bnRpbWVfcG1fcHV0KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3J1bnRpbWVfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVf cG0uYwppbmRleCBiYmNhNTI3Li4wZTQ3NmY3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cnVudGltZV9wbS5jCkBAIC0xNDM1LDM5ICsxNDM1LDg0IEBAIHN0YXRpYyB2b2lkIGNodl9waXBl X3Bvd2VyX3dlbGxfZGlzYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ Y2h2X3NldF9waXBlX3Bvd2VyX3dlbGwoZGV2X3ByaXYsIHBvd2VyX3dlbGwsIGZhbHNlKTsKIH0K IAotLyoqCi0gKiBpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldCAtIGdyYWIgYSBwb3dlciBkb21haW4g cmVmZXJlbmNlCi0gKiBAZGV2X3ByaXY6IGk5MTUgZGV2aWNlIGluc3RhbmNlCi0gKiBAZG9tYWlu OiBwb3dlciBkb21haW4gdG8gcmVmZXJlbmNlCi0gKgotICogVGhpcyBmdW5jdGlvbiBncmFicyBh IHBvd2VyIGRvbWFpbiByZWZlcmVuY2UgZm9yIEBkb21haW4gYW5kIGVuc3VyZXMgdGhhdCB0aGUK LSAqIHBvd2VyIGRvbWFpbiBhbmQgYWxsIGl0cyBwYXJlbnRzIGFyZSBwb3dlcmVkIHVwLiBUaGVy ZWZvcmUgdXNlcnMgc2hvdWxkIG9ubHkKLSAqIGdyYWIgYSByZWZlcmVuY2UgdG8gdGhlIGlubmVy bW9zdCBwb3dlciBkb21haW4gdGhleSBuZWVkLgotICoKLSAqIEFueSBwb3dlciBkb21haW4gcmVm ZXJlbmNlIG9idGFpbmVkIGJ5IHRoaXMgZnVuY3Rpb24gbXVzdCBoYXZlIGEgc3ltbWV0cmljCi0g KiBjYWxsIHRvIGludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KCkgdG8gcmVsZWFzZSB0aGUgcmVmZXJl bmNlIGFnYWluLgotICovCi12b2lkIGludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgICAgZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2Vy X2RvbWFpbiBkb21haW4pCitzdGF0aWMgdm9pZAorX19pbnRlbF9kaXNwbGF5X3Bvd2VyX2dldF9k b21haW4oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSBlbnVtIGludGVs X2Rpc3BsYXlfcG93ZXJfZG9tYWluIGRvbWFpbikKIHsKLQlzdHJ1Y3QgaTkxNV9wb3dlcl9kb21h aW5zICpwb3dlcl9kb21haW5zOworCXN0cnVjdCBpOTE1X3Bvd2VyX2RvbWFpbnMgKnBvd2VyX2Rv bWFpbnMgPSAmZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnM7CiAJc3RydWN0IGk5MTVfcG93ZXJfd2Vs bCAqcG93ZXJfd2VsbDsKIAlpbnQgaTsKIAotCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2 KTsKLQotCXBvd2VyX2RvbWFpbnMgPSAmZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnM7Ci0KLQltdXRl eF9sb2NrKCZwb3dlcl9kb21haW5zLT5sb2NrKTsKLQogCWZvcl9lYWNoX3Bvd2VyX3dlbGwoaSwg cG93ZXJfd2VsbCwgQklUKGRvbWFpbiksIHBvd2VyX2RvbWFpbnMpIHsKIAkJaWYgKCFwb3dlcl93 ZWxsLT5jb3VudCsrKQogCQkJaW50ZWxfcG93ZXJfd2VsbF9lbmFibGUoZGV2X3ByaXYsIHBvd2Vy X3dlbGwpOwogCX0KIAogCXBvd2VyX2RvbWFpbnMtPmRvbWFpbl91c2VfY291bnRbZG9tYWluXSsr OworfQorCisvKioKKyAqIGludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0IC0gZ3JhYiBhIHBvd2VyIGRv bWFpbiByZWZlcmVuY2UKKyAqIEBkZXZfcHJpdjogaTkxNSBkZXZpY2UgaW5zdGFuY2UKKyAqIEBk b21haW46IHBvd2VyIGRvbWFpbiB0byByZWZlcmVuY2UKKyAqCisgKiBUaGlzIGZ1bmN0aW9uIGdy YWJzIGEgcG93ZXIgZG9tYWluIHJlZmVyZW5jZSBmb3IgQGRvbWFpbiBhbmQgZW5zdXJlcyB0aGF0 IHRoZQorICogcG93ZXIgZG9tYWluIGFuZCBhbGwgaXRzIHBhcmVudHMgYXJlIHBvd2VyZWQgdXAu IFRoZXJlZm9yZSB1c2VycyBzaG91bGQgb25seQorICogZ3JhYiBhIHJlZmVyZW5jZSB0byB0aGUg aW5uZXJtb3N0IHBvd2VyIGRvbWFpbiB0aGV5IG5lZWQuCisgKgorICogQW55IHBvd2VyIGRvbWFp biByZWZlcmVuY2Ugb2J0YWluZWQgYnkgdGhpcyBmdW5jdGlvbiBtdXN0IGhhdmUgYSBzeW1tZXRy aWMKKyAqIGNhbGwgdG8gaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoKSB0byByZWxlYXNlIHRoZSBy ZWZlcmVuY2UgYWdhaW4uCisgKi8KK3ZvaWQgaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICBlbnVtIGludGVsX2Rpc3BsYXlf cG93ZXJfZG9tYWluIGRvbWFpbikKK3sKKwlzdHJ1Y3QgaTkxNV9wb3dlcl9kb21haW5zICpwb3dl cl9kb21haW5zID0gJmRldl9wcml2LT5wb3dlcl9kb21haW5zOworCisJaW50ZWxfcnVudGltZV9w bV9nZXQoZGV2X3ByaXYpOworCisJbXV0ZXhfbG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7CisK KwlfX2ludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0X2RvbWFpbihkZXZfcHJpdiwgZG9tYWluKTsKKwor CW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7Cit9CisKKy8qKgorICogaW50ZWxf ZGlzcGxheV9wb3dlcl9nZXRfaWZfZW5hYmxlZCAtIGdyYWIgYSByZWZlcmVuY2UgZm9yIGFuIGVu YWJsZWQgZGlzcGxheSBwb3dlciBkb21haW4KKyAqIEBkZXZfcHJpdjogaTkxNSBkZXZpY2UgaW5z dGFuY2UKKyAqIEBkb21haW46IHBvd2VyIGRvbWFpbiB0byByZWZlcmVuY2UKKyAqCisgKiBUaGlz IGZ1bmN0aW9uIGdyYWJzIGEgcG93ZXIgZG9tYWluIHJlZmVyZW5jZSBmb3IgQGRvbWFpbiBhbmQg ZW5zdXJlcyB0aGF0IHRoZQorICogcG93ZXIgZG9tYWluIGFuZCBhbGwgaXRzIHBhcmVudHMgYXJl IHBvd2VyZWQgdXAuIFRoZXJlZm9yZSB1c2VycyBzaG91bGQgb25seQorICogZ3JhYiBhIHJlZmVy ZW5jZSB0byB0aGUgaW5uZXJtb3N0IHBvd2VyIGRvbWFpbiB0aGV5IG5lZWQuCisgKgorICogQW55 IHBvd2VyIGRvbWFpbiByZWZlcmVuY2Ugb2J0YWluZWQgYnkgdGhpcyBmdW5jdGlvbiBtdXN0IGhh dmUgYSBzeW1tZXRyaWMKKyAqIGNhbGwgdG8gaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoKSB0byBy ZWxlYXNlIHRoZSByZWZlcmVuY2UgYWdhaW4uCisgKi8KK2Jvb2wgaW50ZWxfZGlzcGxheV9wb3dl cl9nZXRfaWZfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJ CWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gZG9tYWluKQoreworCXN0cnVjdCBpOTE1 X3Bvd2VyX2RvbWFpbnMgKnBvd2VyX2RvbWFpbnMgPSAmZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnM7 CisJYm9vbCBpc19lbmFibGVkOworCisJaWYgKCFpbnRlbF9ydW50aW1lX3BtX2dldF9pZl9pbl91 c2UoZGV2X3ByaXYpKQorCQlyZXR1cm4gZmFsc2U7CisKKwltdXRleF9sb2NrKCZwb3dlcl9kb21h aW5zLT5sb2NrKTsKKworCWlmIChfX2ludGVsX2Rpc3BsYXlfcG93ZXJfaXNfZW5hYmxlZChkZXZf cHJpdiwgZG9tYWluKSkgeworCQlfX2ludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0X2RvbWFpbihkZXZf cHJpdiwgZG9tYWluKTsKKwkJaXNfZW5hYmxlZCA9IHRydWU7CisJfSBlbHNlIHsKKwkJaXNfZW5h YmxlZCA9IGZhbHNlOworCX0KIAogCW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7 CisKKwlpZiAoIWlzX2VuYWJsZWQpCisJCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsK KworCXJldHVybiBpc19lbmFibGVkOwogfQogCiAvKioKQEAgLTIyMzksNiArMjI4NCwzMCBAQCB2 b2lkIGludGVsX3J1bnRpbWVfcG1fZ2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIH0KIAogLyoqCisgKiBpbnRlbF9ydW50aW1lX3BtX2dldF9pZl9pbl91c2UgLSBncmFiIGEg cnVudGltZSBwbSByZWZlcmVuY2UgaWYgZGV2aWNlIGluIHVzZQorICogQGRldl9wcml2OiBpOTE1 IGRldmljZSBpbnN0YW5jZQorICoKKyAqIFRoaXMgZnVuY3Rpb24gZ3JhYnMgYSBkZXZpY2UtbGV2 ZWwgcnVudGltZSBwbSByZWZlcmVuY2UgaWYgdGhlIGRldmljZSBpcworICogYWxyZWFkeSBpbiB1 c2UgYW5kIGVuc3VyZXMgdGhhdCBpdCBpcyBwb3dlcmVkIHVwLgorICoKKyAqIEFueSBydW50aW1l IHBtIHJlZmVyZW5jZSBvYnRhaW5lZCBieSB0aGlzIGZ1bmN0aW9uIG11c3QgaGF2ZSBhIHN5bW1l dHJpYworICogY2FsbCB0byBpbnRlbF9ydW50aW1lX3BtX3B1dCgpIHRvIHJlbGVhc2UgdGhlIHJl ZmVyZW5jZSBhZ2Fpbi4KKyAqLworYm9vbCBpbnRlbF9ydW50aW1lX3BtX2dldF9pZl9pbl91c2Uo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBkZXZfcHJpdi0+ZGV2OworCXN0cnVjdCBkZXZpY2UgKmRldmljZSA9ICZkZXYtPnBk ZXYtPmRldjsKKworCWlmIChJU19FTkFCTEVEKENPTkZJR19QTSkgJiYgIXBtX3J1bnRpbWVfZ2V0 X2lmX2luX3VzZShkZXZpY2UpKQorCQlyZXR1cm4gZmFsc2U7CisKKwlhdG9taWNfaW5jKCZkZXZf cHJpdi0+cG0ud2FrZXJlZl9jb3VudCk7CisJYXNzZXJ0X3JwbV93YWtlbG9ja19oZWxkKGRldl9w cml2KTsKKworCXJldHVybiB0cnVlOworfQorCisvKioKICAqIGludGVsX3J1bnRpbWVfcG1fZ2V0 X25vcmVzdW1lIC0gZ3JhYiBhIHJ1bnRpbWUgcG0gcmVmZXJlbmNlCiAgKiBAZGV2X3ByaXY6IGk5 MTUgZGV2aWNlIGluc3RhbmNlCiAgKgotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=