From mboxrd@z Thu Jan  1 00:00:00 1970
From: Imre Deak <imre.deak@intel.com>
Subject: [PATCH v3 3/7] drm/i915: use assert_rpm_wakelock_held
	instead of opencoding it
Date: Thu, 12 Nov 2015 18:40:17 +0200
Message-ID: <1447346421-29395-4-git-send-email-imre.deak@intel.com>
References: <1447346421-29395-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id D307F6EDD5
 for <intel-gfx@lists.freedesktop.org>; Thu, 12 Nov 2015 08:40:43 -0800 (PST)
In-Reply-To: <1447346421-29395-1-git-send-email-imre.deak@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

U2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgpSZXZpZXdlZC1i
eTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ICh2MSkKLS0tCiBkcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgfCAxMCArKysrLS0tLS0tCiBkcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyAgICAgfCAgMiArLQogMiBmaWxlcyBjaGFu
Z2VkLCA1IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfcnVudGltZV9wbS5jCmluZGV4IDgzYWIwM2EuLjNkN2RkYzMgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAgLTQ2NCw4ICs0NjQsNyBAQCBzdGF0aWMgdm9p
ZCBhc3NlcnRfY2FuX2VuYWJsZV9kYzUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2
KQogCiAJV0FSTl9PTkNFKChJOTE1X1JFQUQoRENfU1RBVEVfRU4pICYgRENfU1RBVEVfRU5fVVBU
T19EQzUpLAogCQkgICJEQzUgYWxyZWFkeSBwcm9ncmFtbWVkIHRvIGJlIGVuYWJsZWQuXG4iKTsK
LQlXQVJOX09OQ0UoZGV2X3ByaXYtPnBtLnN1c3BlbmRlZCwKLQkJICAiREM1IGNhbm5vdCBiZSBl
bmFibGVkLCBpZiBwbGF0Zm9ybSBpcyBydW50aW1lLXN1c3BlbmRlZC5cbiIpOworCWFzc2VydF9y
cG1fd2FrZWxvY2tfaGVsZChkZXZfcHJpdik7CiAKIAlhc3NlcnRfY3NyX2xvYWRlZChkZXZfcHJp
dik7CiB9CkBAIC00NzksOCArNDc4LDcgQEAgc3RhdGljIHZvaWQgYXNzZXJ0X2Nhbl9kaXNhYmxl
X2RjNShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYgKGRldl9wcml2LT5w
b3dlcl9kb21haW5zLmluaXRpYWxpemluZykKIAkJcmV0dXJuOwogCi0JV0FSTl9PTkNFKGRldl9w
cml2LT5wbS5zdXNwZW5kZWQsCi0JCSJEaXNhYmxpbmcgb2YgREM1IHdoaWxlIHBsYXRmb3JtIGlz
IHJ1bnRpbWUtc3VzcGVuZGVkIHNob3VsZCBuZXZlciBoYXBwZW4uXG4iKTsKKwlhc3NlcnRfcnBt
X3dha2Vsb2NrX2hlbGQoZGV2X3ByaXYpOwogfQogCiBzdGF0aWMgdm9pZCBnZW45X2VuYWJsZV9k
YzUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpAQCAtMjEzMiw3ICsyMTMwLDcg
QEAgdm9pZCBpbnRlbF9ydW50aW1lX3BtX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2
X3ByaXYpCiAJc3RydWN0IGRldmljZSAqZGV2aWNlID0gJmRldi0+cGRldi0+ZGV2OwogCiAJcG1f
cnVudGltZV9nZXRfc3luYyhkZXZpY2UpOwotCVdBUk4oZGV2X3ByaXYtPnBtLnN1c3BlbmRlZCwg
IkRldmljZSBzdGlsbCBzdXNwZW5kZWQuXG4iKTsKKwlhc3NlcnRfcnBtX3dha2Vsb2NrX2hlbGQo
ZGV2X3ByaXYpOwogfQogCiAvKioKQEAgLTIxNTcsNyArMjE1NSw3IEBAIHZvaWQgaW50ZWxfcnVu
dGltZV9wbV9nZXRfbm9yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog
CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OwogCXN0cnVjdCBkZXZpY2Ug
KmRldmljZSA9ICZkZXYtPnBkZXYtPmRldjsKIAotCVdBUk4oZGV2X3ByaXYtPnBtLnN1c3BlbmRl
ZCwgIkdldHRpbmcgbm9zeW5jLXJlZiB3aGlsZSBzdXNwZW5kZWQuXG4iKTsKKwlhc3NlcnRfcnBt
X3dha2Vsb2NrX2hlbGQoZGV2X3ByaXYpOwogCXBtX3J1bnRpbWVfZ2V0X25vcmVzdW1lKGRldmlj
ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggMDE5MjNlMC4uYmQz
ZDEwMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTQwNCw3ICs0MDQsNyBA
QCB2b2lkIGludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdiwKIAlpZiAoIWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9nZXQp
CiAJCXJldHVybjsKIAotCVdBUk5fT04oZGV2X3ByaXYtPnBtLnN1c3BlbmRlZCk7CisJYXNzZXJ0
X3JwbV93YWtlbG9ja19oZWxkKGRldl9wcml2KTsKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZf
cHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIAlfX2ludGVsX3VuY29yZV9mb3JjZXdha2Vf
Z2V0KGRldl9wcml2LCBmd19kb21haW5zKTsKLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs
LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t
YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=