From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gabriel Feceoru Subject: [PATCH] drm/i915: Add RPM references in the *_get_hw_state functions Date: Thu, 31 Dec 2015 14:45:49 +0200 Message-ID: <1451565949-8523-1-git-send-email-gabriel.feceoru@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EAAE6E0AA for ; Thu, 31 Dec 2015 04:39:22 -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 List-Id: intel-gfx@lists.freedesktop.org VGhpcyBnZXRzIHJpZCBvZiBlcnJvcnMgbGlrZToKClsgIDkwNi4yODYyMTNdIC0tLS0tLS0tLS0t LVsgY3V0IGhlcmUgXS0tLS0tLS0tLS0tLQpbICA5MDYuMjg2MjMzXSBXQVJOSU5HOiBDUFU6IDAg UElEOiAxMjI1MiBhdCBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaDoxNDU3IGdlbjZf cmVhZDMyKzB4MWNhLzB4MWUwIFtpOTE1XSgpClsgIDkwNi4yODYyMzRdIFJQTSB3YWtlbG9jayBy ZWYgbm90IGhlbGQgZHVyaW5nIEhXIGFjY2VzcwpbICA5MDYuMjg2MjM1XSBNb2R1bGVzIGxpbmtl ZCBpbjoKWyAgOTA2LjI4NjIzNl0gIHNuZF9oZGFfaW50ZWwgaTkxNSBkcm1fa21zX2hlbHBlciBk cm0gbXNyIHNuZF9oZGFfY29kZWNfaGRtaSBzbmRfaGRhX2NvZGVjX3JlYWx0ZWsgc25kX2hkYV9j b2RlY19nZW5lcmljIHNuZF9oZGFfY29kZWMgc25kX2h3ZGVwIHg4Nl9wa2dfdGVtcF90aGVybWFs IHNuZF9oZGFfY29yZSBpMmNfYWxnb19iaXQgZWhjaV9wY2kgc3lzY29weWFyZWEgc3lzZmlsbHJl Y3Qgc3lzaW1nYmx0IGZiX3N5c19mb3BzIGVoY2lfaGNkIHI4MTY5IHhoY2lfcGNpIG1paSB4aGNp X2hjZCB2aWRlbyBbbGFzdCB1bmxvYWRlZDogZHJtXQpbICA5MDYuMjg2MjQ2XSBDUFU6IDAgUElE OiAxMjI1MiBDb21tOiBrbXNfcGlwZV9jcmNfYmEgVGFpbnRlZDogRyAgICAgVSAgVyAgICAgICA0 LjQuMC1yYzYrICM0NQpbICA5MDYuMjg2MjQ3XSBIYXJkd2FyZSBuYW1lOiBEZWxsIEluYy4gSW5z cGlyb24gMzg0Ny8wODhEVDEgICAgICAgLCBCSU9TIEEwNiAwMS8xNS8yMDE1ClsgIDkwNi4yODYy NDhdICBmZmZmZmZmZmMwMjJjMDk4IGZmZmY4ODAyMTBkYmJhZTAgZmZmZmZmZmY4MTNlMGU0ZiBm ZmZmODgwMjEwZGJiYjI4ClsgIDkwNi4yODYyNTBdICBmZmZmODgwMjEwZGJiYjE4IGZmZmZmZmZm ODEwNWY1ZjIgZmZmZjg4MDFmZmY0MDAwMCAwMDAwMDAwMDAwMDQ2MDQwClsgIDkwNi4yODYyNTFd ICBmZmZmODgwMWZmZjQ5MTcwIGZmZmY4ODAxZmZmNDkxNzAgZmZmZjg4MDFmZmY0MDAwMCBmZmZm ODgwMjEwZGJiYjc4ClsgIDkwNi4yODYyNTNdIENhbGwgVHJhY2U6ClsgIDkwNi4yODYyNTZdICBb PGZmZmZmZmZmODEzZTBlNGY+XSBkdW1wX3N0YWNrKzB4NDQvMHg1NQpbICA5MDYuMjg2MjU5XSAg WzxmZmZmZmZmZjgxMDVmNWYyPl0gd2Fybl9zbG93cGF0aF9jb21tb24rMHg4Mi8weGMwClsgIDkw Ni4yODYyNjFdICBbPGZmZmZmZmZmODEwNWY2N2M+XSB3YXJuX3Nsb3dwYXRoX2ZtdCsweDRjLzB4 NTAKWyAgOTA2LjI4NjI3MF0gIFs8ZmZmZmZmZmZjMDA3ZTI5Yz5dID8gZHJtX3Byb3BlcnR5X2Zy ZWVfYmxvYisweDhjLzB4YjAgW2RybV0KWyAgOTA2LjI4NjI4MF0gIFs8ZmZmZmZmZmZjMDFhMzJl YT5dIGdlbjZfcmVhZDMyKzB4MWNhLzB4MWUwIFtpOTE1XQpbICA5MDYuMjg2MjgzXSAgWzxmZmZm ZmZmZjgxNzJjZDEyPl0gPyBtdXRleF9sb2NrKzB4MTIvMHgzMApbICA5MDYuMjg2Mjk0XSAgWzxm ZmZmZmZmZmMwMWUwZWYwPl0gaHN3X2RkaV93cnBsbF9nZXRfaHdfc3RhdGUrMHg0MC8weDUwIFtp OTE1XQpbICA5MDYuMjg2MzA0XSAgWzxmZmZmZmZmZmMwMWMzZmExPl0gaW50ZWxfYXRvbWljX2Nv bW1pdCsweGQ0MS8weDE3NDAgW2k5MTVdClsgIDkwNi4yODYzMTJdICBbPGZmZmZmZmZmYzAwOGM1 OTc+XSBkcm1fYXRvbWljX2NvbW1pdCsweDM3LzB4NjAgW2RybV0KWyAgOTA2LjI4NjMxNl0gIFs8 ZmZmZmZmZmZjMDEzNzNlNj5dIGRybV9hdG9taWNfaGVscGVyX3NldF9jb25maWcrMHg3Ni8weGIw IFtkcm1fa21zX2hlbHBlcl0KWyAgOTA2LjI4NjMyM10gIFs8ZmZmZmZmZmZjMDA4YWMwYT5dID8g ZHJtX21vZGVzZXRfbG9ja19hbGxfY3R4KzB4OWEvMHhiMCBbZHJtXQpbICA5MDYuMjg2MzI5XSAg WzxmZmZmZmZmZmMwMDdiODUyPl0gZHJtX21vZGVfc2V0X2NvbmZpZ19pbnRlcm5hbCsweDYyLzB4 MTAwIFtkcm1dClsgIDkwNi4yODYzMzVdICBbPGZmZmZmZmZmYzAwN2ZjZmQ+XSBkcm1fbW9kZV9z ZXRjcnRjKzB4M2NkLzB4NGUwIFtkcm1dClsgIDkwNi4yODYzMzldICBbPGZmZmZmZmZmYzAwNzE3 NjI+XSBkcm1faW9jdGwrMHgxNTIvMHg1NDAgW2RybV0KWyAgOTA2LjI4NjM0MV0gIFs8ZmZmZmZm ZmY4MTA5ZDkxND5dID8gX193YWtlX3VwKzB4NDQvMHg1MApbICA5MDYuMjg2MzQ2XSAgWzxmZmZm ZmZmZmMwMDdmOTMwPl0gPyBkcm1fbW9kZV9zZXRwbGFuZSsweDFiMC8weDFiMCBbZHJtXQpbICA5 MDYuMjg2MzQ4XSAgWzxmZmZmZmZmZjgxMWRjODQ0Pl0gPyBtbnRwdXQrMHgyNC8weDQwClsgIDkw Ni4yODYzNTBdICBbPGZmZmZmZmZmODExYmZlMjI+XSA/IF9fZnB1dCsweDE3Mi8weDFlMApbICA5 MDYuMjg2MzUyXSAgWzxmZmZmZmZmZjgxMWQwNzU4Pl0gZG9fdmZzX2lvY3RsKzB4Mjg4LzB4NDYw ClsgIDkwNi4yODYzNTNdICBbPGZmZmZmZmZmODExYmZlY2U+XSA/IF9fX19mcHV0KzB4ZS8weDEw CgpTaWduZWQtb2ZmLWJ5OiBHYWJyaWVsIEZlY2VvcnUgPGdhYnJpZWwuZmVjZW9ydUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgfCA0OCArKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzYgaW5zZXJ0 aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCBl NjQwOGU1Li40YmE5ZjJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k ZGkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwpAQCAtMjAxNCwxNSAr MjAxNCwxOCBAQCBib29sIGludGVsX2RkaV9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXIsCiAJZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBwb3dlcl9kb21h aW47CiAJdTMyIHRtcDsKIAlpbnQgaTsKKwlib29sIHJldCA9IGZhbHNlOwogCiAJcG93ZXJfZG9t YWluID0gaW50ZWxfZGlzcGxheV9wb3J0X3Bvd2VyX2RvbWFpbihlbmNvZGVyKTsKIAlpZiAoIWlu dGVsX2Rpc3BsYXlfcG93ZXJfaXNfZW5hYmxlZChkZXZfcHJpdiwgcG93ZXJfZG9tYWluKSkKLQkJ cmV0dXJuIGZhbHNlOworCQlyZXR1cm4gcmV0OworCisJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2 X3ByaXYpOwogCiAJdG1wID0gSTkxNV9SRUFEKERESV9CVUZfQ1RMKHBvcnQpKTsKIAogCWlmICgh KHRtcCAmIERESV9CVUZfQ1RMX0VOQUJMRSkpCi0JCXJldHVybiBmYWxzZTsKKwkJZ290byBvdXQ7 CiAKIAlpZiAocG9ydCA9PSBQT1JUX0EpIHsKIAkJdG1wID0gSTkxNV9SRUFEKFRSQU5TX0RESV9G VU5DX0NUTChUUkFOU0NPREVSX0VEUCkpOwpAQCAtMjA0MCw3ICsyMDQzLDggQEAgYm9vbCBpbnRl bF9kZGlfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJYnJl YWs7CiAJCX0KIAotCQlyZXR1cm4gdHJ1ZTsKKwkJcmV0ID0gdHJ1ZTsKKwkJZ290byBvdXQ7CiAJ fSBlbHNlIHsKIAkJZm9yIChpID0gVFJBTlNDT0RFUl9BOyBpIDw9IFRSQU5TQ09ERVJfQzsgaSsr KSB7CiAJCQl0bXAgPSBJOTE1X1JFQUQoVFJBTlNfRERJX0ZVTkNfQ1RMKGkpKTsKQEAgLTIwNDgs MTcgKzIwNTIsMTkgQEAgYm9vbCBpbnRlbF9kZGlfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyLAogCQkJaWYgKCh0bXAgJiBUUkFOU19ERElfUE9SVF9NQVNLKQogCQkJ ICAgID09IFRSQU5TX0RESV9TRUxFQ1RfUE9SVChwb3J0KSkgewogCQkJCWlmICgodG1wICYgVFJB TlNfRERJX01PREVfU0VMRUNUX01BU0spID09IFRSQU5TX0RESV9NT0RFX1NFTEVDVF9EUF9NU1Qp Ci0JCQkJCXJldHVybiBmYWxzZTsKKwkJCQkJZ290byBvdXQ7CiAKIAkJCQkqcGlwZSA9IGk7Ci0J CQkJcmV0dXJuIHRydWU7CisJCQkJcmV0ID0gdHJ1ZTsKKwkJCQlnb3RvIG91dDsKIAkJCX0KIAkJ fQogCX0KIAogCURSTV9ERUJVR19LTVMoIk5vIHBpcGUgZm9yIGRkaSBwb3J0ICVjIGZvdW5kXG4i LCBwb3J0X25hbWUocG9ydCkpOwotCi0JcmV0dXJuIGZhbHNlOworb3V0OgorCWludGVsX3J1bnRp bWVfcG1fcHV0KGRldl9wcml2KTsKKwlyZXR1cm4gcmV0OwogfQogCiB2b2lkIGludGVsX2RkaV9l bmFibGVfcGlwZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKQEAgLTI1MTAs NyArMjUxNiwxMCBAQCBzdGF0aWMgYm9vbCBoc3dfZGRpX3dycGxsX2dldF9od19zdGF0ZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaWYgKCFpbnRlbF9kaXNwbGF5X3Bvd2Vy X2lzX2VuYWJsZWQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9QTExTKSkKIAkJcmV0dXJuIGZhbHNl OwogCisJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwogCXZhbCA9IEk5MTVfUkVBRChX UlBMTF9DVEwocGxsLT5pZCkpOworCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKKwog CWh3X3N0YXRlLT53cnBsbCA9IHZhbDsKIAogCXJldHVybiB2YWwgJiBXUlBMTF9QTExfRU5BQkxF OwpAQCAtMjUyNSw3ICsyNTM0LDEwIEBAIHN0YXRpYyBib29sIGhzd19kZGlfc3BsbF9nZXRfaHdf c3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWlmICghaW50ZWxfZGlz cGxheV9wb3dlcl9pc19lbmFibGVkKGRldl9wcml2LCBQT1dFUl9ET01BSU5fUExMUykpCiAJCXJl dHVybiBmYWxzZTsKIAorCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKIAl2YWwgPSBJ OTE1X1JFQUQoU1BMTF9DVEwpOworCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKKwog CWh3X3N0YXRlLT5zcGxsID0gdmFsOwogCiAJcmV0dXJuIHZhbCAmIFNQTExfUExMX0VOQUJMRTsK QEAgLTI2NDQsMTYgKzI2NTYsMTkgQEAgc3RhdGljIGJvb2wgc2tsX2RkaV9wbGxfZ2V0X2h3X3N0 YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAl1aW50MzJfdCB2YWw7CiAJ dW5zaWduZWQgaW50IGRwbGw7CiAJY29uc3Qgc3RydWN0IHNrbF9kcGxsX3JlZ3MgKnJlZ3MgPSBz a2xfZHBsbF9yZWdzOworCWJvb2wgcmV0ID0gZmFsc2U7CiAKIAlpZiAoIWludGVsX2Rpc3BsYXlf cG93ZXJfaXNfZW5hYmxlZChkZXZfcHJpdiwgUE9XRVJfRE9NQUlOX1BMTFMpKQotCQlyZXR1cm4g ZmFsc2U7CisJCXJldHVybiByZXQ7CiAKIAkvKiBEUExMMCBpcyBub3QgcGFydCBvZiB0aGUgc2hh cmVkIERQTExzLCBzbyBwbGwtPmlkIGlzIDAgZm9yIERQTEwxICovCiAJZHBsbCA9IHBsbC0+aWQg KyAxOwogCisJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOworCiAJdmFsID0gSTkxNV9S RUFEKHJlZ3NbcGxsLT5pZF0uY3RsKTsKIAlpZiAoISh2YWwgJiBMQ1BMTF9QTExfRU5BQkxFKSkK LQkJcmV0dXJuIGZhbHNlOworCQlnb3RvIG91dDsKIAogCXZhbCA9IEk5MTVfUkVBRChEUExMX0NU UkwxKTsKIAlod19zdGF0ZS0+Y3RybDEgPSAodmFsID4+IChkcGxsICogNikpICYgMHgzZjsKQEAg LTI2NjQsNiArMjY3OSw5IEBAIHN0YXRpYyBib29sIHNrbF9kZGlfcGxsX2dldF9od19zdGF0ZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWh3X3N0YXRlLT5jZmdjcjIgPSBJ OTE1X1JFQUQocmVnc1twbGwtPmlkXS5jZmdjcjIpOwogCX0KIAorCXJldCA9IHRydWU7CitvdXQ6 CisJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOwogCXJldHVybiB0cnVlOwogfQogCkBA IC0yOTMxLDEzICsyOTQ5LDE2IEBAIHN0YXRpYyBib29sIGJ4dF9kZGlfcGxsX2dldF9od19zdGF0 ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB7CiAJZW51bSBwb3J0IHBvcnQg PSAoZW51bSBwb3J0KXBsbC0+aWQ7CS8qIDE6MSBwb3J0LT5QTEwgbWFwcGluZyAqLwogCXVpbnQz Ml90IHZhbDsKKwlib29sIHJldCA9IGZhbHNlOwogCiAJaWYgKCFpbnRlbF9kaXNwbGF5X3Bvd2Vy X2lzX2VuYWJsZWQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9QTExTKSkKLQkJcmV0dXJuIGZhbHNl OworCQlyZXR1cm4gcmV0OworCisJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwogCiAJ dmFsID0gSTkxNV9SRUFEKEJYVF9QT1JUX1BMTF9FTkFCTEUocG9ydCkpOwogCWlmICghKHZhbCAm IFBPUlRfUExMX0VOQUJMRSkpCi0JCXJldHVybiBmYWxzZTsKKwkJZ290byBvdXQ7CiAKIAlod19z dGF0ZS0+ZWJiMCA9IEk5MTVfUkVBRChCWFRfUE9SVF9QTExfRUJCXzAocG9ydCkpOwogCWh3X3N0 YXRlLT5lYmIwICY9IFBPUlRfUExMX1AxX01BU0sgfCBQT1JUX1BMTF9QMl9NQVNLOwpAQCAtMjk4 NCw3ICszMDA1LDEwIEBAIHN0YXRpYyBib29sIGJ4dF9kZGlfcGxsX2dldF9od19zdGF0ZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJIEk5MTVfUkVBRChCWFRfUE9SVF9Q Q1NfRFcxMl9MTjIzKHBvcnQpKSk7CiAJaHdfc3RhdGUtPnBjc2R3MTIgJj0gTEFORV9TVEFHR0VS X01BU0sgfCBMQU5FU1RBR0dFUl9TVFJBUF9PVlJEOwogCi0JcmV0dXJuIHRydWU7CisJcmV0ID0g dHJ1ZTsKK291dDoKKwlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7CisJcmV0dXJuIHJl dDsKIH0KIAogc3RhdGljIHZvaWQgYnh0X3NoYXJlZF9kcGxsc19pbml0KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=