From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v2 14/27] drm/i915: clean up atomic plane check
	functions
Date: Thu,  4 Jun 2015 14:47:44 +0200
Message-ID: <1433422077-14907-15-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1433422077-14907-1-git-send-email-maarten.lankhorst@linux.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 mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTP id 775046EB32
 for <intel-gfx@lists.freedesktop.org>; Thu,  4 Jun 2015 05:48:12 -0700 (PDT)
In-Reply-To: <1433422077-14907-1-git-send-email-maarten.lankhorst@linux.intel.com>
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

QnkgcGFzc2luZyBjcnRjX3N0YXRlIHRvIHRoZSBjaGVja19wbGFuZSBmdW5jdGlvbnMgYSBsb3Qg
b2YgZHVwbGljYXRlZApjb2RlIGNhbiBiZSByZW1vdmVkLiBBbmQgbm93IHRoYXQgdGhlIHRyYW5z
aXRpb25hbCBoZWxwZXJzIGFyZSBnb25lIHRoZQpjcnRjX3N0YXRlIGNhbiBiZSByZWxpYWJseSBv
YnRhaW5lZC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmto
b3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRv
bWljX3BsYW5lLmMgfCAgNCArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YyAgICAgIHwgNDggKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9zcHJpdGUuYyAgICAgICB8IDEzICsrKy0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAy
MyBpbnNlcnRpb25zKCspLCA0MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2F0b21pY19wbGFuZS5jCmluZGV4IGFhMjEyODM2OWEwYS4uNGQ4Y2FjYmNhNzc3IDEwMDY0
NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtMTE5LDYgKzExOSw4
IEBAIHN0YXRpYyBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUg
KnBsYW5lLAogCWNydGMgPSBjcnRjID8gY3J0YyA6IHBsYW5lLT5jcnRjOwogCWludGVsX2NydGMg
PSB0b19pbnRlbF9jcnRjKGNydGMpOwogCisJaW50ZWxfc3RhdGUtPnZpc2libGUgPSBmYWxzZTsK
KwogCS8qCiAJICogQm90aCBjcnRjIGFuZCBwbGFuZS0+Y3J0YyBjb3VsZCBiZSBOVUxMIGlmIHdl
J3JlIHVwZGF0aW5nIGEKIAkgKiBwcm9wZXJ0eSB3aGlsZSB0aGUgcGxhbmUgaXMgZGlzYWJsZWQu
ICBXZSBkb24ndCBhY3R1YWxseSBoYXZlCkBAIC0xODUsNyArMTg3LDcgQEAgc3RhdGljIGludCBp
bnRlbF9wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCX0KIAl9
CiAKLQlyZXQgPSBpbnRlbF9wbGFuZS0+Y2hlY2tfcGxhbmUocGxhbmUsIGludGVsX3N0YXRlKTsK
KwlyZXQgPSBpbnRlbF9wbGFuZS0+Y2hlY2tfcGxhbmUocGxhbmUsIGNydGNfc3RhdGUsIGludGVs
X3N0YXRlKTsKIAlpZiAocmV0IHx8ICFzdGF0ZS0+c3RhdGUpCiAJCXJldHVybiByZXQ7CiAKZGlm
ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA4NTdjMDA4ODFlZmYuLjg4NDFjZjVl
OGYxYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTMzOTAsMzYgKzEz
MzkwLDI1IEBAIHNrbF9tYXhfc2NhbGUoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsIHN0
cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlCiAKIHN0YXRpYyBpbnQKIGludGVsX2No
ZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgIHN0cnVjdCBp
bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh
dGUgKnN0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwogCXN0
cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5iYXNlLmNydGM7Ci0Jc3RydWN0IGludGVsX2Ny
dGMgKmludGVsX2NydGM7Ci0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJ
c3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+YmFzZS5mYjsKLQlzdHJ1Y3QgZHJt
X3JlY3QgKmRlc3QgPSAmc3RhdGUtPmRzdDsKLQlzdHJ1Y3QgZHJtX3JlY3QgKnNyYyA9ICZzdGF0
ZS0+c3JjOwotCWNvbnN0IHN0cnVjdCBkcm1fcmVjdCAqY2xpcCA9ICZzdGF0ZS0+Y2xpcDsKLQli
b29sIGNhbl9wb3NpdGlvbiA9IGZhbHNlOwotCWludCBtYXhfc2NhbGUgPSBEUk1fUExBTkVfSEVM
UEVSX05PX1NDQUxJTkc7CiAJaW50IG1pbl9zY2FsZSA9IERSTV9QTEFORV9IRUxQRVJfTk9fU0NB
TElORzsKKwlpbnQgbWF4X3NjYWxlID0gRFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HOworCWJv
b2wgY2FuX3Bvc2l0aW9uID0gZmFsc2U7CiAKLQljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+
Y3J0YzsKLQlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQljcnRjX3N0YXRlID0g
c3RhdGUtPmJhc2Uuc3RhdGUgPwotCQlpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUt
PmJhc2Uuc3RhdGUsIGludGVsX2NydGMpIDogTlVMTDsKLQotCWlmIChJTlRFTF9JTkZPKGRldikt
PmdlbiA+PSA5KSB7Ci0JCS8qIHVzZSBzY2FsZXIgd2hlbiBjb2xvcmtleSBpcyBub3QgcmVxdWly
ZWQgKi8KLQkJaWYgKHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+Y2tleS5mbGFncyA9PSBJOTE1X1NF
VF9DT0xPUktFWV9OT05FKSB7Ci0JCQltaW5fc2NhbGUgPSAxOwotCQkJbWF4X3NjYWxlID0gc2ts
X21heF9zY2FsZShpbnRlbF9jcnRjLCBjcnRjX3N0YXRlKTsKLQkJfQorCS8qIHVzZSBzY2FsZXIg
d2hlbiBjb2xvcmtleSBpcyBub3QgcmVxdWlyZWQgKi8KKwlpZiAoSU5URUxfSU5GTyhwbGFuZS0+
ZGV2KS0+Z2VuID49IDkgJiYKKwkgICAgdG9faW50ZWxfcGxhbmUocGxhbmUpLT5ja2V5LmZsYWdz
ID09IEk5MTVfU0VUX0NPTE9SS0VZX05PTkUpIHsKKwkJbWluX3NjYWxlID0gMTsKKwkJbWF4X3Nj
YWxlID0gc2tsX21heF9zY2FsZSh0b19pbnRlbF9jcnRjKGNydGMpLCBjcnRjX3N0YXRlKTsKIAkJ
Y2FuX3Bvc2l0aW9uID0gdHJ1ZTsKIAl9CiAKLQlyZXR1cm4gZHJtX3BsYW5lX2hlbHBlcl9jaGVj
a191cGRhdGUocGxhbmUsIGNydGMsIGZiLAotCQkJCQkgICAgIHNyYywgZGVzdCwgY2xpcCwKKwly
ZXR1cm4gZHJtX3BsYW5lX2hlbHBlcl9jaGVja191cGRhdGUocGxhbmUsIGNydGMsIGZiLCAmc3Rh
dGUtPnNyYywKKwkJCQkJICAgICAmc3RhdGUtPmRzdCwgJnN0YXRlLT5jbGlwLAogCQkJCQkgICAg
IG1pbl9zY2FsZSwgbWF4X3NjYWxlLAogCQkJCQkgICAgIGNhbl9wb3NpdGlvbiwgdHJ1ZSwKIAkJ
CQkJICAgICAmc3RhdGUtPnZpc2libGUpOwpAQCAtMTM2NTgsMjQgKzEzNjQ3LDE3IEBAIHZvaWQg
aW50ZWxfY3JlYXRlX3JvdGF0aW9uX3Byb3BlcnR5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0
cnVjdCBpbnRlbF9wbGFuZSAqCiAKIHN0YXRpYyBpbnQKIGludGVsX2NoZWNrX2N1cnNvcl9wbGFu
ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKKwkJCSBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq
Y3J0Y19zdGF0ZSwKIAkJCSBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQogewotCXN0
cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5iYXNlLmNydGM7Ci0Jc3RydWN0IGRybV9kZXZp
Y2UgKmRldiA9IHBsYW5lLT5kZXY7CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gY3J0Y19zdGF0
ZS0+YmFzZS5jcnRjOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gc3RhdGUtPmJhc2Uu
ZmI7Ci0Jc3RydWN0IGRybV9yZWN0ICpkZXN0ID0gJnN0YXRlLT5kc3Q7Ci0Jc3RydWN0IGRybV9y
ZWN0ICpzcmMgPSAmc3RhdGUtPnNyYzsKLQljb25zdCBzdHJ1Y3QgZHJtX3JlY3QgKmNsaXAgPSAm
c3RhdGUtPmNsaXA7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2Zi
X29iaihmYik7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CiAJdW5zaWduZWQgc3Ry
aWRlOwogCWludCByZXQ7CiAKLQljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsKLQlp
bnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQotCXJldCA9IGRybV9wbGFuZV9oZWxw
ZXJfY2hlY2tfdXBkYXRlKHBsYW5lLCBjcnRjLCBmYiwKLQkJCQkJICAgIHNyYywgZGVzdCwgY2xp
cCwKKwlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3VwZGF0ZShwbGFuZSwgY3J0YywgZmIs
ICZzdGF0ZS0+c3JjLAorCQkJCQkgICAgJnN0YXRlLT5kc3QsICZzdGF0ZS0+Y2xpcCwKIAkJCQkJ
ICAgIERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORywKIAkJCQkJICAgIERSTV9QTEFORV9IRUxQ
RVJfTk9fU0NBTElORywKIAkJCQkJICAgIHRydWUsIHRydWUsICZzdGF0ZS0+dmlzaWJsZSk7CkBA
IC0xMzY4Nyw3ICsxMzY2OSw3IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJt
X3BsYW5lICpwbGFuZSwKIAkJcmV0dXJuIDA7CiAKIAkvKiBDaGVjayBmb3Igd2hpY2ggY3Vyc29y
IHR5cGVzIHdlIHN1cHBvcnQgKi8KLQlpZiAoIWN1cnNvcl9zaXplX29rKGRldiwgc3RhdGUtPmJh
c2UuY3J0Y193LCBzdGF0ZS0+YmFzZS5jcnRjX2gpKSB7CisJaWYgKCFjdXJzb3Jfc2l6ZV9vayhw
bGFuZS0+ZGV2LCBzdGF0ZS0+YmFzZS5jcnRjX3csIHN0YXRlLT5iYXNlLmNydGNfaCkpIHsKIAkJ
RFJNX0RFQlVHKCJDdXJzb3IgZGltZW5zaW9uICVkeCVkIG5vdCBzdXBwb3J0ZWRcbiIsCiAJCQkg
IHN0YXRlLT5iYXNlLmNydGNfdywgc3RhdGUtPmJhc2UuY3J0Y19oKTsKIAkJcmV0dXJuIC1FSU5W
QUw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDgwMmYzZTk5Yzg0OS4uOTZlMzY1ZTc0
YjA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNjAxLDYgKzYwMSw3IEBAIHN0cnVj
dCBpbnRlbF9wbGFuZSB7CiAJdm9pZCAoKmRpc2FibGVfcGxhbmUpKHN0cnVjdCBkcm1fcGxhbmUg
KnBsYW5lLAogCQkJICAgICAgc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29sIGZvcmNlKTsKIAlp
bnQgKCpjaGVja19wbGFuZSkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgICBzdHJ1Y3Qg
aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCSAgIHN0cnVjdCBpbnRlbF9wbGFuZV9z
dGF0ZSAqc3RhdGUpOwogCXZvaWQgKCpjb21taXRfcGxhbmUpKHN0cnVjdCBkcm1fcGxhbmUgKnBs
YW5lLAogCQkJICAgICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKTsKZGlmZiAtLWdp
dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggYzkwOWI4YjhjZTg1Li5jMTVkNTRiNjAxMDUgMTAw
NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC03MzksMTEgKzczOSwxMiBAQCBpbGtf
ZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpj
cnRjLCBib29sIGZvcmNlKQogCiBzdGF0aWMgaW50CiBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUo
c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy
dGNfc3RhdGUsCiAJCQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50
ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoc3RhdGUtPmJhc2UuY3J0Yyk7Ci0Jc3RydWN0IGludGVs
X2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUt
PmJhc2UuY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2Ny
dGMoY3J0Yyk7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3Bs
YW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZi
OwogCWludCBjcnRjX3gsIGNydGNfeTsKQEAgLTc1NywxNCArNzU4LDggQEAgaW50ZWxfY2hlY2tf
c3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWJvb2wgY2FuX3NjYWxlOwog
CWludCBwaXhlbF9zaXplOwogCi0JaW50ZWxfY3J0YyA9IGludGVsX2NydGMgPyBpbnRlbF9jcnRj
IDogdG9faW50ZWxfY3J0YyhwbGFuZS0+Y3J0Yyk7Ci0JY3J0Y19zdGF0ZSA9IHN0YXRlLT5iYXNl
LnN0YXRlID8KLQkJaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLT5iYXNlLnN0YXRl
LCBpbnRlbF9jcnRjKSA6IE5VTEw7Ci0KLQlpZiAoIWZiKSB7Ci0JCXN0YXRlLT52aXNpYmxlID0g
ZmFsc2U7CisJaWYgKCFmYikKIAkJcmV0dXJuIDA7Ci0JfQogCiAJLyogRG9uJ3QgbW9kaWZ5IGFu
b3RoZXIgcGlwZSdzIHBsYW5lICovCiAJaWYgKGludGVsX3BsYW5lLT5waXBlICE9IGludGVsX2Ny
dGMtPnBpcGUpIHsKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl
ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv
L2ludGVsLWdmeAo=