From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [CI RESEND] drm/i915: add INTEL_NUM_PIPES() and use it Date: Wed, 11 Sep 2019 22:57:59 +0300 Message-ID: <87ftl2vc54.fsf@intel.com> References: <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 mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id D58656E02C for ; Wed, 11 Sep 2019 19:56:50 +0000 (UTC) In-Reply-To: <20190911092608.13009-1-jani.nikula@intel.com> 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 List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCAxMSBTZXAgMjAxOSwgSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4g d3JvdGU6Cj4gQWJzdHJhY3QgYXdheSBkaXJlY3QgYWNjZXNzIHRvIC0+bnVtX3BpcGVzIHRvIGFs bG93IGZ1cnRoZXIKPiByZWZhY3RvcmluZy4gTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgo+Cj4gQ2M6 IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+IENjOiBKb3PDqSBSb2Jl cnRvIGRlIFNvdXphIDxqb3NlLnNvdXphQGludGVsLmNvbT4KPiBDYzogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiBSZXZpZXdlZC1ieTogSm9zw6kgUm9i ZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+Cj4gQWNrZWQtYnk6IFZpbGxlIFN5 cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gU2lnbmVkLW9mZi1ieTog SmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KClB1c2hlZCwgdGhhbmtzIGZvciB0 aGUgcmV2aWV3LCBub3cgb24gdG8gdGhlIG5leHQgcGF0Y2guLi4KCkJSLApKYW5pLgoKCj4gLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jICAgfCAxMiAr KysrKystLS0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5 LmggICB8ICA0ICsrLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9scGVf YXVkaW8uYyB8ICAyICstCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAg ICAgICAgICAgfCAgMiArLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAg ICAgICAgICAgIHwgIDQgKysrLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAg ICAgICAgICAgICAgIHwgIDYgKysrLS0tCj4gIDYgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9u cygrKSwgMTQgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXkuYwo+IGluZGV4IDNiNTI3NWFiNjZjZi4uMGFjNWY1MDdhMDlhIDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAt NzE5MCw3ICs3MTkwLDcgQEAgc3RhdGljIGludCBpcm9ubGFrZV9jaGVja19mZGlfbGFuZXMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUsCj4gIAkJfQo+ICAJfQo+ICAKPiAt CWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID09IDIpCj4gKwlpZiAoSU5URUxf TlVNX1BJUEVTKGRldl9wcml2KSA9PSAyKQo+ICAJCXJldHVybiAwOwo+ICAKPiAgCS8qIEl2eWJy aWRnZSAzIHBpcGUgaXMgcmVhbGx5IGNvbXBsaWNhdGVkICovCj4gQEAgLTk1NzQsNyArOTU3NCw3 IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2NvbXB1dGVfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YywKPiAgCSAqIGNsZWFyIGlmIGl0JydzIGEgd2luIG9yIGxvc3MgcG93ZXIgd2lzZS4gTm8g cG9pbnQgaW4gZG9pbmcKPiAgCSAqIHRoaXMgb24gSUxLIGF0IGFsbCBzaW5jZSBpdCBoYXMgYSBm aXhlZCBEUExMPC0+cGlwZSBtYXBwaW5nLgo+ICAJICovCj4gLQlpZiAoSU5URUxfSU5GTyhkZXZf cHJpdiktPm51bV9waXBlcyA9PSAzICYmCj4gKwlpZiAoSU5URUxfTlVNX1BJUEVTKGRldl9wcml2 KSA9PSAzICYmCj4gIAkgICAgaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9P VVRQVVRfQU5BTE9HKSkKPiAgCQlkcGxsIHw9IERQTExfU0RWT19ISUdIX1NQRUVEOwo+ICAKPiBA QCAtMTM4OTksNyArMTM4OTksNyBAQCBzdGF0aWMgdm9pZCBza2xfY29tbWl0X21vZGVzZXRfZW5h YmxlcyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKPiAgCj4gIAkJCWlmIChza2xf ZGRiX2FsbG9jYXRpb25fb3ZlcmxhcHMoJm5ld19jcnRjX3N0YXRlLT53bS5za2wuZGRiLAo+ICAJ CQkJCQkJZW50cmllcywKPiAtCQkJCQkJCUlOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMs IGkpKQo+ICsJCQkJCQkJSU5URUxfTlVNX1BJUEVTKGRldl9wcml2KSwgaSkpCj4gIAkJCQljb250 aW51ZTsKPiAgCj4gIAkJCXVwZGF0ZWQgfD0gY21hc2s7Cj4gQEAgLTE2MjU2LDggKzE2MjU2LDgg QEAgaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJfQo+ ICAKPiAgCURSTV9ERUJVR19LTVMoIiVkIGRpc3BsYXkgcGlwZSVzIGF2YWlsYWJsZS5cbiIsCj4g LQkJICAgICAgSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcywKPiAtCQkgICAgICBJTlRF TF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID4gMSA/ICJzIiA6ICIiKTsKPiArCQkgICAgICBJ TlRFTF9OVU1fUElQRVMoZGV2X3ByaXYpLAo+ICsJCSAgICAgIElOVEVMX05VTV9QSVBFUyhkZXZf cHJpdikgPiAxID8gInMiIDogIiIpOwo+ICAKPiAgCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBp cGUpIHsKPiAgCQlyZXQgPSBpbnRlbF9jcnRjX2luaXQoZGV2X3ByaXYsIHBpcGUpOwo+IEBAIC0x NzM0OCw3ICsxNzM0OCw3IEBAIGludGVsX2Rpc3BsYXlfcHJpbnRfZXJyb3Jfc3RhdGUoc3RydWN0 IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKPiAgCWlmICghZXJyb3IpCj4gIAkJcmV0dXJu Owo+ICAKPiAtCWVycl9wcmludGYobSwgIk51bSBQaXBlczogJWRcbiIsIElOVEVMX0lORk8oZGV2 X3ByaXYpLT5udW1fcGlwZXMpOwo+ICsJZXJyX3ByaW50ZihtLCAiTnVtIFBpcGVzOiAlZFxuIiwg SU5URUxfTlVNX1BJUEVTKGRldl9wcml2KSk7Cj4gIAlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikg fHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKPiAgCQllcnJfcHJpbnRmKG0sICJQV1JfV0VMTF9D VEwyOiAlMDh4XG4iLAo+ICAJCQkgICBlcnJvci0+cG93ZXJfd2VsbF9kcml2ZXIpOwo+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5oCj4gaW5kZXggMzNmZDUy M2M0NjIyLi5mNGRkZGUxNzE2NTUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9kaXNwbGF5LmgKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNw bGF5L2ludGVsX2Rpc3BsYXkuaAo+IEBAIC0zMDcsMTAgKzMwNywxMCBAQCBlbnVtIHBoeV9maWEg ewo+ICB9Owo+ICAKPiAgI2RlZmluZSBmb3JfZWFjaF9waXBlKF9fZGV2X3ByaXYsIF9fcCkgXAo+ IC0JZm9yICgoX19wKSA9IDA7IChfX3ApIDwgSU5URUxfSU5GTyhfX2Rldl9wcml2KS0+bnVtX3Bp cGVzOyAoX19wKSsrKQo+ICsJZm9yICgoX19wKSA9IDA7IChfX3ApIDwgSU5URUxfTlVNX1BJUEVT KF9fZGV2X3ByaXYpOyAoX19wKSsrKQo+ICAKPiAgI2RlZmluZSBmb3JfZWFjaF9waXBlX21hc2tl ZChfX2Rldl9wcml2LCBfX3AsIF9fbWFzaykgXAo+IC0JZm9yICgoX19wKSA9IDA7IChfX3ApIDwg SU5URUxfSU5GTyhfX2Rldl9wcml2KS0+bnVtX3BpcGVzOyAoX19wKSsrKSBcCj4gKwlmb3IgKChf X3ApID0gMDsgKF9fcCkgPCBJTlRFTF9OVU1fUElQRVMoX19kZXZfcHJpdik7IChfX3ApKyspIFwK PiAgCQlmb3JfZWFjaF9pZigoX19tYXNrKSAmIEJJVChfX3ApKQo+ICAKPiAgI2RlZmluZSBmb3Jf ZWFjaF9jcHVfdHJhbnNjb2Rlcl9tYXNrZWQoX19kZXZfcHJpdiwgX190LCBfX21hc2spIFwKPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9scGVfYXVkaW8u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfbHBlX2F1ZGlvLmMKPiBpbmRl eCBiMTk4MDBiNTg0NDIuLjBiNjdmNzg4N2NkMCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2xwZV9hdWRpby5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvZGlzcGxheS9pbnRlbF9scGVfYXVkaW8uYwo+IEBAIC0xMTQsNyArMTE0LDcgQEAgbHBl X2F1ZGlvX3BsYXRkZXZfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK PiAgCXBpbmZvLnNpemVfZGF0YSA9IHNpemVvZigqcGRhdGEpOwo+ICAJcGluZm8uZG1hX21hc2sg PSBETUFfQklUX01BU0soMzIpOwo+ICAKPiAtCXBkYXRhLT5udW1fcGlwZXMgPSBJTlRFTF9JTkZP KGRldl9wcml2KS0+bnVtX3BpcGVzOwo+ICsJcGRhdGEtPm51bV9waXBlcyA9IElOVEVMX05VTV9Q SVBFUyhkZXZfcHJpdik7Cj4gIAlwZGF0YS0+bnVtX3BvcnRzID0gSVNfQ0hFUlJZVklFVyhkZXZf cHJpdikgPyAzIDogMjsgLyogQixDLEQgb3IgQixDICovCj4gIAlwZGF0YS0+cG9ydFswXS5waXBl ID0gLTE7Cj4gIAlwZGF0YS0+cG9ydFsxXS5waXBlID0gLTE7Cj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jCj4gaW5kZXggYjFhOTQyZmM0M2M4Li4wZGZjYjQwZjMxNjIgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKPiBAQCAtMzQwLDcgKzM0MCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJf bW9kZXNldF9wcm9iZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAKPiAgCWlmIChIQVNfRElT UExBWShkZXZfcHJpdikpIHsKPiAgCQlyZXQgPSBkcm1fdmJsYW5rX2luaXQoJmRldl9wcml2LT5k cm0sCj4gLQkJCQkgICAgICBJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzKTsKPiArCQkJ CSAgICAgIElOVEVMX05VTV9QSVBFUyhkZXZfcHJpdikpOwo+ICAJCWlmIChyZXQpCj4gIAkJCWdv dG8gb3V0Owo+ICAJfQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+IGluZGV4IDUxZDU3NWNjYTJh Yy4uYjMyM2FlOTFiN2I1IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4gQEAgLTIxODYs NyArMjE4Niw5IEBAIElTX1NVQlBMQVRGT1JNKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICppOTE1LAo+ICAjZGVmaW5lIEdUX0ZSRVFVRU5DWV9NVUxUSVBMSUVSIDUwCj4gICNkZWZpbmUg R0VOOV9GUkVRX1NDQUxFUiAzCj4gIAo+IC0jZGVmaW5lIEhBU19ESVNQTEFZKGRldl9wcml2KSAo SU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA+IDApCj4gKyNkZWZpbmUgSU5URUxfTlVN X1BJUEVTKGRldl9wcml2KSAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcykKPiArCj4g KyNkZWZpbmUgSEFTX0RJU1BMQVkoZGV2X3ByaXYpIChJTlRFTF9OVU1fUElQRVMoZGV2X3ByaXYp ID4gMCkKPiAgCj4gIHN0YXRpYyBpbmxpbmUgYm9vbCBpbnRlbF92dGRfYWN0aXZlKHZvaWQpCj4g IHsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBpbmRleCA1NGE4Yjc3MDViYzYuLmQwY2ViMjcy NTUxZiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IEBAIC0xOTA5LDcgKzE5MDksNyBA QCBzdGF0aWMgaW50IHZsdl9jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpCj4gIAo+ICAJZm9yIChsZXZlbCA9IDA7IGxldmVsIDwgd21fc3RhdGUtPm51 bV9sZXZlbHM7IGxldmVsKyspIHsKPiAgCQljb25zdCBzdHJ1Y3QgZzR4X3BpcGVfd20gKnJhdyA9 ICZjcnRjX3N0YXRlLT53bS52bHYucmF3W2xldmVsXTsKPiAtCQljb25zdCBpbnQgc3JfZmlmb19z aXplID0gSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyAqIDUxMiAtIDE7Cj4gKwkJY29u c3QgaW50IHNyX2ZpZm9fc2l6ZSA9IElOVEVMX05VTV9QSVBFUyhkZXZfcHJpdikgKiA1MTIgLSAx Owo+ICAKPiAgCQlpZiAoIXZsdl9yYXdfY3J0Y193bV9pc192YWxpZChjcnRjX3N0YXRlLCBsZXZl bCkpCj4gIAkJCWJyZWFrOwo+IEBAIC0yNjQ4LDcgKzI2NDgsNyBAQCBzdGF0aWMgdW5zaWduZWQg aW50IGlsa19wbGFuZV93bV9tYXgoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAo+ICAKPiAgCS8qIEhTVyBhbGxvd3MgTFAxKyB3YXRlcm1hcmtzIGV2ZW4gd2l0aCBtdWx0 aXBsZSBwaXBlcyAqLwo+ICAJaWYgKGxldmVsID09IDAgfHwgY29uZmlnLT5udW1fcGlwZXNfYWN0 aXZlID4gMSkgewo+IC0JCWZpZm9fc2l6ZSAvPSBJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3Bp cGVzOwo+ICsJCWZpZm9fc2l6ZSAvPSBJTlRFTF9OVU1fUElQRVMoZGV2X3ByaXYpOwo+ICAKPiAg CQkvKgo+ICAJCSAqIEZvciBzb21lIHJlYXNvbiB0aGUgbm9uIHNlbGYgcmVmcmVzaAo+IEBAIC05 NzMzLDcgKzk3MzMsNyBAQCB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQo+ICAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IGk5eHhfdXBk YXRlX3dtOwo+ICAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9maWZvX3NpemUgPSBpOXh4X2dldF9m aWZvX3NpemU7Cj4gIAl9IGVsc2UgaWYgKElTX0dFTihkZXZfcHJpdiwgMikpIHsKPiAtCQlpZiAo SU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9PSAxKSB7Cj4gKwkJaWYgKElOVEVMX05V TV9QSVBFUyhkZXZfcHJpdikgPT0gMSkgewo+ICAJCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVf d20gPSBpODQ1X3VwZGF0ZV93bTsKPiAgCQkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2ZpZm9fc2l6 ZSA9IGk4NDVfZ2V0X2ZpZm9fc2l6ZTsKPiAgCQl9IGVsc2UgewoKLS0gCkphbmkgTmlrdWxhLCBJ bnRlbCBPcGVuIFNvdXJjZSBHcmFwaGljcyBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4