From: Jani Nikula Subject: [CI RESEND] drm/i915: add INTEL_NUM_PIPES() and use it Date: Wed, 11 Sep 2019 12:26:08 +0300 Message-ID: <20190911092608.13009-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 43ED36E1EC for ; Wed, 11 Sep 2019 09:25:03 +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 QWJzdHJhY3QgYXdheSBkaXJlY3QgYWNjZXNzIHRvIC0+bnVtX3BpcGVzIHRvIGFsbG93IGZ1cnRo ZXIKcmVmYWN0b3JpbmcuIE5vIGZ1bmN0aW9uYWwgY2hhbmdlcy4KCkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpv c2Uuc291emFAaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpvc2Uu c291emFAaW50ZWwuY29tPgpBY2tlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxh QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3Bs YXkuYyAgIHwgMTIgKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX2Rpc3BsYXkuaCAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9scGVfYXVkaW8uYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j ICAgICAgICAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg ICAgICAgICAgICAgICAgfCAgNCArKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j ICAgICAgICAgICAgICAgIHwgIDYgKysrLS0tCiA2IGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlv bnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9kaXNwbGF5LmMKaW5kZXggM2I1Mjc1YWI2NmNmLi4wYWM1ZjUwN2EwOWEgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCkBAIC03MTkwLDcgKzcx OTAsNyBAQCBzdGF0aWMgaW50IGlyb25sYWtlX2NoZWNrX2ZkaV9sYW5lcyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwKIAkJfQogCX0KIAotCWlmIChJTlRFTF9JTkZPKGRl dl9wcml2KS0+bnVtX3BpcGVzID09IDIpCisJaWYgKElOVEVMX05VTV9QSVBFUyhkZXZfcHJpdikg PT0gMikKIAkJcmV0dXJuIDA7CiAKIAkvKiBJdnlicmlkZ2UgMyBwaXBlIGlzIHJlYWxseSBjb21w bGljYXRlZCAqLwpAQCAtOTU3NCw3ICs5NTc0LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY29t cHV0ZV9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCSAqIGNsZWFyIGlmIGl0JydzIGEg d2luIG9yIGxvc3MgcG93ZXIgd2lzZS4gTm8gcG9pbnQgaW4gZG9pbmcKIAkgKiB0aGlzIG9uIElM SyBhdCBhbGwgc2luY2UgaXQgaGFzIGEgZml4ZWQgRFBMTDwtPnBpcGUgbWFwcGluZy4KIAkgKi8K LQlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9PSAzICYmCisJaWYgKElOVEVM X05VTV9QSVBFUyhkZXZfcHJpdikgPT0gMyAmJgogCSAgICBpbnRlbF9jcnRjX2hhc190eXBlKGNy dGNfc3RhdGUsIElOVEVMX09VVFBVVF9BTkFMT0cpKQogCQlkcGxsIHw9IERQTExfU0RWT19ISUdI X1NQRUVEOwogCkBAIC0xMzg5OSw3ICsxMzg5OSw3IEBAIHN0YXRpYyB2b2lkIHNrbF9jb21taXRf bW9kZXNldF9lbmFibGVzKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlKQogCiAJCQlp ZiAoc2tsX2RkYl9hbGxvY2F0aW9uX292ZXJsYXBzKCZuZXdfY3J0Y19zdGF0ZS0+d20uc2tsLmRk YiwKIAkJCQkJCQllbnRyaWVzLAotCQkJCQkJCUlOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlw ZXMsIGkpKQorCQkJCQkJCUlOVEVMX05VTV9QSVBFUyhkZXZfcHJpdiksIGkpKQogCQkJCWNvbnRp bnVlOwogCiAJCQl1cGRhdGVkIHw9IGNtYXNrOwpAQCAtMTYyNTYsOCArMTYyNTYsOCBAQCBpbnQg aW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJfQogCiAJRFJNX0RF QlVHX0tNUygiJWQgZGlzcGxheSBwaXBlJXMgYXZhaWxhYmxlLlxuIiwKLQkJICAgICAgSU5URUxf SU5GTyhkZXZfcHJpdiktPm51bV9waXBlcywKLQkJICAgICAgSU5URUxfSU5GTyhkZXZfcHJpdikt Pm51bV9waXBlcyA+IDEgPyAicyIgOiAiIik7CisJCSAgICAgIElOVEVMX05VTV9QSVBFUyhkZXZf cHJpdiksCisJCSAgICAgIElOVEVMX05VTV9QSVBFUyhkZXZfcHJpdikgPiAxID8gInMiIDogIiIp OwogCiAJZm9yX2VhY2hfcGlwZShkZXZfcHJpdiwgcGlwZSkgewogCQlyZXQgPSBpbnRlbF9jcnRj X2luaXQoZGV2X3ByaXYsIHBpcGUpOwpAQCAtMTczNDgsNyArMTczNDgsNyBAQCBpbnRlbF9kaXNw bGF5X3ByaW50X2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0s CiAJaWYgKCFlcnJvcikKIAkJcmV0dXJuOwogCi0JZXJyX3ByaW50ZihtLCAiTnVtIFBpcGVzOiAl ZFxuIiwgSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyk7CisJZXJyX3ByaW50ZihtLCAi TnVtIFBpcGVzOiAlZFxuIiwgSU5URUxfTlVNX1BJUEVTKGRldl9wcml2KSk7CiAJaWYgKElTX0hB U1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCWVycl9wcmludGYo bSwgIlBXUl9XRUxMX0NUTDI6ICUwOHhcbiIsCiAJCQkgICBlcnJvci0+cG93ZXJfd2VsbF9kcml2 ZXIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNw bGF5LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuaAppbmRl eCAzM2ZkNTIzYzQ2MjIuLmY0ZGRkZTE3MTY1NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9kaXNwbGF5LmgKQEAgLTMwNywxMCArMzA3LDEwIEBAIGVudW0gcGh5X2Zp YSB7CiB9OwogCiAjZGVmaW5lIGZvcl9lYWNoX3BpcGUoX19kZXZfcHJpdiwgX19wKSBcCi0JZm9y ICgoX19wKSA9IDA7IChfX3ApIDwgSU5URUxfSU5GTyhfX2Rldl9wcml2KS0+bnVtX3BpcGVzOyAo X19wKSsrKQorCWZvciAoKF9fcCkgPSAwOyAoX19wKSA8IElOVEVMX05VTV9QSVBFUyhfX2Rldl9w cml2KTsgKF9fcCkrKykKIAogI2RlZmluZSBmb3JfZWFjaF9waXBlX21hc2tlZChfX2Rldl9wcml2 LCBfX3AsIF9fbWFzaykgXAotCWZvciAoKF9fcCkgPSAwOyAoX19wKSA8IElOVEVMX0lORk8oX19k ZXZfcHJpdiktPm51bV9waXBlczsgKF9fcCkrKykgXAorCWZvciAoKF9fcCkgPSAwOyAoX19wKSA8 IElOVEVMX05VTV9QSVBFUyhfX2Rldl9wcml2KTsgKF9fcCkrKykgXAogCQlmb3JfZWFjaF9pZigo X19tYXNrKSAmIEJJVChfX3ApKQogCiAjZGVmaW5lIGZvcl9lYWNoX2NwdV90cmFuc2NvZGVyX21h c2tlZChfX2Rldl9wcml2LCBfX3QsIF9fbWFzaykgXApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9scGVfYXVkaW8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfbHBlX2F1ZGlvLmMKaW5kZXggYjE5ODAwYjU4NDQyLi4wYjY3Zjc4ODdj ZDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfbHBlX2F1 ZGlvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9scGVfYXVkaW8u YwpAQCAtMTE0LDcgKzExNCw3IEBAIGxwZV9hdWRpb19wbGF0ZGV2X2NyZWF0ZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcGluZm8uc2l6ZV9kYXRhID0gc2l6ZW9mKCpwZGF0 YSk7CiAJcGluZm8uZG1hX21hc2sgPSBETUFfQklUX01BU0soMzIpOwogCi0JcGRhdGEtPm51bV9w aXBlcyA9IElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXM7CisJcGRhdGEtPm51bV9waXBl cyA9IElOVEVMX05VTV9QSVBFUyhkZXZfcHJpdik7CiAJcGRhdGEtPm51bV9wb3J0cyA9IElTX0NI RVJSWVZJRVcoZGV2X3ByaXYpID8gMyA6IDI7IC8qIEIsQyxEIG9yIEIsQyAqLwogCXBkYXRhLT5w b3J0WzBdLnBpcGUgPSAtMTsKIAlwZGF0YS0+cG9ydFsxXS5waXBlID0gLTE7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYwppbmRleCBiMWE5NDJmYzQzYzguLjBkZmNiNDBmMzE2MiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5jCkBAIC0zNDAsNyArMzQwLDcgQEAgc3RhdGljIGludCBpOTE1X2RyaXZlcl9t b2Rlc2V0X3Byb2JlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpZiAoSEFTX0RJU1BMQVko ZGV2X3ByaXYpKSB7CiAJCXJldCA9IGRybV92YmxhbmtfaW5pdCgmZGV2X3ByaXYtPmRybSwKLQkJ CQkgICAgICBJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzKTsKKwkJCQkgICAgICBJTlRF TF9OVU1fUElQRVMoZGV2X3ByaXYpKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gb3V0OwogCX0KZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDUxZDU3NWNjYTJhYy4uYjMyM2FlOTFiN2I1IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIxODYsNyArMjE4Niw5IEBAIElTX1NVQlBMQVRGT1JN KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAogI2RlZmluZSBHVF9GUkVRVUVO Q1lfTVVMVElQTElFUiA1MAogI2RlZmluZSBHRU45X0ZSRVFfU0NBTEVSIDMKIAotI2RlZmluZSBI QVNfRElTUExBWShkZXZfcHJpdikgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgPiAw KQorI2RlZmluZSBJTlRFTF9OVU1fUElQRVMoZGV2X3ByaXYpIChJTlRFTF9JTkZPKGRldl9wcml2 KS0+bnVtX3BpcGVzKQorCisjZGVmaW5lIEhBU19ESVNQTEFZKGRldl9wcml2KSAoSU5URUxfTlVN X1BJUEVTKGRldl9wcml2KSA+IDApCiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBpbnRlbF92dGRfYWN0 aXZlKHZvaWQpCiB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA1NGE4Yjc3MDViYzYuLmQw Y2ViMjcyNTUxZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0xOTA5LDcgKzE5MDksNyBA QCBzdGF0aWMgaW50IHZsdl9jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpCiAKIAlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPCB3bV9zdGF0ZS0+bnVtX2xl dmVsczsgbGV2ZWwrKykgewogCQljb25zdCBzdHJ1Y3QgZzR4X3BpcGVfd20gKnJhdyA9ICZjcnRj X3N0YXRlLT53bS52bHYucmF3W2xldmVsXTsKLQkJY29uc3QgaW50IHNyX2ZpZm9fc2l6ZSA9IElO VEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgKiA1MTIgLSAxOworCQljb25zdCBpbnQgc3Jf Zmlmb19zaXplID0gSU5URUxfTlVNX1BJUEVTKGRldl9wcml2KSAqIDUxMiAtIDE7CiAKIAkJaWYg KCF2bHZfcmF3X2NydGNfd21faXNfdmFsaWQoY3J0Y19zdGF0ZSwgbGV2ZWwpKQogCQkJYnJlYWs7 CkBAIC0yNjQ4LDcgKzI2NDgsNyBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGlsa19wbGFuZV93bV9t YXgoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJLyogSFNXIGFs bG93cyBMUDErIHdhdGVybWFya3MgZXZlbiB3aXRoIG11bHRpcGxlIHBpcGVzICovCiAJaWYgKGxl dmVsID09IDAgfHwgY29uZmlnLT5udW1fcGlwZXNfYWN0aXZlID4gMSkgewotCQlmaWZvX3NpemUg Lz0gSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlczsKKwkJZmlmb19zaXplIC89IElOVEVM X05VTV9QSVBFUyhkZXZfcHJpdik7CiAKIAkJLyoKIAkJICogRm9yIHNvbWUgcmVhc29uIHRoZSBu b24gc2VsZiByZWZyZXNoCkBAIC05NzMzLDcgKzk3MzMsNyBAQCB2b2lkIGludGVsX2luaXRfcG0o c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlkZXZfcHJpdi0+ZGlzcGxheS51 cGRhdGVfd20gPSBpOXh4X3VwZGF0ZV93bTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2ZpZm9f c2l6ZSA9IGk5eHhfZ2V0X2ZpZm9fc2l6ZTsKIAl9IGVsc2UgaWYgKElTX0dFTihkZXZfcHJpdiwg MikpIHsKLQkJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgPT0gMSkgeworCQlp ZiAoSU5URUxfTlVNX1BJUEVTKGRldl9wcml2KSA9PSAxKSB7CiAJCQlkZXZfcHJpdi0+ZGlzcGxh eS51cGRhdGVfd20gPSBpODQ1X3VwZGF0ZV93bTsKIAkJCWRldl9wcml2LT5kaXNwbGF5LmdldF9m aWZvX3NpemUgPSBpODQ1X2dldF9maWZvX3NpemU7CiAJCX0gZWxzZSB7Ci0tIAoyLjIwLjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==