From: Jani Nikula Subject: [RESEND] drm/i915: stop conflating HAS_DISPLAY() and disabled display Date: Mon, 16 Sep 2019 12:29:01 +0300 Message-ID: <20190916092901.31440-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F5936E209 for ; Mon, 16 Sep 2019 09:29:09 +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 U3RvcCBzZXR0aW5nIC0+cGlwZV9tYXNrIHRvIHplcm8gd2hlbiBkaXNwbGF5IGlzIGRpc2FibGVk LCBhbGxvd2luZyB1cwp0byBoYXZlIGRpZmZlcmVudCBjb2RlIHBhdGhzIGZvciBub3QgYWN0dWFs bHkgaGF2aW5nIGRpc3BsYXkgaGFyZHdhcmUsCmFuZCBoYXZpbmcgZGlzcGxheSBoYXJkd2FyZSBk aXNhYmxlZC4gVGhpcyBsZXRzIHVzIGRldmVsb3AgdGhvc2UgdHdvCmF2ZW51ZXMgaW5kZXBlbmRl bnRseS4KClRoZXJlIGFyZSBubyBmdW5jdGlvbmFsIGNoYW5nZXMgZm9yIHdoZW4gdGhlcmUgaXMg bm8gZGlzcGxheS4gSG93ZXZlciwKYWxsIHVzZXMgb2YgZm9yX2VhY2hfcGlwZSgpIGFuZCBmb3Jf ZWFjaF9waXBlX21hc2tlZCgpIHdpbGwgc3RhcnQKcnVubmluZyBmb3IgdGhlIGRpc2FibGVkIGRp c3BsYXkgY2FzZS4gUHV0IG9uZSBvZiB0aGUgbW9yZSBzaWduaWZpY2FudApvbmVzIGJlaGluZCBj aGVja3MgZm9yIElOVEVMX0RJU1BMQVlfRU5BQkxFRCgpLCBvdGhlcndpc2UgdGhlIGNhc2VzCnNo b3VsZCBub3QgYmUgaGl0IHdpdGggZGlzYWJsZWQgZGlzcGxheSwgb3IgdGhleSBzZWVtIGJlbmln bi4gRmluZ2Vycwpjcm9zc2VkLgoKQWxsIGluIGFsbCwgdGhpcyBtaWdodCBub3QgYmUgdGhlIGlk ZWFsIHNvbHV0aW9uLiBJbiBmYWN0IHdlIG1heSBoYXZlCmhhZCBzb21ldGhpbmcgYWxvbmcgdGhl IGxpbmVzIG9mIHRoaXMgaW4gdGhlIHBhc3QsIGJ1dCB3ZSBlbmRlZCB1cApjb25mbGF0aW5nIHRo ZSB0d28gY2FzZXMuIFBvc3NpYmx5IGV2ZW4gYnkgcmVjb21tZW5kYXRpb24gYnkgeW91cnMKdHJ1 bHk7IEkgZGlkIG5vdCBkYXJlIGRpZyB1cCB0aGF0IHBhcnQgb2YgdGhlIGhpc3RvcnkuIEJ1dCB0 aGUgcGVyZmVjdAppcyB0aGUgZW5lbXkgb2YgdGhlIGdvb2QsIHRoaXMgaXMgYSBzdHJhaWdodGZv cndhcmQgY2hhbmdlLCBhbmQgbGV0cyB1cwpnZXQgYWN0dWFsIHdvcmsgZG9uZSBpbiBib3RoIGZy b250cyB3aXRob3V0IGludGVyZmVyaW5nIHdpdGggZWFjaCBvdGhlci4KCkNjOiBDaHJpcyBXaWxz b24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IEpvc8OpIFJvYmVydG8gZGUgU291emEg PGpvc2Uuc291emFAaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxh QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3Bs YXkuYyB8IDEyICsrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNl X2luZm8uYyAgICAgfCAgOCArKy0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMo KyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggZTc1OTQ1YTUzZTA2Li5hYzI0Zjk2NTgyY2EgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCkBAIC0xNjI4MSwxMSArMTYy ODEsMTMgQEAgaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CQkgICAgICBJTlRFTF9OVU1fUElQRVMoZGV2X3ByaXYpLAogCQkgICAgICBJTlRFTF9OVU1fUElQ RVMoZGV2X3ByaXYpID4gMSA/ICJzIiA6ICIiKTsKIAotCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYs IHBpcGUpIHsKLQkJcmV0ID0gaW50ZWxfY3J0Y19pbml0KGRldl9wcml2LCBwaXBlKTsKLQkJaWYg KHJldCkgewotCQkJZHJtX21vZGVfY29uZmlnX2NsZWFudXAoZGV2KTsKLQkJCXJldHVybiByZXQ7 CisJaWYgKEhBU19ESVNQTEFZKGRldl9wcml2KSAmJiBJTlRFTF9ESVNQTEFZX0VOQUJMRUQoZGV2 X3ByaXYpKSB7CisJCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpIHsKKwkJCXJldCA9IGlu dGVsX2NydGNfaW5pdChkZXZfcHJpdiwgcGlwZSk7CisJCQlpZiAocmV0KSB7CisJCQkJZHJtX21v ZGVfY29uZmlnX2NsZWFudXAoZGV2KTsKKwkJCQlyZXR1cm4gcmV0OworCQkJfQogCQl9CiAJfQog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uYwppbmRleCA3MjcwODlkY2Qy ODAuLjcyOGM4ODE3MThhMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGV2aWNlX2luZm8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5m by5jCkBAIC04OTQsMTIgKzg5NCw4IEBAIHZvaWQgaW50ZWxfZGV2aWNlX2luZm9fcnVudGltZV9p bml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJCXJ1bnRpbWUtPm51bV9z cHJpdGVzW3BpcGVdID0gMTsKIAl9CiAKLQlpZiAoaTkxNV9tb2RwYXJhbXMuZGlzYWJsZV9kaXNw bGF5KSB7Ci0JCURSTV9JTkZPKCJEaXNwbGF5IGRpc2FibGVkIChtb2R1bGUgcGFyYW1ldGVyKVxu Iik7Ci0JCWluZm8tPnBpcGVfbWFzayA9IDA7Ci0JfSBlbHNlIGlmIChIQVNfRElTUExBWShkZXZf cHJpdikgJiYKLQkJICAgKElTX0dFTl9SQU5HRShkZXZfcHJpdiwgNywgOCkpICYmCi0JCSAgIEhB U19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CisJaWYgKEhBU19ESVNQTEFZKGRldl9wcml2KSAmJiBJ U19HRU5fUkFOR0UoZGV2X3ByaXYsIDcsIDgpICYmCisJICAgIEhBU19QQ0hfU1BMSVQoZGV2X3By aXYpKSB7CiAJCXUzMiBmdXNlX3N0cmFwID0gSTkxNV9SRUFEKEZVU0VfU1RSQVApOwogCQl1MzIg c2Z1c2Vfc3RyYXAgPSBJOTE1X1JFQUQoU0ZVU0VfU1RSQVApOwogCi0tIAoyLjIwLjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==