From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v5 04/10] drm/i915: remove HAS_RUNTIME_PM check from RPM get/put/assert helpers Date: Thu, 17 Dec 2015 13:48:51 +0200 Message-ID: <1450352931-16498-1-git-send-email-imre.deak@intel.com> References: <1450203038-5150-5-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 61A466E190 for ; Thu, 17 Dec 2015 03:48:54 -0800 (PST) In-Reply-To: <1450203038-5150-5-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 V2UgZG9uJ3QgcmVhbGx5IG5lZWQgdG8gY2hlY2sgdGhpcyBmbGFnIGluIHRoZSBnZXQvcHV0L2Fz c2VydCBoZWxwZXJzLAphcyBvbiBwbGF0Zm9ybXMgd2l0aG91dCBSUE0gc3VwcG9ydCB3ZSB3b24n dCBldmVyIGVuYWJsZSBSUE0uIFRoYXQgbWVhbnMKcG0uc3VzcGVuZCB3aWxsIGJlIGFsd2F5cyBm YWxzZSBhbmQgdGhlIGFzc2VydCB3aWxsIGJlIGFsd2F5cyB0cnVlLgoKRG8gdGhpcyB0byBzaW1w bGlmeSB0aGUgY29kZSBhbmQgdG8gbGV0IHVzIGV4dGVuZCB0aGUgUlBNIGFzc2VydHMgdG8gYWxs CnBsYXRmb3JtcyBmb3IgYSBiZXR0ZXIgY292ZXJhZ2UuCgpNb3RpdmF0ZWQgYnkgVmlsbGUuCgp2 Mi12MzoKLSB1bmNoYW5nZWQKdjQ6Ci0gcmVtb3ZlIHRoZSBIQVNfUlVOVElNRV9QTSBjaGVjayBm cm9tIGludGVsX3J1bnRpbWVfcG1fZW5hYmxlKCkgdG9vCiAgbWFkZSBwb3NzaWJsZSBieSB0aGUg cHJldmlvdXMgdHdvIHBhdGNoZXMKdjU6Ci0gcmViYXNlZCBvbiB0aGUgcHJldmlvdXMgbmV3IHBh dGNoIGluIHRoZSBzZXJpZXMgdGhhdCBrZWVwcwogIEhBU19SVU5USU1FX1BNKCkgaW4gaW50ZWxf cnVudGltZV9wbV9lbmFibGUoKSB3aXRoIGEgcGVybWFuZW50CiAgcmVmZXJlbmNlIHRha2VuIHRo ZXJlCgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+ClJldmll d2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4gKHYzKQpSZXZp ZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29t PiAodjQpCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIHwgOSAt LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jICAgICB8IDMgKy0t CiAyIGZpbGVzIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKaW5kZXggYmYyNDkyZi4uY2MwNDkyZSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwpAQCAtMjI0MSw5ICsyMjQx LDYgQEAgdm9pZCBpbnRlbF9ydW50aW1lX3BtX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7CiAJc3Ry dWN0IGRldmljZSAqZGV2aWNlID0gJmRldi0+cGRldi0+ZGV2OwogCi0JaWYgKCFIQVNfUlVOVElN RV9QTShkZXYpKQotCQlyZXR1cm47Ci0KIAlwbV9ydW50aW1lX2dldF9zeW5jKGRldmljZSk7CiAJ V0FSTihkZXZfcHJpdi0+cG0uc3VzcGVuZGVkLCAiRGV2aWNlIHN0aWxsIHN1c3BlbmRlZC5cbiIp OwogfQpAQCAtMjI3MCw5ICsyMjY3LDYgQEAgdm9pZCBpbnRlbF9ydW50aW1lX3BtX2dldF9ub3Jl c3VtZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGRldl9wcml2LT5kZXY7CiAJc3RydWN0IGRldmljZSAqZGV2aWNlID0gJmRldi0+ cGRldi0+ZGV2OwogCi0JaWYgKCFIQVNfUlVOVElNRV9QTShkZXYpKQotCQlyZXR1cm47Ci0KIAlX QVJOKGRldl9wcml2LT5wbS5zdXNwZW5kZWQsICJHZXR0aW5nIG5vc3luYy1yZWYgd2hpbGUgc3Vz cGVuZGVkLlxuIik7CiAJcG1fcnVudGltZV9nZXRfbm9yZXN1bWUoZGV2aWNlKTsKIH0KQEAgLTIy OTAsOSArMjI4NCw2IEBAIHZvaWQgaW50ZWxfcnVudGltZV9wbV9wdXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ ZGV2OwogCXN0cnVjdCBkZXZpY2UgKmRldmljZSA9ICZkZXYtPnBkZXYtPmRldjsKIAotCWlmICgh SEFTX1JVTlRJTUVfUE0oZGV2KSkKLQkJcmV0dXJuOwotCiAJcG1fcnVudGltZV9tYXJrX2xhc3Rf YnVzeShkZXZpY2UpOwogCXBtX3J1bnRpbWVfcHV0X2F1dG9zdXNwZW5kKGRldmljZSk7CiB9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IGZjZjA0ZmUuLjAyMjY3NzYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC01Myw4ICs1Myw3IEBAIGludGVsX3VuY29y ZV9mb3JjZXdha2VfZG9tYWluX3RvX3N0cihjb25zdCBlbnVtIGZvcmNld2FrZV9kb21haW5faWQg aWQpCiBzdGF0aWMgdm9pZAogYXNzZXJ0X2RldmljZV9ub3Rfc3VzcGVuZGVkKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlXQVJOX09OQ0UoSEFTX1JVTlRJTUVfUE0oZGV2 X3ByaXYtPmRldikgJiYgZGV2X3ByaXYtPnBtLnN1c3BlbmRlZCwKLQkJICAiRGV2aWNlIHN1c3Bl bmRlZFxuIik7CisJV0FSTl9PTkNFKGRldl9wcml2LT5wbS5zdXNwZW5kZWQsICJEZXZpY2Ugc3Vz cGVuZGVkXG4iKTsKIH0KIAogc3RhdGljIGlubGluZSB2b2lkCi0tIAoyLjUuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK