From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH 3/4] drm/i915: introduce INTEL_DISPLAY_ENABLED() Date: Mon, 2 Sep 2019 21:08:15 +0300 Message-ID: <076a8cde1a75d0c8254014fe0310da7deb8dc8d7.1567446845.git.jani.nikula@intel.com> References: 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 ESMTPS id CB7088929F for ; Mon, 2 Sep 2019 18:07:47 +0000 (UTC) In-Reply-To: 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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org UHJlcGFyZSBmb3IgbWFraW5nIGEgZGlzdGluY3Rpb24gYmV0d2VlbiBub3QgaGF2aW5nIGRpc3Bs YXkgYW5kIGhhdmluZwpkaXNhYmxlZCBkaXNwbGF5LiBBZGQgSU5URUxfRElTUExBWV9FTkFCTEVE KCkgYW5kIHVzZSBpdCB3aGVyZQpIQVNfRElTUExBWSgpIGlzIHVzZWQuIFRoaXMgaXMgaW5pdGlh bGx5IGR1cGxpY2F0aW9uLCBhcyBkaXNhYmxpbmcKZGlzcGxheSBzdGlsbCBsZWFkcyB0byAtPnBp cGVfbWFzayA9IDAgYW5kIEhBU19ESVNQTEFZKCkgYmVpbmcgZmFsc2UuCgpTaW5jZSBJTlRFTF9E SVNQTEFZX0VOQUJMRUQoKSB3aWxsIG5vdCBtYWtlIHNlbnNlIHVubGVzcyBIQVNfRElTUExBWSgp CmlzIHRydWUsIGluY2x1ZGUgYSB3YXJuaW5nIGZvciBjYXRjaGluZyBtaXN1c2VzIG1ha2luZyBk ZWNpc2lvbnMgb24KSU5URUxfRElTUExBWV9FTkFCTEVEKCkgd2hlbiBIQVNfRElTUExBWSgpIGlz IGZhbHNlLgoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzog Sm9zw6kgUm9iZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+CkNjOiBWaWxsZSBT eXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBK YW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2Rpc3BsYXkvaW50ZWxfYmlvcy5jICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgfCA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfZmJkZXYuYyAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF9nbWJ1cy5jICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j ICAgICAgICAgICAgICB8IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggICAgICAgICAgICAgIHwgMyArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BjaC5j ICAgICAgICAgICAgIHwgMiArLQogNyBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAx MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Jpb3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYmlvcy5j CmluZGV4IGVmYjM5ZjM1MGIxOS4uMWRlZjU1MGM2OGM4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Jpb3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2Jpb3MuYwpAQCAtMTgzMyw3ICsxODMzLDcgQEAgdm9pZCBpbnRlbF9i aW9zX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWNvbnN0IHN0cnVj dCBiZGJfaGVhZGVyICpiZGI7CiAJdTggX19pb21lbSAqYmlvcyA9IE5VTEw7CiAKLQlpZiAoIUhB U19ESVNQTEFZKGRldl9wcml2KSkgeworCWlmICghSEFTX0RJU1BMQVkoZGV2X3ByaXYpIHx8ICFJ TlRFTF9ESVNQTEFZX0VOQUJMRUQoZGV2X3ByaXYpKSB7CiAJCURSTV9ERUJVR19LTVMoIlNraXBw aW5nIFZCVCBpbml0IGR1ZSB0byBkaXNhYmxlZCBkaXNwbGF5LlxuIik7CiAJCXJldHVybjsKIAl9 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCmluZGV4IGU0 ODBmZmUwYWU2ZS4uYzNiYjE4YWZlNmQ3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNw bGF5L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTUzMjQsNyArMTUzMjQsNyBAQCBzdGF0aWMgdm9pZCBp bnRlbF9zZXR1cF9vdXRwdXRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAog CWludGVsX3Bwc19pbml0KGRldl9wcml2KTsKIAotCWlmICghSEFTX0RJU1BMQVkoZGV2X3ByaXYp KQorCWlmICghSEFTX0RJU1BMQVkoZGV2X3ByaXYpIHx8ICFJTlRFTF9ESVNQTEFZX0VOQUJMRUQo ZGV2X3ByaXYpKQogCQlyZXR1cm47CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMikg ewpAQCAtMTcyMjcsNyArMTcyMjcsNyBAQCBpbnRlbF9kaXNwbGF5X2NhcHR1cmVfZXJyb3Jfc3Rh dGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJQlVJTERfQlVHX09OKEFS UkFZX1NJWkUodHJhbnNjb2RlcnMpICE9IEFSUkFZX1NJWkUoZXJyb3ItPnRyYW5zY29kZXIpKTsK IAotCWlmICghSEFTX0RJU1BMQVkoZGV2X3ByaXYpKQorCWlmICghSEFTX0RJU1BMQVkoZGV2X3By aXYpIHx8ICFJTlRFTF9ESVNQTEFZX0VOQUJMRUQoZGV2X3ByaXYpKQogCQlyZXR1cm4gTlVMTDsK IAogCWVycm9yID0ga3phbGxvYyhzaXplb2YoKmVycm9yKSwgR0ZQX0FUT01JQyk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiZGV2LmMKaW5kZXggZDU5ZWVlNWM1ZDljLi42 ODMzODY2OWYwNTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiZGV2 LmMKQEAgLTQ0NCw3ICs0NDQsNyBAQCBpbnQgaW50ZWxfZmJkZXZfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCXN0cnVjdCBpbnRlbF9mYmRldiAqaWZiZGV2OwogCWludCByZXQ7CiAKLQlp ZiAoV0FSTl9PTighSEFTX0RJU1BMQVkoZGV2X3ByaXYpKSkKKwlpZiAoV0FSTl9PTighSEFTX0RJ U1BMQVkoZGV2X3ByaXYpIHx8ICFJTlRFTF9ESVNQTEFZX0VOQUJMRUQoZGV2X3ByaXYpKSkKIAkJ cmV0dXJuIC1FTk9ERVY7CiAKIAlpZmJkZXYgPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgaW50ZWxf ZmJkZXYpLCBHRlBfS0VSTkVMKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfZ21idXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf Z21idXMuYwppbmRleCBkNjc3NWEwMDU3MjYuLjNkNGQxOWFjMWQxNCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9nbWJ1cy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZ21idXMuYwpAQCAtODM2LDcgKzgzNiw3IEBAIGludCBp bnRlbF9nbWJ1c19zZXR1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJdW5z aWduZWQgaW50IHBpbjsKIAlpbnQgcmV0OwogCi0JaWYgKCFIQVNfRElTUExBWShkZXZfcHJpdikp CisJaWYgKCFIQVNfRElTUExBWShkZXZfcHJpdikgfHwgIUlOVEVMX0RJU1BMQVlfRU5BQkxFRChk ZXZfcHJpdikpCiAJCXJldHVybiAwOwogCiAJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8 IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggY2Fk NGQ2YmEyZDJjLi5mNzI2NmQ0MDU5NzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMzM4 LDcgKzMzOCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfbW9kZXNldF9wcm9iZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCWlmIChpOTE1X2luamVjdF9wcm9iZV9mYWlsdXJlKGRldl9wcml2 KSkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKLQlpZiAoSEFTX0RJU1BMQVkoZGV2X3ByaXYpKSB7CisJ aWYgKEhBU19ESVNQTEFZKGRldl9wcml2KSAmJiBJTlRFTF9ESVNQTEFZX0VOQUJMRUQoZGV2X3By aXYpKSB7CiAJCXJldCA9IGRybV92YmxhbmtfaW5pdCgmZGV2X3ByaXYtPmRybSwKIAkJCQkgICAg ICBJTlRFTF9OVU1fUElQRVMoZGV2X3ByaXYpKTsKIAkJaWYgKHJldCkKQEAgLTM4OSw3ICszODks NyBAQCBzdGF0aWMgaW50IGk5MTVfZHJpdmVyX21vZGVzZXRfcHJvYmUoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAogCWludGVsX292ZXJsYXlfc2V0dXAoZGV2X3ByaXYpOwogCi0JaWYgKCFIQVNf RElTUExBWShkZXZfcHJpdikpCisJaWYgKCFIQVNfRElTUExBWShkZXZfcHJpdikgfHwgIUlOVEVM X0RJU1BMQVlfRU5BQkxFRChkZXZfcHJpdikpCiAJCXJldHVybiAwOwogCiAJcmV0ID0gaW50ZWxf ZmJkZXZfaW5pdChkZXYpOwpAQCAtMTM4MSw3ICsxMzgxLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9k cml2ZXJfcmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCX0gZWxz ZQogCQlEUk1fRVJST1IoIkZhaWxlZCB0byByZWdpc3RlciBkcml2ZXIgZm9yIHVzZXJzcGFjZSBh Y2Nlc3MhXG4iKTsKIAotCWlmIChIQVNfRElTUExBWShkZXZfcHJpdikpIHsKKwlpZiAoSEFTX0RJ U1BMQVkoZGV2X3ByaXYpICYmIElOVEVMX0RJU1BMQVlfRU5BQkxFRChkZXZfcHJpdikpIHsKIAkJ LyogTXVzdCBiZSBkb25lIGFmdGVyIHByb2Jpbmcgb3V0cHV0cyAqLwogCQlpbnRlbF9vcHJlZ2lv bl9yZWdpc3RlcihkZXZfcHJpdik7CiAJCWFjcGlfdmlkZW9fcmVnaXN0ZXIoKTsKQEAgLTE0MDUs NyArMTQwNSw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZHJpdmVyX3JlZ2lzdGVyKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgKiBXZSBuZWVkIHRvIGNvb3JkaW5hdGUgdGhlIGhv dHBsdWdzIHdpdGggdGhlIGFzeW5jaHJvbm91cyBmYmRldgogCSAqIGNvbmZpZ3VyYXRpb24sIGZv ciB3aGljaCB3ZSB1c2UgdGhlIGZiZGV2LT5hc3luY19jb29raWUuCiAJICovCi0JaWYgKEhBU19E SVNQTEFZKGRldl9wcml2KSkKKwlpZiAoSEFTX0RJU1BMQVkoZGV2X3ByaXYpICYmIElOVEVMX0RJ U1BMQVlfRU5BQkxFRChkZXZfcHJpdikpCiAJCWRybV9rbXNfaGVscGVyX3BvbGxfaW5pdChkZXYp OwogCiAJaW50ZWxfcG93ZXJfZG9tYWluc19lbmFibGUoZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKaW5kZXggNjU1N2NkOGRkZDdhLi5lZTg0MzcwZmY3YzMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaApAQCAtMjE4Niw2ICsyMTg2LDkgQEAgSVNfU1VCUExBVEZPUk0oY29uc3Qgc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAKICNkZWZpbmUgSEFTX0RJU1BMQVkoZGV2X3By aXYpIChJTlRFTF9JTkZPKGRldl9wcml2KS0+cGlwZV9tYXNrICE9IDApCiAKKy8qIE9ubHkgdmFs aWQgd2hlbiBIQVNfRElTUExBWSgpIGlzIHRydWUgKi8KKyNkZWZpbmUgSU5URUxfRElTUExBWV9F TkFCTEVEKGRldl9wcml2KSAoV0FSTl9PTighSEFTX0RJU1BMQVkoZGV2X3ByaXYpKSwgIWk5MTVf bW9kcGFyYW1zLmRpc2FibGVfZGlzcGxheSkKKwogc3RhdGljIGlubGluZSBib29sIGludGVsX3Z0 ZF9hY3RpdmUodm9pZCkKIHsKICNpZmRlZiBDT05GSUdfSU5URUxfSU9NTVUKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BjaC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcGNoLmMKaW5kZXggZmE4NjRkOGYyYjczLi4xMTE4Njc1NjllZmQgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BjaC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BjaC5jCkBAIC0xODgsNyArMTg4LDcgQEAgdm9pZCBpbnRlbF9kZXRlY3RfcGNo KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkgKiBVc2UgUENIX05PUCAoUENI IGJ1dCBubyBTb3V0aCBEaXNwbGF5KSBmb3IgUENIIHBsYXRmb3JtcyB3aXRob3V0CiAJICogZGlz cGxheS4KIAkgKi8KLQlpZiAocGNoICYmICFIQVNfRElTUExBWShkZXZfcHJpdikpIHsKKwlpZiAo cGNoICYmICghSEFTX0RJU1BMQVkoZGV2X3ByaXYpIHx8ICFJTlRFTF9ESVNQTEFZX0VOQUJMRUQo ZGV2X3ByaXYpKSkgewogCQlEUk1fREVCVUdfS01TKCJEaXNwbGF5IGRpc2FibGVkLCByZXZlcnRp bmcgdG8gTk9QIFBDSFxuIik7CiAJCWRldl9wcml2LT5wY2hfdHlwZSA9IFBDSF9OT1A7CiAJCWRl dl9wcml2LT5wY2hfaWQgPSAwOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZng=