From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH] drm/i915: add intel_display_power_enabled_sw() for use in atomic ctx Date: Wed, 27 Nov 2013 22:02:02 +0200 Message-ID: <1385582522-11626-1-git-send-email-imre.deak@intel.com> References: <1385575744-7743-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 77908FBAB4 for ; Wed, 27 Nov 2013 12:02:31 -0800 (PST) In-Reply-To: <1385575744-7743-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QXRtIHdlIGNhbGwgaW50ZWxfZGlzcGxheV9wb3dlcl9lbmFibGVkKCkgZnJvbQppOTE1X2NhcHR1 cmVfZXJyb3Jfc3RhdGUoKSBpbiBJUlEgY29udGV4dCBhbmQgdGhlbiB0YWtlIGEgbXV0ZXguIFRv IGZpeAp0aGlzIGFkZCBhIG5ldyBpbnRlbF9kaXNwbGF5X3Bvd2VyX2VuYWJsZWRfc3coKSB3aGlj aCByZXR1cm5zIHRoZSBkb21haW4Kc3RhdGUgYmFzZWQgb24gc29mdHdhcmUgdHJhY2tpbmcgYXMg b3Bwb3NlZCB0byByZWFkaW5nIHRoZSBhY3R1YWwgSFcKc3RhdGUuCgpTaW5jZSB3ZSB1c2UgZG9t YWluX3VzZV9jb3VudCBmb3IgdGhpcyB3aXRob3V0IGxvY2tpbmcgb24gdGhlIHJlYWRlcgpzaWRl IG1ha2Ugc3VyZSB3ZSBpbmNyZWFzZSB0aGUgY291bnRlciBvbmx5IGFmdGVyIGVuYWJsaW5nIGFs bCByZXF1aXJlZApwb3dlciB3ZWxscyBhbmQgZGVjcmVhc2UgaXQgYmVmb3JlIGRpc2FibGluZyBh bnkgb2YgdGhlc2UgcG93ZXIgd2VsbHMuCgpSZWdyZXNzaW9uIGludHJvZHVjZWQgaW4KY29tbWl0 IDFiMDIzODM0NjRiNGE5MTU2MjdlZjNiOGZkMGFkN2YwNzE2OGM1NGMKQXV0aG9yOiBJbXJlIERl YWsgPGltcmUuZGVha0BpbnRlbC5jb20+CkRhdGU6wqDCoCBUdWUgU2VwIDI0IDE2OjE3OjA5IDIw MTMgKzAzMDAKCsKgwqDCoCBkcm0vaTkxNTogc3VwcG9ydCBmb3IgbXVsdGlwbGUgcG93ZXIgd2Vs bHMKCk5vdGUgdGhhdCBhdG0gd2UgZGVwZW5kIG9uIHRoZSB2YWx1ZSByZXR1cm5lZCBieQppbnRl bF9kaXNwbGF5X3Bvd2VyX2VuYWJsZWRfc3coKSBpbiBpOTE1X2NhcHR1cmVfZXJyb3Jfc3RhdGUo KSB0byBhdm9pZAp1bmNsYWltZWQgcmVnaXN0ZXIgYWNjZXNzIHJlcG9ydHMuIFRoaXMgd2FzIG5l dmVyIGd1YXJhbnRlZWQgdGhvdWdoLApzaW5jZSBhbm90aGVyIHRocmVhZCBjYW4gZGlzYWJsZSB0 aGUgcG93ZXIgY29uY3VycmVudGx5LiBJZiB0aGlzIGlzIGEKcHJvYmxlbSB3ZSBuZWVkIGFub3Ro ZXIgZXhwbGljaXQgd2F5IHRvIGRpc2FibGUgdGhlIHJlcG9ydGluZyBkdXJpbmcKZXJyb3IgY2Fw dHVyZXMuCgp2MjoKLSByZW1vdmUgYmFycmllcnMgYXMgdGhlIGNhbGxlciBjYW4ndCBkZXBlbmQg b24gdGhlIHZhbHVlCiAgcmV0dXJuZWQgZnJvbSBpOTE1X2NhcHR1cmVfZXJyb3Jfc3RhdGVfc3co KSBhbnl3YXkgKFZpbGxlKQotIGR1bXAgdGhlIHN0YXRlIG9mIHBpcGUvdHJhbnNjb2RlciBwb3dl ciBkb21haW4gc3RhdGUgKERhbmllbCkKClJlcG9ydGVkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtA aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICB8ICAy IC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxNSArKysrKysrKysr KystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAyICsrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAyNCArKysrKysrKysrKysrKysrLS0t LS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZWQ3YTFmYy4uY2MwNmI5ZiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCkBAIC05NzEsOSArOTcxLDcgQEAgc3RydWN0IGk5MTVfcG93ZXJfZG9t YWlucyB7CiAJaW50IHBvd2VyX3dlbGxfY291bnQ7CiAKIAlzdHJ1Y3QgbXV0ZXggbG9jazsKLSNp ZiBJU19FTkFCTEVEKENPTkZJR19ERUJVR19GUykKIAlpbnQgZG9tYWluX3VzZV9jb3VudFtQT1dF Ul9ET01BSU5fTlVNXTsKLSNlbmRpZgogCXN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgKnBvd2VyX3dl bGxzOwogfTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGU0ZGJhZTIu LjQ2NGFlNjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExMzM0LDYg KzExMzM0LDcgQEAgc3RydWN0IGludGVsX2Rpc3BsYXlfZXJyb3Jfc3RhdGUgewogCX0gY3Vyc29y W0k5MTVfTUFYX1BJUEVTXTsKIAogCXN0cnVjdCBpbnRlbF9waXBlX2Vycm9yX3N0YXRlIHsKKwkJ Ym9vbCBwb3dlcl9kb21haW5fb247CiAJCXUzMiBzb3VyY2U7CiAJfSBwaXBlW0k5MTVfTUFYX1BJ UEVTXTsKIApAQCAtMTEzNDgsNiArMTEzNDksNyBAQCBzdHJ1Y3QgaW50ZWxfZGlzcGxheV9lcnJv cl9zdGF0ZSB7CiAJfSBwbGFuZVtJOTE1X01BWF9QSVBFU107CiAKIAlzdHJ1Y3QgaW50ZWxfdHJh bnNjb2Rlcl9lcnJvcl9zdGF0ZSB7CisJCWJvb2wgcG93ZXJfZG9tYWluX29uOwogCQllbnVtIHRy YW5zY29kZXIgY3B1X3RyYW5zY29kZXI7CiAKIAkJdTMyIGNvbmY7CkBAIC0xMTM4NSw3ICsxMTM4 Nyw5IEBAIGludGVsX2Rpc3BsYXlfY2FwdHVyZV9lcnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCQllcnJvci0+cG93ZXJfd2VsbF9kcml2ZXIgPSBJOTE1X1JFQUQoSFNXX1BXUl9X RUxMX0RSSVZFUik7CiAKIAlmb3JfZWFjaF9waXBlKGkpIHsKLQkJaWYgKCFpbnRlbF9kaXNwbGF5 X3Bvd2VyX2VuYWJsZWQoZGV2LCBQT1dFUl9ET01BSU5fUElQRShpKSkpCisJCWVycm9yLT5waXBl W2ldLnBvd2VyX2RvbWFpbl9vbiA9CisJCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX2VuYWJsZWRfc3co ZGV2LCBQT1dFUl9ET01BSU5fUElQRShpKSk7CisJCWlmICghZXJyb3ItPnBpcGVbaV0ucG93ZXJf ZG9tYWluX29uKQogCQkJY29udGludWU7CiAKIAkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9 IDYgfHwgSVNfVkFMTEVZVklFVyhkZXYpKSB7CkBAIC0xMTQyMSw4ICsxMTQyNSw5IEBAIGludGVs X2Rpc3BsYXlfY2FwdHVyZV9lcnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWZv ciAoaSA9IDA7IGkgPCBlcnJvci0+bnVtX3RyYW5zY29kZXJzOyBpKyspIHsKIAkJZW51bSB0cmFu c2NvZGVyIGNwdV90cmFuc2NvZGVyID0gdHJhbnNjb2RlcnNbaV07CiAKLQkJaWYgKCFpbnRlbF9k aXNwbGF5X3Bvd2VyX2VuYWJsZWQoZGV2LAotCQkJCVBPV0VSX0RPTUFJTl9UUkFOU0NPREVSKGNw dV90cmFuc2NvZGVyKSkpCisJCWVycm9yLT50cmFuc2NvZGVyW2ldLnBvd2VyX2RvbWFpbl9vbiA9 CisJCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX2VuYWJsZWRfc3coZGV2LCBQT1dFUl9ET01BSU5fUElQ RShpKSk7CisJCWlmICghZXJyb3ItPnRyYW5zY29kZXJbaV0ucG93ZXJfZG9tYWluX29uKQogCQkJ Y29udGludWU7CiAKIAkJZXJyb3ItPnRyYW5zY29kZXJbaV0uY3B1X3RyYW5zY29kZXIgPSBjcHVf dHJhbnNjb2RlcjsKQEAgLTExNDU3LDYgKzExNDYyLDggQEAgaW50ZWxfZGlzcGxheV9wcmludF9l cnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkJICAgZXJy b3ItPnBvd2VyX3dlbGxfZHJpdmVyKTsKIAlmb3JfZWFjaF9waXBlKGkpIHsKIAkJZXJyX3ByaW50 ZihtLCAiUGlwZSBbJWRdOlxuIiwgaSk7CisJCWVycl9wcmludGYobSwgIiAgUG93ZXI6ICVzXG4i LAorCQkJICAgZXJyb3ItPnBpcGVbaV0ucG93ZXJfZG9tYWluX29uID8gIm9uIiA6ICJvZmYiKTsK IAkJZXJyX3ByaW50ZihtLCAiICBTUkM6ICUwOHhcbiIsIGVycm9yLT5waXBlW2ldLnNvdXJjZSk7 CiAKIAkJZXJyX3ByaW50ZihtLCAiUGxhbmUgWyVkXTpcbiIsIGkpOwpAQCAtMTE0ODIsNiArMTE0 ODksOCBAQCBpbnRlbF9kaXNwbGF5X3ByaW50X2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9l cnJvcl9zdGF0ZV9idWYgKm0sCiAJZm9yIChpID0gMDsgaSA8IGVycm9yLT5udW1fdHJhbnNjb2Rl cnM7IGkrKykgewogCQllcnJfcHJpbnRmKG0sICJDUFUgdHJhbnNjb2RlcjogJWNcbiIsCiAJCQkg ICB0cmFuc2NvZGVyX25hbWUoZXJyb3ItPnRyYW5zY29kZXJbaV0uY3B1X3RyYW5zY29kZXIpKTsK KwkJZXJyX3ByaW50ZihtLCAiICBQb3dlcjogJXNcbiIsCisJCQkgICBlcnJvci0+dHJhbnNjb2Rl cltpXS5wb3dlcl9kb21haW5fb24gPyAib24iIDogIm9mZiIpOwogCQllcnJfcHJpbnRmKG0sICIg IENPTkY6ICUwOHhcbiIsIGVycm9yLT50cmFuc2NvZGVyW2ldLmNvbmYpOwogCQllcnJfcHJpbnRm KG0sICIgIEhUT1RBTDogJTA4eFxuIiwgZXJyb3ItPnRyYW5zY29kZXJbaV0uaHRvdGFsKTsKIAkJ ZXJyX3ByaW50ZihtLCAiICBIQkxBTks6ICUwOHhcbiIsIGVycm9yLT50cmFuc2NvZGVyW2ldLmhi bGFuayk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDAyMzEyODEuLjVkZWEzODkgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC04NDIsNiArODQyLDggQEAgaW50IGludGVsX3Bv d2VyX2RvbWFpbnNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaW50ZWxfcG93 ZXJfZG9tYWluc19yZW1vdmUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBib29sIGludGVsX2Rp c3BsYXlfcG93ZXJfZW5hYmxlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSBlbnVtIGlu dGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWluIGRvbWFpbik7Citib29sIGludGVsX2Rpc3BsYXlfcG93 ZXJfZW5hYmxlZF9zdyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCSAgICBlbnVtIGludGVs X2Rpc3BsYXlfcG93ZXJfZG9tYWluIGRvbWFpbik7CiB2b2lkIGludGVsX2Rpc3BsYXlfcG93ZXJf Z2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgICAgIGVudW0gaW50ZWxfZGlzcGxheV9w b3dlcl9kb21haW4gZG9tYWluKTsKIHZvaWQgaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDcxNDlmNjAuLjMx MTE5OWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNTYzNSw2ICs1NjM1LDE3IEBAIHN0 YXRpYyBib29sIGhzd19wb3dlcl93ZWxsX2VuYWJsZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAkJICAgICAoSFNXX1BXUl9XRUxMX0VOQUJMRV9SRVFVRVNUIHwgSFNXX1BXUl9XRUxMX1NUQVRF X0VOQUJMRUQpOwogfQogCitib29sIGludGVsX2Rpc3BsYXlfcG93ZXJfZW5hYmxlZF9zdyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCSAgICBlbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9t YWluIGRvbWFpbikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOworCXN0cnVjdCBpOTE1X3Bvd2VyX2RvbWFpbnMgKnBvd2VyX2RvbWFpbnM7 CisKKwlwb3dlcl9kb21haW5zID0gJmRldl9wcml2LT5wb3dlcl9kb21haW5zOworCisJcmV0dXJu IHBvd2VyX2RvbWFpbnMtPmRvbWFpbl91c2VfY291bnRbZG9tYWluXTsKK30KKwogYm9vbCBpbnRl bF9kaXNwbGF5X3Bvd2VyX2VuYWJsZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgZW51 bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW4pCiB7CkBAIC01NzU1LDEyICs1NzY2 LDExIEBAIHZvaWQgaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAogCW11dGV4X2xvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOwogCi0jaWYgSVNfRU5BQkxF RChDT05GSUdfREVCVUdfRlMpCi0JcG93ZXJfZG9tYWlucy0+ZG9tYWluX3VzZV9jb3VudFtkb21h aW5dKys7Ci0jZW5kaWYKIAlmb3JfZWFjaF9wb3dlcl93ZWxsKGksIHBvd2VyX3dlbGwsIEJJVChk b21haW4pLCBwb3dlcl9kb21haW5zKQogCQlfX2ludGVsX3Bvd2VyX3dlbGxfZ2V0KGRldiwgcG93 ZXJfd2VsbCk7CiAKKwlwb3dlcl9kb21haW5zLT5kb21haW5fdXNlX2NvdW50W2RvbWFpbl0rKzsK KwogCW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7CiB9CiAKQEAgLTU3NzYsMTMg KzU3ODYsMTEgQEAgdm9pZCBpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCiAJbXV0ZXhfbG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7CiAKLQlmb3JfZWFj aF9wb3dlcl93ZWxsX3JldihpLCBwb3dlcl93ZWxsLCBCSVQoZG9tYWluKSwgcG93ZXJfZG9tYWlu cykKLQkJX19pbnRlbF9wb3dlcl93ZWxsX3B1dChkZXYsIHBvd2VyX3dlbGwpOwotCi0jaWYgSVNf RU5BQkxFRChDT05GSUdfREVCVUdfRlMpCiAJV0FSTl9PTighcG93ZXJfZG9tYWlucy0+ZG9tYWlu X3VzZV9jb3VudFtkb21haW5dKTsKIAlwb3dlcl9kb21haW5zLT5kb21haW5fdXNlX2NvdW50W2Rv bWFpbl0tLTsKLSNlbmRpZgorCisJZm9yX2VhY2hfcG93ZXJfd2VsbF9yZXYoaSwgcG93ZXJfd2Vs bCwgQklUKGRvbWFpbiksIHBvd2VyX2RvbWFpbnMpCisJCV9faW50ZWxfcG93ZXJfd2VsbF9wdXQo ZGV2LCBwb3dlcl93ZWxsKTsKIAogCW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7 CiB9Ci0tIAoxLjguNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK