From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 04/10] drm/i915: remove HAS_RUNTIME_PM check from RPM get/put/assert helpers Date: Tue, 15 Dec 2015 20:10:32 +0200 Message-ID: <1450203038-5150-5-git-send-email-imre.deak@intel.com> References: <1450203038-5150-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 861DB6E75E for ; Tue, 15 Dec 2015 10:10:47 -0800 (PST) In-Reply-To: <1450203038-5150-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 List-Id: intel-gfx@lists.freedesktop.org V2UgZG9uJ3QgcmVhbGx5IG5lZWQgdG8gY2hlY2sgdGhpcyBmbGFnIGluIHRoZSBnZXQvcHV0L2Fz c2VydCBoZWxwZXJzLAphcyBvbiBwbGF0Zm9ybXMgd2l0aG91dCBSUE0gc3VwcG9ydCB3ZSB3b24n dCBldmVyIGVuYWJsZSBSUE0uIFRoYXQgbWVhbnMKcG0uc3VzcGVuZCB3aWxsIGJlIGFsd2F5cyBm YWxzZSBhbmQgdGhlIGFzc2VydCB3aWxsIGJlIGFsd2F5cyB0cnVlLgoKRG8gdGhpcyB0byBzaW1w bGlmeSB0aGUgY29kZSBhbmQgdG8gbGV0IHVzIGV4dGVuZCB0aGUgUlBNIGFzc2VydHMgdG8gYWxs CnBsYXRmb3JtcyBmb3IgYSBiZXR0ZXIgY292ZXJhZ2UuCgpNb3RpdmF0ZWQgYnkgVmlsbGUuCgp2 Mi12MzoKLSB1bmNoYW5nZWQKdjQ6Ci0gcmVtb3ZlIHRoZSBIQVNfUlVOVElNRV9QTSBjaGVjayBm cm9tIGludGVsX3J1bnRpbWVfcG1fZW5hYmxlKCkgdG9vCiAgbWFkZSBwb3NzaWJsZSBieSB0aGUg cHJldmlvdXMgdHdvIHBhdGNoZXMKClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFr QGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPiAodjMpCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5j IHwgMTIgLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyAg ICAgfCAgMyArLS0KIDIgZmlsZXMgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDE0IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwppbmRleCAzNDJiYWE5 Li5iY2E3Y2E3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1l X3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC0y MjM3LDkgKzIyMzcsNiBAQCB2b2lkIGludGVsX3J1bnRpbWVfcG1fZ2V0KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYt PmRldjsKIAlzdHJ1Y3QgZGV2aWNlICpkZXZpY2UgPSAmZGV2LT5wZGV2LT5kZXY7CiAKLQlpZiAo IUhBU19SVU5USU1FX1BNKGRldikpCi0JCXJldHVybjsKLQogCXBtX3J1bnRpbWVfZ2V0X3N5bmMo ZGV2aWNlKTsKIAlXQVJOKGRldl9wcml2LT5wbS5zdXNwZW5kZWQsICJEZXZpY2Ugc3RpbGwgc3Vz cGVuZGVkLlxuIik7CiB9CkBAIC0yMjY2LDkgKzIyNjMsNiBAQCB2b2lkIGludGVsX3J1bnRpbWVf cG1fZ2V0X25vcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKIAlzdHJ1Y3QgZGV2aWNlICpkZXZp Y2UgPSAmZGV2LT5wZGV2LT5kZXY7CiAKLQlpZiAoIUhBU19SVU5USU1FX1BNKGRldikpCi0JCXJl dHVybjsKLQogCVdBUk4oZGV2X3ByaXYtPnBtLnN1c3BlbmRlZCwgIkdldHRpbmcgbm9zeW5jLXJl ZiB3aGlsZSBzdXNwZW5kZWQuXG4iKTsKIAlwbV9ydW50aW1lX2dldF9ub3Jlc3VtZShkZXZpY2Up OwogfQpAQCAtMjI4Niw5ICsyMjgwLDYgQEAgdm9pZCBpbnRlbF9ydW50aW1lX3BtX3B1dChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGRldl9wcml2LT5kZXY7CiAJc3RydWN0IGRldmljZSAqZGV2aWNlID0gJmRldi0+cGRldi0+ZGV2 OwogCi0JaWYgKCFIQVNfUlVOVElNRV9QTShkZXYpKQotCQlyZXR1cm47Ci0KIAlwbV9ydW50aW1l X21hcmtfbGFzdF9idXN5KGRldmljZSk7CiAJcG1fcnVudGltZV9wdXRfYXV0b3N1c3BlbmQoZGV2 aWNlKTsKIH0KQEAgLTIzMDgsOSArMjI5OSw2IEBAIHZvaWQgaW50ZWxfcnVudGltZV9wbV9lbmFi bGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBkZXZfcHJpdi0+ZGV2OwogCXN0cnVjdCBkZXZpY2UgKmRldmljZSA9ICZkZXYtPnBk ZXYtPmRldjsKIAotCWlmICghSEFTX1JVTlRJTUVfUE0oZGV2KSkKLQkJcmV0dXJuOwotCiAJcG1f cnVudGltZV9zZXRfYXV0b3N1c3BlbmRfZGVsYXkoZGV2aWNlLCAxMDAwMCk7IC8qIDEwcyAqLwog CXBtX3J1bnRpbWVfbWFya19sYXN0X2J1c3koZGV2aWNlKTsKIAlwbV9ydW50aW1lX3VzZV9hdXRv c3VzcGVuZChkZXZpY2UpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCBmY2Yw NGZlLi4wMjI2Nzc2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNv cmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtNTMsOCAr NTMsNyBAQCBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2RvbWFpbl90b19zdHIoY29uc3QgZW51bSBm b3JjZXdha2VfZG9tYWluX2lkIGlkKQogc3RhdGljIHZvaWQKIGFzc2VydF9kZXZpY2Vfbm90X3N1 c3BlbmRlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JV0FSTl9PTkNF KEhBU19SVU5USU1FX1BNKGRldl9wcml2LT5kZXYpICYmIGRldl9wcml2LT5wbS5zdXNwZW5kZWQs Ci0JCSAgIkRldmljZSBzdXNwZW5kZWRcbiIpOworCVdBUk5fT05DRShkZXZfcHJpdi0+cG0uc3Vz cGVuZGVkLCAiRGV2aWNlIHN1c3BlbmRlZFxuIik7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZAot LSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==