From: Imre Deak Subject: [PATCH 02/12] drm/i915: ensure the HW is powered during display pipe HW readout Date: Fri, 12 Feb 2016 18:55:11 +0200 Message-ID: <1455296121-4742-3-git-send-email-imre.deak@intel.com> References: <1455296121-4742-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 8FEFD6EB18 for ; Fri, 12 Feb 2016 08:55:30 -0800 (PST) In-Reply-To: <1455296121-4742-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 VGhlIGFzc3VtcHRpb24gd2hlbiBhZGRpbmcgdGhlIGludGVsX2Rpc3BsYXlfcG93ZXJfaXNfZW5h YmxlZCgpIGNoZWNrcwp3YXMgdGhhdCBpZiBpdCByZXR1cm5zIHN1Y2Nlc3MgdGhlIHBvd2VyIGNh bid0IGJlIHR1cm5lZCBvZmYgYWZ0ZXJ3YXJkcwpkdXJpbmcgdGhlIEhXIGFjY2Vzcywgd2hpY2gg aXMgZ3VhcmFudGVlZCBieSBtb2Rlc2V0IGxvY2tzLiBUaGlzIGlzbid0CmFsd2F5cyB0cnVlLCBz byBtYWtlIHN1cmUgd2UgaG9sZCBhIGRlZGljYXRlZCByZWZlcmVuY2UgZm9yIHRoZSB0aW1lIG9m CnRoZSBhY2Nlc3MuCgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNjcgKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDggaW5zZXJ0 aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IDgzNmJiZGMuLjZhYmZjNTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTgxODEsMTggKzgxODEsMjIgQEAgc3RhdGljIGJvb2wgaTl4eF9nZXRfcGlwZV9jb25m aWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CisJZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBwb3dlcl9k b21haW47CiAJdWludDMyX3QgdG1wOworCWJvb2wgcmV0OwogCi0JaWYgKCFpbnRlbF9kaXNwbGF5 X3Bvd2VyX2lzX2VuYWJsZWQoZGV2X3ByaXYsCi0JCQkJCSAgICBQT1dFUl9ET01BSU5fUElQRShj cnRjLT5waXBlKSkpCisJcG93ZXJfZG9tYWluID0gUE9XRVJfRE9NQUlOX1BJUEUoY3J0Yy0+cGlw ZSk7CisJaWYgKCFpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldF9pZl9lbmFibGVkKGRldl9wcml2LCBw b3dlcl9kb21haW4pKQogCQlyZXR1cm4gZmFsc2U7CiAKIAlwaXBlX2NvbmZpZy0+Y3B1X3RyYW5z Y29kZXIgPSAoZW51bSB0cmFuc2NvZGVyKSBjcnRjLT5waXBlOwogCXBpcGVfY29uZmlnLT5zaGFy ZWRfZHBsbCA9IERQTExfSURfUFJJVkFURTsKIAorCXJldCA9IGZhbHNlOworCiAJdG1wID0gSTkx NV9SRUFEKFBJUEVDT05GKGNydGMtPnBpcGUpKTsKIAlpZiAoISh0bXAgJiBQSVBFQ09ORl9FTkFC TEUpKQotCQlyZXR1cm4gZmFsc2U7CisJCWdvdG8gb3V0OwogCiAJaWYgKElTX0c0WChkZXYpIHx8 IElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpIHsKIAkJc3dpdGNoICh0 bXAgJiBQSVBFQ09ORl9CUENfTUFTSykgewpAQCAtODI3Miw3ICs4Mjc2LDEyIEBAIHN0YXRpYyBi b29sIGk5eHhfZ2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCXBpcGVf Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19jbG9jayA9CiAJCXBpcGVfY29uZmlnLT5w b3J0X2Nsb2NrIC8gcGlwZV9jb25maWctPnBpeGVsX211bHRpcGxpZXI7CiAKLQlyZXR1cm4gdHJ1 ZTsKKwlyZXQgPSB0cnVlOworCitvdXQ6CisJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2X3By aXYsIHBvd2VyX2RvbWFpbik7CisKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCBpcm9u bGFrZV9pbml0X3BjaF9yZWZjbGsoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTkzNzYsMTgg KzkzODUsMjEgQEAgc3RhdGljIGJvb2wgaXJvbmxha2VfZ2V0X3BpcGVfY29uZmlnKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjLAogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNl LmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOworCWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gcG93ZXJfZG9tYWluOwogCXVp bnQzMl90IHRtcDsKKwlib29sIHJldDsKIAotCWlmICghaW50ZWxfZGlzcGxheV9wb3dlcl9pc19l bmFibGVkKGRldl9wcml2LAotCQkJCQkgICAgUE9XRVJfRE9NQUlOX1BJUEUoY3J0Yy0+cGlwZSkp KQorCXBvd2VyX2RvbWFpbiA9IFBPV0VSX0RPTUFJTl9QSVBFKGNydGMtPnBpcGUpOworCWlmICgh aW50ZWxfZGlzcGxheV9wb3dlcl9nZXRfaWZfZW5hYmxlZChkZXZfcHJpdiwgcG93ZXJfZG9tYWlu KSkKIAkJcmV0dXJuIGZhbHNlOwogCiAJcGlwZV9jb25maWctPmNwdV90cmFuc2NvZGVyID0gKGVu dW0gdHJhbnNjb2RlcikgY3J0Yy0+cGlwZTsKIAlwaXBlX2NvbmZpZy0+c2hhcmVkX2RwbGwgPSBE UExMX0lEX1BSSVZBVEU7CiAKKwlyZXQgPSBmYWxzZTsKIAl0bXAgPSBJOTE1X1JFQUQoUElQRUNP TkYoY3J0Yy0+cGlwZSkpOwogCWlmICghKHRtcCAmIFBJUEVDT05GX0VOQUJMRSkpCi0JCXJldHVy biBmYWxzZTsKKwkJZ290byBvdXQ7CiAKIAlzd2l0Y2ggKHRtcCAmIFBJUEVDT05GX0JQQ19NQVNL KSB7CiAJY2FzZSBQSVBFQ09ORl82QlBDOgpAQCAtOTQ1MCw3ICs5NDYyLDEyIEBAIHN0YXRpYyBi b29sIGlyb25sYWtlX2dldF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAog CWlyb25sYWtlX2dldF9wZml0X2NvbmZpZyhjcnRjLCBwaXBlX2NvbmZpZyk7CiAKLQlyZXR1cm4g dHJ1ZTsKKwlyZXQgPSB0cnVlOworCitvdXQ6CisJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2 X3ByaXYsIHBvd2VyX2RvbWFpbik7CisKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCBh c3NlcnRfY2FuX2Rpc2FibGVfbGNwbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQpAQCAtOTk4MiwxMiArOTk5OSwxNyBAQCBzdGF0aWMgYm9vbCBoYXN3ZWxsX2dldF9waXBlX2Nv bmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKLQllbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWluIHBmaXRf ZG9tYWluOworCWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gcG93ZXJfZG9tYWluOwor CXVuc2lnbmVkIGxvbmcgcG93ZXJfZG9tYWluX21hc2s7CiAJdWludDMyX3QgdG1wOworCWJvb2wg cmV0OwogCi0JaWYgKCFpbnRlbF9kaXNwbGF5X3Bvd2VyX2lzX2VuYWJsZWQoZGV2X3ByaXYsCi0J CQkJCSBQT1dFUl9ET01BSU5fUElQRShjcnRjLT5waXBlKSkpCisJcG93ZXJfZG9tYWluID0gUE9X RVJfRE9NQUlOX1BJUEUoY3J0Yy0+cGlwZSk7CisJaWYgKCFpbnRlbF9kaXNwbGF5X3Bvd2VyX2dl dF9pZl9lbmFibGVkKGRldl9wcml2LCBwb3dlcl9kb21haW4pKQogCQlyZXR1cm4gZmFsc2U7CisJ cG93ZXJfZG9tYWluX21hc2sgPSBCSVQocG93ZXJfZG9tYWluKTsKKworCXJldCA9IGZhbHNlOwog CiAJcGlwZV9jb25maWctPmNwdV90cmFuc2NvZGVyID0gKGVudW0gdHJhbnNjb2RlcikgY3J0Yy0+ cGlwZTsKIAlwaXBlX2NvbmZpZy0+c2hhcmVkX2RwbGwgPSBEUExMX0lEX1BSSVZBVEU7CkBAIC0x MDAxNCwxMyArMTAwMzYsMTQgQEAgc3RhdGljIGJvb2wgaGFzd2VsbF9nZXRfcGlwZV9jb25maWco c3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCQlwaXBlX2NvbmZpZy0+Y3B1X3RyYW5zY29kZXIg PSBUUkFOU0NPREVSX0VEUDsKIAl9CiAKLQlpZiAoIWludGVsX2Rpc3BsYXlfcG93ZXJfaXNfZW5h YmxlZChkZXZfcHJpdiwKLQkJCVBPV0VSX0RPTUFJTl9UUkFOU0NPREVSKHBpcGVfY29uZmlnLT5j cHVfdHJhbnNjb2RlcikpKQotCQlyZXR1cm4gZmFsc2U7CisJcG93ZXJfZG9tYWluID0gUE9XRVJf RE9NQUlOX1RSQU5TQ09ERVIocGlwZV9jb25maWctPmNwdV90cmFuc2NvZGVyKTsKKwlpZiAoIWlu dGVsX2Rpc3BsYXlfcG93ZXJfZ2V0X2lmX2VuYWJsZWQoZGV2X3ByaXYsIHBvd2VyX2RvbWFpbikp CisJCWdvdG8gb3V0OworCXBvd2VyX2RvbWFpbl9tYXNrIHw9IEJJVChwb3dlcl9kb21haW4pOwog CiAJdG1wID0gSTkxNV9SRUFEKFBJUEVDT05GKHBpcGVfY29uZmlnLT5jcHVfdHJhbnNjb2Rlcikp OwogCWlmICghKHRtcCAmIFBJUEVDT05GX0VOQUJMRSkpCi0JCXJldHVybiBmYWxzZTsKKwkJZ290 byBvdXQ7CiAKIAloYXN3ZWxsX2dldF9kZGlfcG9ydF9zdGF0ZShjcnRjLCBwaXBlX2NvbmZpZyk7 CiAKQEAgLTEwMDMwLDE0ICsxMDA1MywxNCBAQCBzdGF0aWMgYm9vbCBoYXN3ZWxsX2dldF9waXBl X2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJc2tsX2luaXRfc2NhbGVycyhkZXYs IGNydGMsIHBpcGVfY29uZmlnKTsKIAl9CiAKLQlwZml0X2RvbWFpbiA9IFBPV0VSX0RPTUFJTl9Q SVBFX1BBTkVMX0ZJVFRFUihjcnRjLT5waXBlKTsKLQogCWlmIChJTlRFTF9JTkZPKGRldiktPmdl biA+PSA5KSB7CiAJCXBpcGVfY29uZmlnLT5zY2FsZXJfc3RhdGUuc2NhbGVyX2lkID0gLTE7CiAJ CXBpcGVfY29uZmlnLT5zY2FsZXJfc3RhdGUuc2NhbGVyX3VzZXJzICY9IH4oMSA8PCBTS0xfQ1JU Q19JTkRFWCk7CiAJfQogCi0JaWYgKGludGVsX2Rpc3BsYXlfcG93ZXJfaXNfZW5hYmxlZChkZXZf cHJpdiwgcGZpdF9kb21haW4pKSB7CisJcG93ZXJfZG9tYWluID0gUE9XRVJfRE9NQUlOX1BJUEVf UEFORUxfRklUVEVSKGNydGMtPnBpcGUpOworCWlmIChpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldF9p Zl9lbmFibGVkKGRldl9wcml2LCBwb3dlcl9kb21haW4pKSB7CisJCXBvd2VyX2RvbWFpbl9tYXNr IHw9IEJJVChwb3dlcl9kb21haW4pOwogCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkK IAkJCXNreWxha2VfZ2V0X3BmaXRfY29uZmlnKGNydGMsIHBpcGVfY29uZmlnKTsKIAkJZWxzZQpA QCAtMTAwNTUsNyArMTAwNzgsMTMgQEAgc3RhdGljIGJvb2wgaGFzd2VsbF9nZXRfcGlwZV9jb25m aWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCXBpcGVfY29uZmlnLT5waXhlbF9tdWx0aXBs aWVyID0gMTsKIAl9CiAKLQlyZXR1cm4gdHJ1ZTsKKwlyZXQgPSB0cnVlOworCitvdXQ6CisJZm9y X2VhY2hfcG93ZXJfZG9tYWluKHBvd2VyX2RvbWFpbiwgcG93ZXJfZG9tYWluX21hc2spCisJCWlu dGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LCBwb3dlcl9kb21haW4pOworCisJcmV0dXJu IHJldDsKIH0KIAogc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfY3Vyc29yKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywgdTMyIGJhc2UsCi0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==