From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 15/24] drm/i915: clean up plane commit functions
Date: Mon,  1 Jun 2015 15:27:18 +0200
Message-ID: <1433165247-15928-16-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1433165247-15928-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 2CC126E5FE
 for <intel-gfx@lists.freedesktop.org>; Mon,  1 Jun 2015 06:27:45 -0700 (PDT)
In-Reply-To: <1433165247-15928-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

SWYgYSBwbGFuZSBpcyBwYXJ0IG9mIHRoZSBzdGF0ZSBidXQgb2xkX3N0YXRlLT5mYiBpcyBudWxs
IGFuZApzdGF0ZS0+ZmIgaXMgbnVsbCB0aGUgdXBkYXRlIGlzIGEgbm9vcC4KClNpZ25lZC1vZmYt
Ynk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+
Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzAgKysrKysrKysr
KysrKysrKysrKystLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu
YyAgfCAzNiArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hh
bmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jCmluZGV4IGRlZjI2ODg5YTU4Zi4uMTJkYTk3ZDlmMzg2IDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzQ5MSwxOCArMTM0OTEsMjMgQEAgaW50
ZWxfY29tbWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJY3J0YyA9
IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7CiAJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo
Y3J0Yyk7CiAKKwlpZiAoIWNydGMpCisJCXJldHVybjsKKwogCXBsYW5lLT5mYiA9IGZiOwogCWNy
dGMtPnggPSBzcmMtPngxID4+IDE2OwogCWNydGMtPnkgPSBzcmMtPnkxID4+IDE2OwogCi0JaWYg
KGludGVsX2NydGMtPmFjdGl2ZSkgewotCQlpZiAoc3RhdGUtPnZpc2libGUpCi0JCQkvKiBGSVhN
RToga2lsbCB0aGlzIGZhc3Rib290IGhhY2sgKi8KLQkJCWludGVsX3VwZGF0ZV9waXBlX3NpemUo
aW50ZWxfY3J0Yyk7CisJaWYgKCFpbnRlbF9jcnRjLT5hY3RpdmUpCisJCXJldHVybjsKKworCWlm
IChzdGF0ZS0+dmlzaWJsZSkKKwkJLyogRklYTUU6IGtpbGwgdGhpcyBmYXN0Ym9vdCBoYWNrICov
CisJCWludGVsX3VwZGF0ZV9waXBlX3NpemUoaW50ZWxfY3J0Yyk7CisJZWxzZQorCQlmYiA9IE5V
TEw7CiAKLQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3ByaW1hcnlfcGxhbmUoY3J0YywgcGxh
bmUtPmZiLAotCQkJCQkJICAgICAgIGNydGMtPngsIGNydGMtPnkpOwotCX0KKwlkZXZfcHJpdi0+
ZGlzcGxheS51cGRhdGVfcHJpbWFyeV9wbGFuZShjcnRjLCBmYiwgY3J0Yy0+eCwgY3J0Yy0+eSk7
CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC0xMzc0NiwxMCArMTM3NTEsMTYgQEAgaW50ZWxfY29tbWl0
X2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAljcnRjID0gY3J0YyA/IGNy
dGMgOiBwbGFuZS0+Y3J0YzsKIAlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAor
CWlmICghY3J0YykKKwkJcmV0dXJuOworCiAJcGxhbmUtPmZiID0gc3RhdGUtPmJhc2UuZmI7CiAJ
Y3J0Yy0+Y3Vyc29yX3ggPSBzdGF0ZS0+YmFzZS5jcnRjX3g7CiAJY3J0Yy0+Y3Vyc29yX3kgPSBz
dGF0ZS0+YmFzZS5jcnRjX3k7CiAKKwlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKKwkJcmV0dXJu
OworCiAJaWYgKGludGVsX2NydGMtPmN1cnNvcl9ibyA9PSBvYmopCiAJCWdvdG8gdXBkYXRlOwog
CkBAIC0xMzc2MiwxMCArMTM3NzMsOSBAQCBpbnRlbF9jb21taXRfY3Vyc29yX3BsYW5lKHN0cnVj
dCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJaW50ZWxfY3J0Yy0+Y3Vyc29yX2FkZHIgPSBhZGRyOwog
CWludGVsX2NydGMtPmN1cnNvcl9ibyA9IG9iajsKLXVwZGF0ZToKIAotCWlmIChpbnRlbF9jcnRj
LT5hY3RpdmUpCi0JCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihjcnRjLCBzdGF0ZS0+dmlzaWJs
ZSk7Cit1cGRhdGU6CisJaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIHN0YXRlLT52aXNp
YmxlKTsKIH0KIAogc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX2N1cnNvcl9wbGFuZV9j
cmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl
LmMKaW5kZXggZjU5MjFiNjUyYjkwLi42YjVkMjVmMmE5MGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX3Nwcml0ZS5jCkBAIC05MjcsMzEgKzkyNywyOSBAQCBpbnRlbF9jb21taXRfc3ByaXRlX3Bs
YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j
cnRjOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShw
bGFuZSk7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+YmFzZS5mYjsKLQlp
bnQgY3J0Y194LCBjcnRjX3k7Ci0JdW5zaWduZWQgaW50IGNydGNfdywgY3J0Y19oOwotCXVpbnQz
Ml90IHNyY194LCBzcmNfeSwgc3JjX3csIHNyY19oOwogCiAJY3J0YyA9IGNydGMgPyBjcnRjIDog
cGxhbmUtPmNydGM7CiAJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAKKwlpZiAo
IWNydGMpCisJCXJldHVybjsKKwogCXBsYW5lLT5mYiA9IGZiOwogCi0JaWYgKGludGVsX2NydGMt
PmFjdGl2ZSkgewotCQlpZiAoc3RhdGUtPnZpc2libGUpIHsKLQkJCWNydGNfeCA9IHN0YXRlLT5k
c3QueDE7Ci0JCQljcnRjX3kgPSBzdGF0ZS0+ZHN0LnkxOwotCQkJY3J0Y193ID0gZHJtX3JlY3Rf
d2lkdGgoJnN0YXRlLT5kc3QpOwotCQkJY3J0Y19oID0gZHJtX3JlY3RfaGVpZ2h0KCZzdGF0ZS0+
ZHN0KTsKLQkJCXNyY194ID0gc3RhdGUtPnNyYy54MSA+PiAxNjsKLQkJCXNyY195ID0gc3RhdGUt
PnNyYy55MSA+PiAxNjsKLQkJCXNyY193ID0gZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5zcmMpID4+
IDE2OwotCQkJc3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnN0YXRlLT5zcmMpID4+IDE2OwotCQkJ
aW50ZWxfcGxhbmUtPnVwZGF0ZV9wbGFuZShwbGFuZSwgY3J0YywgZmIsCi0JCQkJCQkgIGNydGNf
eCwgY3J0Y195LCBjcnRjX3csIGNydGNfaCwKLQkJCQkJCSAgc3JjX3gsIHNyY195LCBzcmNfdywg
c3JjX2gpOwotCQl9IGVsc2UgewotCQkJaW50ZWxfcGxhbmUtPmRpc2FibGVfcGxhbmUocGxhbmUs
IGNydGMsIGZhbHNlKTsKLQkJfQorCWlmICghaW50ZWxfY3J0Yy0+YWN0aXZlKQorCQlyZXR1cm47
CisKKwlpZiAoc3RhdGUtPnZpc2libGUpIHsKKwkJaW50ZWxfcGxhbmUtPnVwZGF0ZV9wbGFuZShw
bGFuZSwgY3J0YywgZmIsCisJCQkJCSAgc3RhdGUtPmRzdC54MSwgc3RhdGUtPmRzdC55MSwKKwkJ
CQkJICBkcm1fcmVjdF93aWR0aCgmc3RhdGUtPmRzdCksCisJCQkJCSAgZHJtX3JlY3RfaGVpZ2h0
KCZzdGF0ZS0+ZHN0KSwKKwkJCQkJICBzdGF0ZS0+c3JjLngxID4+IDE2LAorCQkJCQkgIHN0YXRl
LT5zcmMueTEgPj4gMTYsCisJCQkJCSAgZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5zcmMpID4+IDE2
LAorCQkJCQkgIGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPnNyYykgPj4gMTYpOworCX0gZWxzZSB7
CisJCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lKHBsYW5lLCBjcnRjLCBmYWxzZSk7CiAJfQog
fQogCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au
b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n
ZngK