From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@intel.com>
Subject: [PATCH 2/4] drm/i915: convert device info num_pipes to
 pipe_mask
Date: Mon,  2 Sep 2019 21:08:14 +0300
Message-ID: <3c4f5cbdf2f425c0414f7b3cc50dbefa8b46d33c.1567446845.git.jani.nikula@intel.com>
References: <cover.1567446845.git.jani.nikula@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 0A37A8929B
 for <intel-gfx@lists.freedesktop.org>; Mon,  2 Sep 2019 18:07:44 +0000 (UTC)
In-Reply-To: <cover.1567446845.git.jani.nikula@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
List-Id: intel-gfx@lists.freedesktop.org

UmVwbGFjZSBkZXZpY2UgaW5mbyBudW1iZXIgb2YgcGlwZXMgd2l0aCBhIGJpdCBtYXNrIG9mIGF2
YWlsYWJsZQpwaXBlcy4gVGhpcyB3aWxsIHByb3ZlIGhhbmR5IGluIHRoZSBmdXR1cmUuIFRoZXJl
J3Mgc3RpbGwgYSBidW5jaCBvZgpmdXR1cmUgd29yayB0byBkbyB0byBhY3R1YWxseSBhbGxvdyBh
IG5vbi1jb25zZWN1dGl2ZSBtYXNrIG9mIHBpcGVzLCBidXQKaXQncyBhIHN0YXJ0LiBObyBmdW5j
dGlvbmFsIGNoYW5nZXMuCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u
dWs+CkNjOiBKb3PDqSBSb2JlcnRvIGRlIFNvdXphIDxqb3NlLnNvdXphQGludGVsLmNvbT4KQ2M6
IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1v
ZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfcGNpLmMgICAgICAgICAgfCAyNCArKysrKysrKysrKystLS0tLS0tLS0tLS0K
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmMgfCAxMCArKysrKy0tLS0t
CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5oIHwgIDIgKy0KIDQgZmls
ZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZHJ2LmgKaW5kZXggZjRmYzcyZTIxMThjLi42NTU3Y2Q4ZGRkN2EgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9kcnYuaApAQCAtMjE4Miw5ICsyMTgyLDkgQEAgSVNfU1VCUExBVEZPUk0oY29uc3Qg
c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAjZGVmaW5lIEdUX0ZSRVFVRU5DWV9NVUxU
SVBMSUVSIDUwCiAjZGVmaW5lIEdFTjlfRlJFUV9TQ0FMRVIgMwogCi0jZGVmaW5lIElOVEVMX05V
TV9QSVBFUyhkZXZfcHJpdikgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMpCisjZGVm
aW5lIElOVEVMX05VTV9QSVBFUyhkZXZfcHJpdikgKGh3ZWlnaHQ4KElOVEVMX0lORk8oZGV2X3By
aXYpLT5waXBlX21hc2spKQogCi0jZGVmaW5lIEhBU19ESVNQTEFZKGRldl9wcml2KSAoSU5URUxf
TlVNX1BJUEVTKGRldl9wcml2KSA+IDApCisjZGVmaW5lIEhBU19ESVNQTEFZKGRldl9wcml2KSAo
SU5URUxfSU5GTyhkZXZfcHJpdiktPnBpcGVfbWFzayAhPSAwKQogCiBzdGF0aWMgaW5saW5lIGJv
b2wgaW50ZWxfdnRkX2FjdGl2ZSh2b2lkKQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9wY2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGNpLmMKaW5kZXgg
ZmJlOThhMmRiODhlLi4xN2RkYzAzZGYwMDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfcGNpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wY2kuYwpAQCAt
MTQ3LDcgKzE0Nyw3IEBACiAjZGVmaW5lIEk4MzBfRkVBVFVSRVMgXAogCUdFTigyKSwgXAogCS5p
c19tb2JpbGUgPSAxLCBcCi0JLm51bV9waXBlcyA9IDIsIFwKKwkucGlwZV9tYXNrID0gQklUKFBJ
UEVfQSkgfCBCSVQoUElQRV9CKSwgXAogCS5kaXNwbGF5Lmhhc19vdmVybGF5ID0gMSwgXAogCS5k
aXNwbGF5LmN1cnNvcl9uZWVkc19waHlzaWNhbCA9IDEsIFwKIAkuZGlzcGxheS5vdmVybGF5X25l
ZWRzX3BoeXNpY2FsID0gMSwgXApAQCAtMTY1LDcgKzE2NSw3IEBACiAKICNkZWZpbmUgSTg0NV9G
RUFUVVJFUyBcCiAJR0VOKDIpLCBcCi0JLm51bV9waXBlcyA9IDEsIFwKKwkucGlwZV9tYXNrID0g
QklUKFBJUEVfQSksIFwKIAkuZGlzcGxheS5oYXNfb3ZlcmxheSA9IDEsIFwKIAkuZGlzcGxheS5v
dmVybGF5X25lZWRzX3BoeXNpY2FsID0gMSwgXAogCS5kaXNwbGF5Lmhhc19nbWNoID0gMSwgXApA
QCAtMjAzLDcgKzIwMyw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8g
aW50ZWxfaTg2NWdfaW5mbyA9IHsKIAogI2RlZmluZSBHRU4zX0ZFQVRVUkVTIFwKIAlHRU4oMyks
IFwKLQkubnVtX3BpcGVzID0gMiwgXAorCS5waXBlX21hc2sgPSBCSVQoUElQRV9BKSB8IEJJVChQ
SVBFX0IpLCBcCiAJLmRpc3BsYXkuaGFzX2dtY2ggPSAxLCBcCiAJLmdwdV9yZXNldF9jbG9iYmVy
c19kaXNwbGF5ID0gdHJ1ZSwgXAogCS5lbmdpbmVfbWFzayA9IEJJVChSQ1MwKSwgXApAQCAtMjg3
LDcgKzI4Nyw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxf
cGluZXZpZXdfbV9pbmZvID0gewogCiAjZGVmaW5lIEdFTjRfRkVBVFVSRVMgXAogCUdFTig0KSwg
XAotCS5udW1fcGlwZXMgPSAyLCBcCisJLnBpcGVfbWFzayA9IEJJVChQSVBFX0EpIHwgQklUKFBJ
UEVfQiksIFwKIAkuZGlzcGxheS5oYXNfaG90cGx1ZyA9IDEsIFwKIAkuZGlzcGxheS5oYXNfZ21j
aCA9IDEsIFwKIAkuZ3B1X3Jlc2V0X2Nsb2JiZXJzX2Rpc3BsYXkgPSB0cnVlLCBcCkBAIC0zMzcs
NyArMzM3LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9n
bTQ1X2luZm8gPSB7CiAKICNkZWZpbmUgR0VONV9GRUFUVVJFUyBcCiAJR0VOKDUpLCBcCi0JLm51
bV9waXBlcyA9IDIsIFwKKwkucGlwZV9tYXNrID0gQklUKFBJUEVfQSkgfCBCSVQoUElQRV9CKSwg
XAogCS5kaXNwbGF5Lmhhc19ob3RwbHVnID0gMSwgXAogCS5lbmdpbmVfbWFzayA9IEJJVChSQ1Mw
KSB8IEJJVChWQ1MwKSwgXAogCS5oYXNfc25vb3AgPSB0cnVlLCBcCkBAIC0zNjMsNyArMzYzLDcg
QEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9pcm9ubGFrZV9t
X2luZm8gPSB7CiAKICNkZWZpbmUgR0VONl9GRUFUVVJFUyBcCiAJR0VOKDYpLCBcCi0JLm51bV9w
aXBlcyA9IDIsIFwKKwkucGlwZV9tYXNrID0gQklUKFBJUEVfQSkgfCBCSVQoUElQRV9CKSwgXAog
CS5kaXNwbGF5Lmhhc19ob3RwbHVnID0gMSwgXAogCS5kaXNwbGF5Lmhhc19mYmMgPSAxLCBcCiAJ
LmVuZ2luZV9tYXNrID0gQklUKFJDUzApIHwgQklUKFZDUzApIHwgQklUKEJDUzApLCBcCkBAIC00
MTEsNyArNDExLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRl
bF9zYW5keWJyaWRnZV9tX2d0Ml9pbmZvID0gewogCiAjZGVmaW5lIEdFTjdfRkVBVFVSRVMgIFwK
IAlHRU4oNyksIFwKLQkubnVtX3BpcGVzID0gMywgXAorCS5waXBlX21hc2sgPSBCSVQoUElQRV9B
KSB8IEJJVChQSVBFX0IpIHwgQklUKFBJUEVfQyksIFwKIAkuZGlzcGxheS5oYXNfaG90cGx1ZyA9
IDEsIFwKIAkuZGlzcGxheS5oYXNfZmJjID0gMSwgXAogCS5lbmdpbmVfbWFzayA9IEJJVChSQ1Mw
KSB8IEJJVChWQ1MwKSB8IEJJVChCQ1MwKSwgXApAQCAtNDYyLDcgKzQ2Miw3IEBAIHN0YXRpYyBj
b25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfaXZ5YnJpZGdlX3FfaW5mbyA9IHsK
IAlHRU43X0ZFQVRVUkVTLAogCVBMQVRGT1JNKElOVEVMX0lWWUJSSURHRSksCiAJLmd0ID0gMiwK
LQkubnVtX3BpcGVzID0gMCwgLyogbGVnYWwsIGxhc3Qgb25lIHdpbnMgKi8KKwkucGlwZV9tYXNr
ID0gMCwgLyogbGVnYWwsIGxhc3Qgb25lIHdpbnMgKi8KIAkuaGFzX2wzX2RwZiA9IDEsCiB9Owog
CkBAIC00NzAsNyArNDcwLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5m
byBpbnRlbF92YWxsZXl2aWV3X2luZm8gPSB7CiAJUExBVEZPUk0oSU5URUxfVkFMTEVZVklFVyks
CiAJR0VOKDcpLAogCS5pc19scCA9IDEsCi0JLm51bV9waXBlcyA9IDIsCisJLnBpcGVfbWFzayA9
IEJJVChQSVBFX0EpIHwgQklUKFBJUEVfQiksCiAJLmhhc19ydW50aW1lX3BtID0gMSwKIAkuaGFz
X3JjNiA9IDEsCiAJLmhhc19ycHMgPSB0cnVlLApAQCAtNTYwLDcgKzU2MCw3IEBAIHN0YXRpYyBj
b25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfYnJvYWR3ZWxsX2d0M19pbmZvID0g
ewogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9jaGVycnl2aWV3
X2luZm8gPSB7CiAJUExBVEZPUk0oSU5URUxfQ0hFUlJZVklFVyksCiAJR0VOKDgpLAotCS5udW1f
cGlwZXMgPSAzLAorCS5waXBlX21hc2sgPSBCSVQoUElQRV9BKSB8IEJJVChQSVBFX0IpIHwgQklU
KFBJUEVfQyksCiAJLmRpc3BsYXkuaGFzX2hvdHBsdWcgPSAxLAogCS5pc19scCA9IDEsCiAJLmVu
Z2luZV9tYXNrID0gQklUKFJDUzApIHwgQklUKFZDUzApIHwgQklUKEJDUzApIHwgQklUKFZFQ1Mw
KSwKQEAgLTYzMSw3ICs2MzEsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9p
bmZvIGludGVsX3NreWxha2VfZ3Q0X2luZm8gPSB7CiAJLmlzX2xwID0gMSwgXAogCS5kaXNwbGF5
Lmhhc19ob3RwbHVnID0gMSwgXAogCS5lbmdpbmVfbWFzayA9IEJJVChSQ1MwKSB8IEJJVChWQ1Mw
KSB8IEJJVChCQ1MwKSB8IEJJVChWRUNTMCksIFwKLQkubnVtX3BpcGVzID0gMywgXAorCS5waXBl
X21hc2sgPSBCSVQoUElQRV9BKSB8IEJJVChQSVBFX0IpIHwgQklUKFBJUEVfQyksIFwKIAkuaGFz
XzY0Yml0X3JlbG9jID0gMSwgXAogCS5kaXNwbGF5Lmhhc19kZGkgPSAxLCBcCiAJLmhhc19mcGdh
X2RiZyA9IDEsIFwKQEAgLTc5Miw3ICs3OTIsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVs
X2RldmljZV9pbmZvIGludGVsX2Vsa2hhcnRsYWtlX2luZm8gPSB7CiBzdGF0aWMgY29uc3Qgc3Ry
dWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX3RpZ2VybGFrZV8xMl9pbmZvID0gewogCUdFTjEy
X0ZFQVRVUkVTLAogCVBMQVRGT1JNKElOVEVMX1RJR0VSTEFLRSksCi0JLm51bV9waXBlcyA9IDQs
CisJLnBpcGVfbWFzayA9IEJJVChQSVBFX0EpIHwgQklUKFBJUEVfQikgfCBCSVQoUElQRV9DKSB8
IEJJVChQSVBFX0QpLAogCS5yZXF1aXJlX2ZvcmNlX3Byb2JlID0gMSwKIAkuZGlzcGxheS5oYXNf
bW9kdWxhcl9maWEgPSAxLAogCS5lbmdpbmVfbWFzayA9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGV2aWNlX2luZm8uYwppbmRleCBkOWI1YmFhZWY1ZDAuLjUwYjA1YTVkZTUzYiAxMDA2NDQK
LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uYworKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5jCkBAIC04OTYsNyArODk2LDcgQEAg
dm9pZCBpbnRlbF9kZXZpY2VfaW5mb19ydW50aW1lX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZh
dGUgKmRldl9wcml2KQogCiAJaWYgKGk5MTVfbW9kcGFyYW1zLmRpc2FibGVfZGlzcGxheSkgewog
CQlEUk1fSU5GTygiRGlzcGxheSBkaXNhYmxlZCAobW9kdWxlIHBhcmFtZXRlcilcbiIpOwotCQlp
bmZvLT5udW1fcGlwZXMgPSAwOworCQlpbmZvLT5waXBlX21hc2sgPSAwOwogCX0gZWxzZSBpZiAo
SEFTX0RJU1BMQVkoZGV2X3ByaXYpICYmCiAJCSAgIChJU19HRU5fUkFOR0UoZGV2X3ByaXYsIDcs
IDgpKSAmJgogCQkgICBIQVNfUENIX1NQTElUKGRldl9wcml2KSkgewpAQCAtOTE3LDE0ICs5MTcs
MTQgQEAgdm9pZCBpbnRlbF9kZXZpY2VfaW5mb19ydW50aW1lX2luaXQoc3RydWN0IGRybV9pOTE1
X3ByaXZhdGUgKmRldl9wcml2KQogCQkgICAgKEhBU19QQ0hfQ1BUKGRldl9wcml2KSAmJgogCQkg
ICAgICEoc2Z1c2Vfc3RyYXAgJiBTRlVTRV9TVFJBUF9GVVNFX0xPQ0spKSkgewogCQkJRFJNX0lO
Rk8oIkRpc3BsYXkgZnVzZWQgb2ZmLCBkaXNhYmxpbmdcbiIpOwotCQkJaW5mby0+bnVtX3BpcGVz
ID0gMDsKKwkJCWluZm8tPnBpcGVfbWFzayA9IDA7CiAJCX0gZWxzZSBpZiAoZnVzZV9zdHJhcCAm
IElWQl9QSVBFX0NfRElTQUJMRSkgewogCQkJRFJNX0lORk8oIlBpcGVDIGZ1c2VkIG9mZlxuIik7
Ci0JCQlpbmZvLT5udW1fcGlwZXMgLT0gMTsKKwkJCWluZm8tPnBpcGVfbWFzayAmPSB+QklUKFBJ
UEVfQyk7CiAJCX0KIAl9IGVsc2UgaWYgKEhBU19ESVNQTEFZKGRldl9wcml2KSAmJiBJTlRFTF9H
RU4oZGV2X3ByaXYpID49IDkpIHsKIAkJdTMyIGRmc20gPSBJOTE1X1JFQUQoU0tMX0RGU00pOwot
CQl1OCBlbmFibGVkX21hc2sgPSBCSVQoaW5mby0+bnVtX3BpcGVzKSAtIDE7CisJCXU4IGVuYWJs
ZWRfbWFzayA9IGluZm8tPnBpcGVfbWFzazsKIAogCQlpZiAoZGZzbSAmIFNLTF9ERlNNX1BJUEVf
QV9ESVNBQkxFKQogCQkJZW5hYmxlZF9tYXNrICY9IH5CSVQoUElQRV9BKTsKQEAgLTk0NSw3ICs5
NDUsNyBAQCB2b2lkIGludGVsX2RldmljZV9pbmZvX3J1bnRpbWVfaW5pdChzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQlEUk1fRVJST1IoImludmFsaWQgcGlwZSBmdXNlIGNv
bmZpZ3VyYXRpb246IGVuYWJsZWRfbWFzaz0weCV4XG4iLAogCQkJCSAgZW5hYmxlZF9tYXNrKTsK
IAkJZWxzZQotCQkJaW5mby0+bnVtX3BpcGVzID0gaHdlaWdodDgoZW5hYmxlZF9tYXNrKTsKKwkJ
CWluZm8tPnBpcGVfbWFzayA9IGVuYWJsZWRfbWFzazsKIAl9CiAKIAkvKiBJbml0aWFsaXplIHNs
aWNlL3N1YnNsaWNlL0VVIGluZm8gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2RldmljZV9pbmZvLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2Vf
aW5mby5oCmluZGV4IDkyZTBjMmUwOTU0Yy4uZDRjMjg4ODYwYWVkIDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmgKQEAgLTE2MSw3ICsxNjEsNyBAQCBzdHJ1Y3QgaW50
ZWxfZGV2aWNlX2luZm8gewogCiAJdTMyIGRpc3BsYXlfbW1pb19vZmZzZXQ7CiAKLQl1OCBudW1f
cGlwZXM7CisJdTggcGlwZV9tYXNrOwogCiAjZGVmaW5lIERFRklORV9GTEFHKG5hbWUpIHU4IG5h
bWU6MQogCURFVl9JTkZPX0ZPUl9FQUNIX0ZMQUcoREVGSU5FX0ZMQUcpOwotLSAKMi4yMC4xCgpf
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg
bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0
cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=