From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mika Kahola <mika.kahola@intel.com>
Subject: [PATCH 19/19] drm/i915: Modeset global_pipes() update
Date: Tue, 31 Mar 2015 14:14:23 +0300
Message-ID: <1427800463-5388-1-git-send-email-mika.kahola@intel.com>
References: <20150331110535.GB3154@sorvi>
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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 6576D6E703
 for <intel-gfx@lists.freedesktop.org>; Tue, 31 Mar 2015 04:14:48 -0700 (PDT)
In-Reply-To: <20150331110535.GB3154@sorvi>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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
List-Id: intel-gfx@lists.freedesktop.org

Q29tYmluZWQgVmFsbGV5dmlldywgSGFzd2VsbCBhbmQgQnJvYWR3ZWxsICcqX21vZGVzZXRfZ2xv
YmFsX3BpcGVzKCknCmludG8gb25lIGZ1bmN0aW9uICdpbnRlbF9tb2Rlc2V0X2dsb2JhbF9waXBl
cygpJwoKU2lnbmVkLW9mZi1ieTogTWlrYSBLYWhvbGEgPG1pa2Eua2Fob2xhQGludGVsLmNvbT4K
LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA4OSArKysrKysrKysr
KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MSBpbnNlcnRpb25z
KCspLCA0OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k
ZXggNWVkNDBkZi4uNzE4MGQyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA
QCAtNTIwOSwzOCArNTIwOSw2IEBAIHN0YXRpYyBpbnQgdmFsbGV5dmlld19jYWxjX2NkY2xrKHN0
cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJcmV0dXJuIDIwMDAwMDsKIH0KIAot
LyogY29tcHV0ZSB0aGUgbWF4IHBpeGVsIGNsb2NrIGZvciBuZXcgY29uZmlndXJhdGlvbiAqLwot
c3RhdGljIGludCBpbnRlbF9tb2RlX21heF9waXhjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2KQotewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2Owot
CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwotCWludCBtYXhfcGl4Y2xrID0gMDsKLQot
CWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBpbnRlbF9jcnRjKSB7Ci0JCWlmIChpbnRlbF9jcnRj
LT5uZXdfZW5hYmxlZCkKLQkJCW1heF9waXhjbGsgPSBtYXgobWF4X3BpeGNsaywKLQkJCQkJIGlu
dGVsX2NydGMtPm5ld19jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2Nsb2NrKTsKLQl9
Ci0KLQlyZXR1cm4gbWF4X3BpeGNsazsKLX0KLQotc3RhdGljIHZvaWQgdmFsbGV5dmlld19tb2Rl
c2V0X2dsb2JhbF9waXBlcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCQkgICAgdW5zaWdu
ZWQgKnByZXBhcmVfcGlwZXMpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2
ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKLQlp
bnQgbWF4X3BpeGNsayA9IGludGVsX21vZGVfbWF4X3BpeGNsayhkZXZfcHJpdik7Ci0KLQlpZiAo
dmFsbGV5dmlld19jYWxjX2NkY2xrKGRldl9wcml2LCBtYXhfcGl4Y2xrKSA9PSBkZXZfcHJpdi0+
Y2RjbGtfZnJlcSkKLQkJcmV0dXJuOwotCi0JLyogZGlzYWJsZS9lbmFibGUgYWxsIGN1cnJlbnRs
eSBhY3RpdmUgcGlwZXMgd2hpbGUgd2UgY2hhbmdlIGNkY2xrICovCi0JZm9yX2VhY2hfaW50ZWxf
Y3J0YyhkZXYsIGludGVsX2NydGMpCi0JCWlmIChpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5lbmFi
bGUpCi0JCQkqcHJlcGFyZV9waXBlcyB8PSAoMSA8PCBpbnRlbF9jcnRjLT5waXBlKTsKLX0KLQog
c3RhdGljIHZvaWQgdmx2X3Byb2dyYW1fcGZpX2NyZWRpdHMoc3RydWN0IGRybV9pOTE1X3ByaXZh
dGUgKmRldl9wcml2KQogewogCXVuc2lnbmVkIGludCBjcmVkaXRzLCBkZWZhdWx0X2NyZWRpdHM7
CkBAIC01Mjc3LDYgKzUyNDUsMjIgQEAgc3RhdGljIHZvaWQgdmx2X3Byb2dyYW1fcGZpX2NyZWRp
dHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCVdBUk5fT04oSTkxNV9SRUFE
KEdDSV9DT05UUk9MKSAmIFBGSV9DUkVESVRfUkVTRU5EKTsKIH0KIAorLyogY29tcHV0ZSB0aGUg
bWF4IHBpeGVsIGNsb2NrIGZvciBuZXcgY29uZmlndXJhdGlvbiAqLworc3RhdGljIGludCBpbnRl
bF9tb2RlX21heF9waXhjbGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorewor
CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OworCXN0cnVjdCBpbnRlbF9j
cnRjICppbnRlbF9jcnRjOworCWludCBtYXhfcGl4Y2xrID0gMDsKKworCWZvcl9lYWNoX2ludGVs
X2NydGMoZGV2LCBpbnRlbF9jcnRjKSB7CisJCWlmIChpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCkK
KwkJCW1heF9waXhjbGsgPSBtYXgobWF4X3BpeGNsaywKKwkJCQkJIGludGVsX2NydGMtPm5ld19j
b25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2Nsb2NrKTsKKwl9CisKKwlyZXR1cm4gbWF4
X3BpeGNsazsKK30KKwogc3RhdGljIHZvaWQgdmFsbGV5dmlld19tb2Rlc2V0X2dsb2JhbF9yZXNv
dXJjZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBkcm1fZGV2
aWNlICpkZXYgPSBzdGF0ZS0+ZGV2OwpAQCAtODk3MywyMSArODk1NywzOCBAQCBzdGF0aWMgdm9p
ZCBicm9hZHdlbGxfc2V0X2NkY2xrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBjZGNsaykK
IAkgICAgIGNkY2xrLCBkZXZfcHJpdi0+Y2RjbGtfZnJlcSk7CiB9CiAKLXN0YXRpYyB2b2lkIGhh
c3dlbGxfbW9kZXNldF9nbG9iYWxfcGlwZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKLQkJCQkJ
IHVuc2lnbmVkICpwcmVwYXJlX3BpcGVzKQorc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9nbG9i
YWxfcGlwZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkgICAgICAgdW5zaWduZWQgKnBy
ZXBhcmVfcGlwZXMsCisJCQkJICAgICAgIHVuc2lnbmVkICpkaXNhYmxlX3BpcGVzKQogewogCXN0
cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3Ry
dWN0IGludGVsX2NydGMgKmNydGM7Ci0JaW50IG1heF9waXhlbF9yYXRlID0gaWxrX21heF9waXhl
bF9yYXRlKGRldl9wcml2KTsKKwlpbnQgbWF4X3BpeGNsazsKIAotCWlmIChoYXN3ZWxsX2NhbGNf
Y2RjbGsoZGV2X3ByaXYsIG1heF9waXhlbF9yYXRlKSA9PQotCSAgICBkZXZfcHJpdi0+Y2RjbGtf
ZnJlcSkKKwkvKiB0aGlzIG1vZGVzZXQgaXMgdmFsaWQgb25seSBmb3IgVkxWLCBIU1csIGFuZCBC
RFcgKi8KKwlpZiAoIUlTX1ZBTExFWVZJRVcoZGV2KSAmJiAhSVNfSEFTV0VMTChkZXYpICYmICFJ
U19CUk9BRFdFTEwoZGV2KSkKIAkJcmV0dXJuOwogCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkg
eworCQltYXhfcGl4Y2xrID0gaW50ZWxfbW9kZV9tYXhfcGl4Y2xrKGRldl9wcml2KTsKKwkJaWYg
KHZhbGxleXZpZXdfY2FsY19jZGNsayhkZXZfcHJpdiwgbWF4X3BpeGNsaykgPT0KKwkJICAgIGRl
dl9wcml2LT5jZGNsa19mcmVxKQorCQkJcmV0dXJuOworCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChk
ZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKSB7CisJCW1heF9waXhjbGsgPSBpbGtfbWF4X3BpeGVs
X3JhdGUoZGV2X3ByaXYpOworCQlpZiAoaGFzd2VsbF9jYWxjX2NkY2xrKGRldl9wcml2LCBtYXhf
cGl4Y2xrKSA9PQorCQkgICAgZGV2X3ByaXYtPmNkY2xrX2ZyZXEpCisJCQlyZXR1cm47CisKKwl9
CisKIAkvKiBkaXNhYmxlL2VuYWJsZSBhbGwgY3VycmVudGx5IGFjdGl2ZSBwaXBlcyB3aGlsZSB3
ZSBjaGFuZ2UgY2RjbGsgKi8KIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykKLQkJaWYg
KGNydGMtPmJhc2UuZW5hYmxlZCkKLQkJCSpwcmVwYXJlX3BpcGVzIHw9IDEgPDwgY3J0Yy0+cGlw
ZTsKKwkJaWYgKGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSkKKwkJCSpwcmVwYXJlX3BpcGVzIHw9
ICgxIDw8IGNydGMtPnBpcGUpOworCisJLyogbWF5IGhhdmUgYWRkZWQgbW9yZSB0byBwcmVwYXJl
X3BpcGVzIHRoYW4gd2Ugc2hvdWxkICovCisJKnByZXBhcmVfcGlwZXMgJj0gfipkaXNhYmxlX3Bp
cGVzOwogfQogCiBzdGF0aWMgdm9pZCBoYXN3ZWxsX21vZGVzZXRfZ2xvYmFsX3Jlc291cmNlcyhz
dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCkBAIC0xMjEyMCwxNSArMTIxMjEsNyBAQCBz
dGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCSAqIG1v
ZGUgc2V0IG9uIHRoaXMgY3J0Yy4gIEZvciBvdGhlciBjcnRjcyB3ZSBuZWVkIHRvIHVzZSB0aGUK
IAkgKiBhZGp1c3RlZF9tb2RlIGJpdHMgaW4gdGhlIGNydGMgZGlyZWN0bHkuCiAJICovCi0JaWYg
KElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRl
dikpIHsKLQkJaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkKLQkJCXZhbGxleXZpZXdfbW9kZXNldF9n
bG9iYWxfcGlwZXMoZGV2LCAmcHJlcGFyZV9waXBlcyk7Ci0JCWVsc2UKLQkJCWhhc3dlbGxfbW9k
ZXNldF9nbG9iYWxfcGlwZXMoZGV2LCAmcHJlcGFyZV9waXBlcyk7Ci0KLQkJLyogbWF5IGhhdmUg
YWRkZWQgbW9yZSB0byBwcmVwYXJlX3BpcGVzIHRoYW4gd2Ugc2hvdWxkICovCi0JCXByZXBhcmVf
cGlwZXMgJj0gfmRpc2FibGVfcGlwZXM7Ci0JfQorCWludGVsX21vZGVzZXRfZ2xvYmFsX3BpcGVz
KGRldiwgJnByZXBhcmVfcGlwZXMsICZkaXNhYmxlX3BpcGVzKTsKIAogCXJldCA9IF9faW50ZWxf
c2V0X21vZGVfc2V0dXBfcGxscyhkZXYsIG1vZGVzZXRfcGlwZXMsIGRpc2FibGVfcGlwZXMpOwog
CWlmIChyZXQpCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl
c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p
bnRlbC1nZngK