From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH] drm/i915: Balance assert_rpm_wakelock_held() for !IS_ENABLED(CONFIG_PM) Date: Thu, 25 Feb 2016 21:10:28 +0000 Message-ID: <1456434628-22574-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x22b.google.com (mail-wm0-x22b.google.com [IPv6:2a00:1450:400c:c09::22b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F8FA6E96D for ; Thu, 25 Feb 2016 21:10:38 +0000 (UTC) Received: by mail-wm0-x22b.google.com with SMTP id a4so45187096wme.1 for ; Thu, 25 Feb 2016 13:10:38 -0800 (PST) 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 Y29tbWl0IDA5NzMxMjgwMDI4Y2UwM2U2YTI3ZTE5OTgxMzdmMTc3NWEyODM5ZjMKQXV0aG9yOiBJ bXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+CkRhdGU6ICAgV2VkIEZlYiAxNyAxNDoxNzo0 MiAyMDE2ICswMjAwCgogICAgZHJtL2k5MTU6IEFkZCBoZWxwZXIgdG8gZ2V0IGEgZGlzcGxheSBw b3dlciByZWYgaWYgaXQgd2FzIGFscmVhZHkgZW5hYmxlZAoKbGVmdCB0aGUgcnBtIHdha2Vsb2Nr IGFzc2VydGlvbnMgdW5iYWxhbmNlZCBpZiBDT05GSUdfUE0gd2FzIGRpc2FibGVkIGFzCmludGVs X3J1bnRpbWVfcG1fZ2V0X2lmX2luX3VzZSgpIHdvdWxkIHJldHVybiB0cnVlIHdpdGhvdXQgaW5j cmVtZW50aW5nCnRoZSBsb2NhbCBib29ra2VlcGluZyByZXF1aXJlZCBmb3IgdGhlIGFzc2VydGlv bnMuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51 az4KQ0M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgpDQzogSm9vbmFz IExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpDQzogVmlsbGUgU3ly asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IEltcmUgRGVhayA8aW1y ZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1l X3BtLmMgfCAyNiArKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEy IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3J1bnRpbWVfcG0uYwppbmRleCBlMjMyOTc2ODkwMmMuLjQxNzJlNzMyMTJjZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwpAQCAtMjM2NSwyMiArMjM2NSwyMCBAQCBi b29sIGludGVsX3J1bnRpbWVfcG1fZ2V0X2lmX2luX3VzZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7 CiAJc3RydWN0IGRldmljZSAqZGV2aWNlID0gJmRldi0+cGRldi0+ZGV2OwotCWludCByZXQ7CiAK LQlpZiAoIUlTX0VOQUJMRUQoQ09ORklHX1BNKSkKLQkJcmV0dXJuIHRydWU7CisJaWYgKElTX0VO QUJMRUQoQ09ORklHX1BNKSkgeworCQlpbnQgcmV0ID0gcG1fcnVudGltZV9nZXRfaWZfaW5fdXNl KGRldmljZSk7CiAKLQlyZXQgPSBwbV9ydW50aW1lX2dldF9pZl9pbl91c2UoZGV2aWNlKTsKLQot CS8qCi0JICogSW4gY2FzZXMgcnVudGltZSBQTSBpcyBkaXNhYmxlZCBieSB0aGUgUlBNIGNvcmUg YW5kIHdlIGdldCBhbgotCSAqIC1FSU5WQUwgcmV0dXJuIHZhbHVlIHdlIGFyZSBub3Qgc3VwcG9z ZWQgdG8gY2FsbCB0aGlzIGZ1bmN0aW9uLAotCSAqIHNpbmNlIHRoZSBwb3dlciBzdGF0ZSBpcyB1 bmRlZmluZWQuIFRoaXMgYXBwbGllcyBhdG0gdG8gdGhlCi0JICogbGF0ZS9lYXJseSBzeXN0ZW0g c3VzcGVuZC9yZXN1bWUgaGFuZGxlcnMuCi0JICovCi0JV0FSTl9PTl9PTkNFKHJldCA8IDApOwot CWlmIChyZXQgPD0gMCkKLQkJcmV0dXJuIGZhbHNlOworCQkvKgorCQkgKiBJbiBjYXNlcyBydW50 aW1lIFBNIGlzIGRpc2FibGVkIGJ5IHRoZSBSUE0gY29yZSBhbmQgd2UgZ2V0CisJCSAqIGFuIC1F SU5WQUwgcmV0dXJuIHZhbHVlIHdlIGFyZSBub3Qgc3VwcG9zZWQgdG8gY2FsbCB0aGlzCisJCSAq IGZ1bmN0aW9uLCBzaW5jZSB0aGUgcG93ZXIgc3RhdGUgaXMgdW5kZWZpbmVkLiBUaGlzIGFwcGxp ZXMKKwkJICogYXRtIHRvIHRoZSBsYXRlL2Vhcmx5IHN5c3RlbSBzdXNwZW5kL3Jlc3VtZSBoYW5k bGVycy4KKwkJICovCisJCVdBUk5fT05fT05DRShyZXQgPCAwKTsKKwkJaWYgKHJldCA8PSAwKQor CQkJcmV0dXJuIGZhbHNlOworCX0KIAogCWF0b21pY19pbmMoJmRldl9wcml2LT5wbS53YWtlcmVm X2NvdW50KTsKIAlhc3NlcnRfcnBtX3dha2Vsb2NrX2hlbGQoZGV2X3ByaXYpOwotLSAKMi43LjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=