From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v2 1/2] drm/i915: Add HAS_DISPLAY() and use it Date: Mon, 26 Nov 2018 16:07:58 -0800 Message-ID: <20181127000759.14738-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2D74289BD5 for ; Tue, 27 Nov 2018 00:08:06 +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 List-Id: intel-gfx@lists.freedesktop.org UmlnaHQgbm93IGl0IGlzIGRlY2lkZWQgaWYgR0VOIGhhcyBkaXNwbGF5IGJ5IGNoZWNraW5nIHRo ZSBudW1fcGlwZXMsCnNvIGxldHMgbWFrZSBpdCBleHBsaWNpdCBhbmQgdXNlIGEgbWFjcm8uCgpD YzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEx1Y2Fz IERlIE1hcmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKb3PD qSBSb2JlcnRvIGRlIFNvdXphIDxqb3NlLnNvdXphQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgICAgIHwgMTAgKysrKystLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9iaW9zLmMgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RldmljZV9pbmZvLmMgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYu YyAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYyAgICAgICAg IHwgIDIgKy0KIDcgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggYjFkMjNjNzNjMTQ3Li41ZTJkOTFmNGRk MmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMjg3LDcgKzI4Nyw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX2RldGVjdF9wY2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CSAqIFVzZSBQQ0hfTk9QIChQQ0ggYnV0IG5vIFNvdXRoIERpc3BsYXkpIGZvciBQQ0ggcGxhdGZv cm1zIHdpdGhvdXQKIAkgKiBkaXNwbGF5LgogCSAqLwotCWlmIChwY2ggJiYgSU5URUxfSU5GTyhk ZXZfcHJpdiktPm51bV9waXBlcyA9PSAwKSB7CisJaWYgKHBjaCAmJiAhSEFTX0RJU1BMQVkoZGV2 X3ByaXYpKSB7CiAJCURSTV9ERUJVR19LTVMoIkRpc3BsYXkgZGlzYWJsZWQsIHJldmVydGluZyB0 byBOT1AgUENIXG4iKTsKIAkJZGV2X3ByaXYtPnBjaF90eXBlID0gUENIX05PUDsKIAkJZGV2X3By aXYtPnBjaF9pZCA9IDA7CkBAIC02NDUsNyArNjQ1LDcgQEAgc3RhdGljIGludCBpOTE1X2xvYWRf bW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKGk5MTVfaW5qZWN0X2xv YWRfZmFpbHVyZSgpKQogCQlyZXR1cm4gLUVOT0RFVjsKIAotCWlmIChJTlRFTF9JTkZPKGRldl9w cml2KS0+bnVtX3BpcGVzKSB7CisJaWYgKEhBU19ESVNQTEFZKGRldl9wcml2KSkgewogCQlyZXQg PSBkcm1fdmJsYW5rX2luaXQoJmRldl9wcml2LT5kcm0sCiAJCQkJICAgICAgSU5URUxfSU5GTyhk ZXZfcHJpdiktPm51bV9waXBlcyk7CiAJCWlmIChyZXQpCkBAIC02OTYsNyArNjk2LDcgQEAgc3Rh dGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAK IAlpbnRlbF9vdmVybGF5X3NldHVwKGRldl9wcml2KTsKIAotCWlmIChJTlRFTF9JTkZPKGRldl9w cml2KS0+bnVtX3BpcGVzID09IDApCisJaWYgKCFIQVNfRElTUExBWShkZXZfcHJpdikpCiAJCXJl dHVybiAwOwogCiAJcmV0ID0gaW50ZWxfZmJkZXZfaW5pdChkZXYpOwpAQCAtMTU1MSw3ICsxNTUx LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9kcml2ZXJfcmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCX0gZWxzZQogCQlEUk1fRVJST1IoIkZhaWxlZCB0byByZWdpc3Rl ciBkcml2ZXIgZm9yIHVzZXJzcGFjZSBhY2Nlc3MhXG4iKTsKIAotCWlmIChJTlRFTF9JTkZPKGRl dl9wcml2KS0+bnVtX3BpcGVzKSB7CisJaWYgKEhBU19ESVNQTEFZKGRldl9wcml2KSkgewogCQkv KiBNdXN0IGJlIGRvbmUgYWZ0ZXIgcHJvYmluZyBvdXRwdXRzICovCiAJCWludGVsX29wcmVnaW9u X3JlZ2lzdGVyKGRldl9wcml2KTsKIAkJYWNwaV92aWRlb19yZWdpc3RlcigpOwpAQCAtMTU3NSw3 ICsxNTc1LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9kcml2ZXJfcmVnaXN0ZXIoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCSAqIFdlIG5lZWQgdG8gY29vcmRpbmF0ZSB0aGUgaG90 cGx1Z3Mgd2l0aCB0aGUgYXN5bmNocm9ub3VzIGZiZGV2CiAJICogY29uZmlndXJhdGlvbiwgZm9y IHdoaWNoIHdlIHVzZSB0aGUgZmJkZXYtPmFzeW5jX2Nvb2tpZS4KIAkgKi8KLQlpZiAoSU5URUxf SU5GTyhkZXZfcHJpdiktPm51bV9waXBlcykKKwlpZiAoSEFTX0RJU1BMQVkoZGV2X3ByaXYpKQog CQlkcm1fa21zX2hlbHBlcl9wb2xsX2luaXQoZGV2KTsKIAogCWludGVsX3Bvd2VyX2RvbWFpbnNf ZW5hYmxlKGRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGY3NjNiMzBmOThk OS4uZDc4NWRkY2ExOTJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI1NzAsNiArMjU3 MCw4IEBAIGludGVsX2luZm8oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogI2RlZmluZSBHVF9GUkVRVUVOQ1lfTVVMVElQTElFUiA1MAogI2RlZmluZSBHRU45X0ZSRVFf U0NBTEVSIDMKIAorI2RlZmluZSBIQVNfRElTUExBWShkZXZfcHJpdikgKElOVEVMX0lORk8oZGV2 X3ByaXYpLT5udW1fcGlwZXMgPiAwKQorCiAjaW5jbHVkZSAiaTkxNV90cmFjZS5oIgogCiBzdGF0 aWMgaW5saW5lIGJvb2wgaW50ZWxfdnRkX2FjdGl2ZSh2b2lkKQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Ymlvcy5jCmluZGV4IDA2OTRhYThiYjliYy4uNmQzZTAyNjBkNDljIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9iaW9zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfYmlvcy5jCkBAIC0xNzUyLDcgKzE3NTIsNyBAQCB2b2lkIGludGVsX2Jpb3NfaW5pdChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJY29uc3Qgc3RydWN0IGJkYl9oZWFk ZXIgKmJkYjsKIAl1OCBfX2lvbWVtICpiaW9zID0gTlVMTDsKIAotCWlmIChJTlRFTF9JTkZPKGRl dl9wcml2KS0+bnVtX3BpcGVzID09IDApIHsKKwlpZiAoIUhBU19ESVNQTEFZKGRldl9wcml2KSkg ewogCQlEUk1fREVCVUdfS01TKCJTa2lwcGluZyBWQlQgaW5pdCBkdWUgdG8gZGlzYWJsZWQgZGlz cGxheS5cbiIpOwogCQlyZXR1cm47CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGV2aWNlX2luZm8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rldmlj ZV9pbmZvLmMKaW5kZXggY2VlY2I1YmQ1MjI2Li42NzcwMDJhOWU4OTMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uYwpAQCAtNzgyLDcgKzc4Miw3IEBAIHZvaWQgaW50 ZWxfZGV2aWNlX2luZm9fcnVudGltZV9pbml0KHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyAqaW5m bykKIAlpZiAoaTkxNV9tb2RwYXJhbXMuZGlzYWJsZV9kaXNwbGF5KSB7CiAJCURSTV9JTkZPKCJE aXNwbGF5IGRpc2FibGVkIChtb2R1bGUgcGFyYW1ldGVyKVxuIik7CiAJCWluZm8tPm51bV9waXBl cyA9IDA7Ci0JfSBlbHNlIGlmIChpbmZvLT5udW1fcGlwZXMgPiAwICYmCisJfSBlbHNlIGlmIChI QVNfRElTUExBWShkZXZfcHJpdikgJiYKIAkJICAgKElTX0dFTjcoZGV2X3ByaXYpIHx8IElTX0dF TjgoZGV2X3ByaXYpKSAmJgogCQkgICBIQVNfUENIX1NQTElUKGRldl9wcml2KSkgewogCQl1MzIg ZnVzZV9zdHJhcCA9IEk5MTVfUkVBRChGVVNFX1NUUkFQKTsKQEAgLTgwNyw3ICs4MDcsNyBAQCB2 b2lkIGludGVsX2RldmljZV9pbmZvX3J1bnRpbWVfaW5pdChzdHJ1Y3QgaW50ZWxfZGV2aWNlX2lu Zm8gKmluZm8pCiAJCQlEUk1fSU5GTygiUGlwZUMgZnVzZWQgb2ZmXG4iKTsKIAkJCWluZm8tPm51 bV9waXBlcyAtPSAxOwogCQl9Ci0JfSBlbHNlIGlmIChpbmZvLT5udW1fcGlwZXMgPiAwICYmIElT X0dFTjkoZGV2X3ByaXYpKSB7CisJfSBlbHNlIGlmIChIQVNfRElTUExBWShkZXZfcHJpdikgJiYg SVNfR0VOOShkZXZfcHJpdikpIHsKIAkJdTMyIGRmc20gPSBJOTE1X1JFQUQoU0tMX0RGU00pOwog CQl1OCBkaXNhYmxlZF9tYXNrID0gMDsKIAkJYm9vbCBpbnZhbGlkOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IGU5ZjRlMjJiMmE0ZS4uNmE4YmVkNWJhYTg3IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xNDE4Niw3ICsxNDE4Niw3IEBAIHN0YXRp YyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCiAJaW50ZWxfcHBzX2luaXQoZGV2X3ByaXYpOwogCi0JaWYgKElOVEVMX0lORk8oZGV2 X3ByaXYpLT5udW1fcGlwZXMgPT0gMCkKKwlpZiAoIUhBU19ESVNQTEFZKGRldl9wcml2KSkKIAkJ cmV0dXJuOwogCiAJLyoKQEAgLTE1OTc3LDcgKzE1OTc3LDcgQEAgaW50ZWxfZGlzcGxheV9jYXB0 dXJlX2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAl9Owog CWludCBpOwogCi0JaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgPT0gMCkKKwlp ZiAoIUhBU19ESVNQTEFZKGRldl9wcml2KSkKIAkJcmV0dXJuIE5VTEw7CiAKIAllcnJvciA9IGt6 YWxsb2Moc2l6ZW9mKCplcnJvciksIEdGUF9BVE9NSUMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Zi ZGV2LmMKaW5kZXggMjQ4MGM3ZDZlZGVlLi5mYjViYjViMzJhNjAgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZmJkZXYuYwpAQCAtNjcyLDcgKzY3Miw3IEBAIGludCBpbnRlbF9mYmRldl9pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGludGVsX2ZiZGV2ICppZmJkZXY7CiAJaW50 IHJldDsKIAotCWlmIChXQVJOX09OKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgPT0g MCkpCisJaWYgKFdBUk5fT04oIUhBU19ESVNQTEFZKGRldl9wcml2KSkpCiAJCXJldHVybiAtRU5P REVWOwogCiAJaWZiZGV2ID0ga3phbGxvYyhzaXplb2Yoc3RydWN0IGludGVsX2ZiZGV2KSwgR0ZQ X0tFUk5FTCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCmluZGV4IDMzZDg3YWI5M2ZkZC4uODAy ZDAzOTRjY2M0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYwpAQCAtODE3LDcgKzgxNyw3IEBA IGludCBpbnRlbF9zZXR1cF9nbWJ1cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJdW5zaWduZWQgaW50IHBpbjsKIAlpbnQgcmV0OwogCi0JaWYgKElOVEVMX0lORk8oZGV2X3By aXYpLT5udW1fcGlwZXMgPT0gMCkKKwlpZiAoIUhBU19ESVNQTEFZKGRldl9wcml2KSkKIAkJcmV0 dXJuIDA7CiAKIAlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhk ZXZfcHJpdikpCi0tIAoyLjE5LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=