From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 06/10] drm/i915: use assert_rpm_wakelock_held instead of opencoding it Date: Tue, 15 Dec 2015 20:10:34 +0200 Message-ID: <1450203038-5150-7-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 A21366E764 for ; Tue, 15 Dec 2015 10:10:50 -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 U2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgpSZXZpZXdlZC1i eTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIHwgMTAgKysrKy0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgICAgIHwgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwg NSBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3J1bnRpbWVfcG0uYwppbmRleCBiY2E3Y2E3Li42MDNkNDEwIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC01MzgsOCArNTM4LDcgQEAgc3RhdGljIHZvaWQgYXNz ZXJ0X2Nhbl9lbmFibGVfZGM1KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAog CVdBUk5fT05DRSgoSTkxNV9SRUFEKERDX1NUQVRFX0VOKSAmIERDX1NUQVRFX0VOX1VQVE9fREM1 KSwKIAkJICAiREM1IGFscmVhZHkgcHJvZ3JhbW1lZCB0byBiZSBlbmFibGVkLlxuIik7Ci0JV0FS Tl9PTkNFKGRldl9wcml2LT5wbS5zdXNwZW5kZWQsCi0JCSAgIkRDNSBjYW5ub3QgYmUgZW5hYmxl ZCwgaWYgcGxhdGZvcm0gaXMgcnVudGltZS1zdXNwZW5kZWQuXG4iKTsKKwlhc3NlcnRfcnBtX3dh a2Vsb2NrX2hlbGQoZGV2X3ByaXYpOwogCiAJYXNzZXJ0X2Nzcl9sb2FkZWQoZGV2X3ByaXYpOwog fQpAQCAtNTUzLDggKzU1Miw3IEBAIHN0YXRpYyB2b2lkIGFzc2VydF9jYW5fZGlzYWJsZV9kYzUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmIChkZXZfcHJpdi0+cG93ZXJf ZG9tYWlucy5pbml0aWFsaXppbmcpCiAJCXJldHVybjsKIAotCVdBUk5fT05DRShkZXZfcHJpdi0+ cG0uc3VzcGVuZGVkLAotCQkiRGlzYWJsaW5nIG9mIERDNSB3aGlsZSBwbGF0Zm9ybSBpcyBydW50 aW1lLXN1c3BlbmRlZCBzaG91bGQgbmV2ZXIgaGFwcGVuLlxuIik7CisJYXNzZXJ0X3JwbV93YWtl bG9ja19oZWxkKGRldl9wcml2KTsKIH0KIAogc3RhdGljIHZvaWQgZ2VuOV9lbmFibGVfZGM1KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKQEAgLTIyMzgsNyArMjIzNiw3IEBAIHZv aWQgaW50ZWxfcnVudGltZV9wbV9nZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCXN0cnVjdCBkZXZpY2UgKmRldmljZSA9ICZkZXYtPnBkZXYtPmRldjsKIAogCXBtX3J1bnRp bWVfZ2V0X3N5bmMoZGV2aWNlKTsKLQlXQVJOKGRldl9wcml2LT5wbS5zdXNwZW5kZWQsICJEZXZp Y2Ugc3RpbGwgc3VzcGVuZGVkLlxuIik7CisJYXNzZXJ0X3JwbV93YWtlbG9ja19oZWxkKGRldl9w cml2KTsKIH0KIAogLyoqCkBAIC0yMjYzLDcgKzIyNjEsNyBAQCB2b2lkIGludGVsX3J1bnRpbWVf cG1fZ2V0X25vcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKIAlzdHJ1Y3QgZGV2aWNlICpkZXZp Y2UgPSAmZGV2LT5wZGV2LT5kZXY7CiAKLQlXQVJOKGRldl9wcml2LT5wbS5zdXNwZW5kZWQsICJH ZXR0aW5nIG5vc3luYy1yZWYgd2hpbGUgc3VzcGVuZGVkLlxuIik7CisJYXNzZXJ0X3JwbV93YWtl bG9ja19oZWxkKGRldl9wcml2KTsKIAlwbV9ydW50aW1lX2dldF9ub3Jlc3VtZShkZXZpY2UpOwog fQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IDNjNjNkOTQuLjI3N2U2MGEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC00MDQsNyArNDA0LDcgQEAgdm9p ZCBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJaWYgKCFkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0KQogCQly ZXR1cm47CiAKLQlXQVJOX09OKGRldl9wcml2LT5wbS5zdXNwZW5kZWQpOworCWFzc2VydF9ycG1f d2FrZWxvY2tfaGVsZChkZXZfcHJpdik7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYt PnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CiAJX19pbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChk ZXZfcHJpdiwgZndfZG9tYWlucyk7Ci0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK