From: Jani Nikula Subject: [PATCH v2] drm/i915: introduce INTEL_DISPLAY_ENABLED() Date: Fri, 13 Sep 2019 13:04:07 +0300 Message-ID: <20190913100407.30991-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3D0166EF02 for ; Fri, 13 Sep 2019 10:04:15 +0000 (UTC) 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 KCkgYW5kIHVzZSBpdCB3aGVyZQpIQVNfRElTUExBWSgpIGlzIHVzZWQgYWZ0ZXIgaW50ZWxfZGV2 aWNlX2luZm9fcnVudGltZV9pbml0KCkuIFRoaXMgaXMKaW5pdGlhbGx5IGR1cGxpY2F0aW9uLCBh cyBkaXNhYmxpbmcgZGlzcGxheSBzdGlsbCBsZWFkcyB0byAtPnBpcGVfbWFzayA9CjAgYW5kIEhB U19ESVNQTEFZKCkgYmVpbmcgZmFsc2UuCgpOb3RlIHRoYXQgZXZlciBzaW5jZSBpOTE1LmRpc3Bs YXlfZGlzYWJsZSB3YXMgaW50cm9kdWNlZCwgaXQgaGFzIG5vdAphZmZlY3RlZCBQQ0ggZGV0ZWN0 aW9uIGV2ZW4gaWYgaXQgdXNlcyBIQVNfRElTUExBWSgpLCBhcyBkaXNwbGF5IGRpc2FibGUKaGFw cGVucyBhZnRlciB0aGF0LgoKU2luY2UgSU5URUxfRElTUExBWV9FTkFCTEVEKCkgd2lsbCBub3Qg bWFrZSBzZW5zZSB1bmxlc3MgSEFTX0RJU1BMQVkoKQppcyB0cnVlLCBpbmNsdWRlIGEgd2Fybmlu ZyBmb3IgY2F0Y2hpbmcgbWlzdXNlcyBtYWtpbmcgZGVjaXNpb25zIG9uCklOVEVMX0RJU1BMQVlf RU5BQkxFRCgpIHdoZW4gSEFTX0RJU1BMQVkoKSBpcyBmYWxzZS4KCnYyOiBSZW1vdmUgSU5URUxf RElTUExBWV9FTkFCTEVEKCkgY2hlY2sgZnJvbSBpbnRlbF9kZXRlY3RfcGNoKCkgKENocmlzKQoK Q2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogSm9zw6kgUm9i ZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6Qg PHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogSm9zw6kgUm9iZXJ0 byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+CkFja2VkLWJ5OiBWaWxsZSBTeXJqw6Rs w6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5p a3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfYmlvcy5jICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF9kaXNwbGF5LmMgfCA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfZmJkZXYuYyAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRl bF9nbWJ1cy5jICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAg ICAgICAgICB8IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAg ICAgICAgICAgIHwgMyArKysKIDYgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgOSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX2Jpb3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYmlvcy5jCmlu ZGV4IGVmYjM5ZjM1MGIxOS4uMWRlZjU1MGM2OGM4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2Jpb3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX2Jpb3MuYwpAQCAtMTgzMyw3ICsxODMzLDcgQEAgdm9pZCBpbnRlbF9iaW9z X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWNvbnN0IHN0cnVjdCBi ZGJfaGVhZGVyICpiZGI7CiAJdTggX19pb21lbSAqYmlvcyA9IE5VTEw7CiAKLQlpZiAoIUhBU19E SVNQTEFZKGRldl9wcml2KSkgeworCWlmICghSEFTX0RJU1BMQVkoZGV2X3ByaXYpIHx8ICFJTlRF TF9ESVNQTEFZX0VOQUJMRUQoZGV2X3ByaXYpKSB7CiAJCURSTV9ERUJVR19LTVMoIlNraXBwaW5n IFZCVCBpbml0IGR1ZSB0byBkaXNhYmxlZCBkaXNwbGF5LlxuIik7CiAJCXJldHVybjsKIAl9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCmluZGV4IGExOWY4 YzczZjJlMC4uMmMwY2IzMjIzNWMwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTUzNjYsNyArMTUzNjYsNyBAQCBzdGF0aWMgdm9pZCBpbnRl bF9zZXR1cF9vdXRwdXRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCWlu dGVsX3Bwc19pbml0KGRldl9wcml2KTsKIAotCWlmICghSEFTX0RJU1BMQVkoZGV2X3ByaXYpKQor CWlmICghSEFTX0RJU1BMQVkoZGV2X3ByaXYpIHx8ICFJTlRFTF9ESVNQTEFZX0VOQUJMRUQoZGV2 X3ByaXYpKQogCQlyZXR1cm47CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMikgewpA QCAtMTcyNzMsNyArMTcyNzMsNyBAQCBpbnRlbF9kaXNwbGF5X2NhcHR1cmVfZXJyb3Jfc3RhdGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJQlVJTERfQlVHX09OKEFSUkFZ X1NJWkUodHJhbnNjb2RlcnMpICE9IEFSUkFZX1NJWkUoZXJyb3ItPnRyYW5zY29kZXIpKTsKIAot CWlmICghSEFTX0RJU1BMQVkoZGV2X3ByaXYpKQorCWlmICghSEFTX0RJU1BMQVkoZGV2X3ByaXYp IHx8ICFJTlRFTF9ESVNQTEFZX0VOQUJMRUQoZGV2X3ByaXYpKQogCQlyZXR1cm4gTlVMTDsKIAog CWVycm9yID0ga3phbGxvYyhzaXplb2YoKmVycm9yKSwgR0ZQX0FUT01JQyk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiZGV2LmMKaW5kZXggZDU5ZWVlNWM1ZDljLi42ODMz ODY2OWYwNTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf ZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiZGV2LmMK QEAgLTQ0NCw3ICs0NDQsNyBAQCBpbnQgaW50ZWxfZmJkZXZfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXN0cnVjdCBpbnRlbF9mYmRldiAqaWZiZGV2OwogCWludCByZXQ7CiAKLQlpZiAo V0FSTl9PTighSEFTX0RJU1BMQVkoZGV2X3ByaXYpKSkKKwlpZiAoV0FSTl9PTighSEFTX0RJU1BM QVkoZGV2X3ByaXYpIHx8ICFJTlRFTF9ESVNQTEFZX0VOQUJMRUQoZGV2X3ByaXYpKSkKIAkJcmV0 dXJuIC1FTk9ERVY7CiAKIAlpZmJkZXYgPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgaW50ZWxfZmJk ZXYpLCBHRlBfS0VSTkVMKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfZ21idXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZ21i dXMuYwppbmRleCBkNjc3NWEwMDU3MjYuLjNkNGQxOWFjMWQxNCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9nbWJ1cy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfZ21idXMuYwpAQCAtODM2LDcgKzgzNiw3IEBAIGludCBpbnRl bF9nbWJ1c19zZXR1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJdW5zaWdu ZWQgaW50IHBpbjsKIAlpbnQgcmV0OwogCi0JaWYgKCFIQVNfRElTUExBWShkZXZfcHJpdikpCisJ aWYgKCFIQVNfRElTUExBWShkZXZfcHJpdikgfHwgIUlOVEVMX0RJU1BMQVlfRU5BQkxFRChkZXZf cHJpdikpCiAJCXJldHVybiAwOwogCiAJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggMGRmY2I0 MGYzMTYyLi45OTA0Zjc2MmY0YmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMzM4LDcg KzMzOCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfbW9kZXNldF9wcm9iZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCWlmIChpOTE1X2luamVjdF9wcm9iZV9mYWlsdXJlKGRldl9wcml2KSkK IAkJcmV0dXJuIC1FTk9ERVY7CiAKLQlpZiAoSEFTX0RJU1BMQVkoZGV2X3ByaXYpKSB7CisJaWYg KEhBU19ESVNQTEFZKGRldl9wcml2KSAmJiBJTlRFTF9ESVNQTEFZX0VOQUJMRUQoZGV2X3ByaXYp KSB7CiAJCXJldCA9IGRybV92YmxhbmtfaW5pdCgmZGV2X3ByaXYtPmRybSwKIAkJCQkgICAgICBJ TlRFTF9OVU1fUElQRVMoZGV2X3ByaXYpKTsKIAkJaWYgKHJldCkKQEAgLTM4OSw3ICszODksNyBA QCBzdGF0aWMgaW50IGk5MTVfZHJpdmVyX21vZGVzZXRfcHJvYmUoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAogCWludGVsX292ZXJsYXlfc2V0dXAoZGV2X3ByaXYpOwogCi0JaWYgKCFIQVNfRElT UExBWShkZXZfcHJpdikpCisJaWYgKCFIQVNfRElTUExBWShkZXZfcHJpdikgfHwgIUlOVEVMX0RJ U1BMQVlfRU5BQkxFRChkZXZfcHJpdikpCiAJCXJldHVybiAwOwogCiAJcmV0ID0gaW50ZWxfZmJk ZXZfaW5pdChkZXYpOwpAQCAtMTM3OCw3ICsxMzc4LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9kcml2 ZXJfcmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCX0gZWxzZQog CQlEUk1fRVJST1IoIkZhaWxlZCB0byByZWdpc3RlciBkcml2ZXIgZm9yIHVzZXJzcGFjZSBhY2Nl c3MhXG4iKTsKIAotCWlmIChIQVNfRElTUExBWShkZXZfcHJpdikpIHsKKwlpZiAoSEFTX0RJU1BM QVkoZGV2X3ByaXYpICYmIElOVEVMX0RJU1BMQVlfRU5BQkxFRChkZXZfcHJpdikpIHsKIAkJLyog TXVzdCBiZSBkb25lIGFmdGVyIHByb2Jpbmcgb3V0cHV0cyAqLwogCQlpbnRlbF9vcHJlZ2lvbl9y ZWdpc3RlcihkZXZfcHJpdik7CiAJCWFjcGlfdmlkZW9fcmVnaXN0ZXIoKTsKQEAgLTE0MDEsNyAr MTQwMSw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZHJpdmVyX3JlZ2lzdGVyKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkgKiBXZSBuZWVkIHRvIGNvb3JkaW5hdGUgdGhlIGhvdHBs dWdzIHdpdGggdGhlIGFzeW5jaHJvbm91cyBmYmRldgogCSAqIGNvbmZpZ3VyYXRpb24sIGZvciB3 aGljaCB3ZSB1c2UgdGhlIGZiZGV2LT5hc3luY19jb29raWUuCiAJICovCi0JaWYgKEhBU19ESVNQ TEFZKGRldl9wcml2KSkKKwlpZiAoSEFTX0RJU1BMQVkoZGV2X3ByaXYpICYmIElOVEVMX0RJU1BM QVlfRU5BQkxFRChkZXZfcHJpdikpCiAJCWRybV9rbXNfaGVscGVyX3BvbGxfaW5pdChkZXYpOwog CiAJaW50ZWxfcG93ZXJfZG9tYWluc19lbmFibGUoZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKaW5kZXggYmY2MDA4ODhiM2YxLi40ZmFlYzJmOTRlMTkgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaApAQCAtMjE5Miw2ICsyMTkyLDkgQEAgSVNfU1VCUExBVEZPUk0oY29uc3Qgc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAKICNkZWZpbmUgSEFTX0RJU1BMQVkoZGV2X3ByaXYp IChJTlRFTF9JTkZPKGRldl9wcml2KS0+cGlwZV9tYXNrICE9IDApCiAKKy8qIE9ubHkgdmFsaWQg d2hlbiBIQVNfRElTUExBWSgpIGlzIHRydWUgKi8KKyNkZWZpbmUgSU5URUxfRElTUExBWV9FTkFC TEVEKGRldl9wcml2KSAoV0FSTl9PTighSEFTX0RJU1BMQVkoZGV2X3ByaXYpKSwgIWk5MTVfbW9k cGFyYW1zLmRpc2FibGVfZGlzcGxheSkKKwogc3RhdGljIGlubGluZSBib29sIGludGVsX3Z0ZF9h Y3RpdmUodm9pZCkKIHsKICNpZmRlZiBDT05GSUdfSU5URUxfSU9NTVUKLS0gCjIuMjAuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4