From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v3 08/19] drm/i915: clean up plane commit
	functions
Date: Mon, 15 Jun 2015 12:33:45 +0200
Message-ID: <1434364436-6366-9-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1434364436-6366-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 58F986E733
 for <intel-gfx@lists.freedesktop.org>; Mon, 15 Jun 2015 03:34:14 -0700 (PDT)
In-Reply-To: <1434364436-6366-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

Tm8gcG9pbnQgaW4gaGlkaW5nIGJlaGluZCBiaWcgaWZzLiBUaGlzIHdpbGwgYmUgdHJ1ZSBtb3N0
IG9mIHRoZSB0aW1lLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4u
bGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9kaXNwbGF5LmMgfCAxNiArKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9zcHJpdGUuYyAgfCAzMyArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDIg
ZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDcxZjYzMTRmYjY0My4uZWM0OTI0ZWVjZDY4
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzc1NiwxNCArMTM3NTYs
MTQgQEAgaW50ZWxfY29tbWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs
CiAJY3J0Yy0+eCA9IHNyYy0+eDEgPj4gMTY7CiAJY3J0Yy0+eSA9IHNyYy0+eTEgPj4gMTY7CiAK
LQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7Ci0JCWlmIChzdGF0ZS0+dmlzaWJsZSkKLQkJCS8q
IEZJWE1FOiBraWxsIHRoaXMgZmFzdGJvb3QgaGFjayAqLwotCQkJaW50ZWxfdXBkYXRlX3BpcGVf
c2l6ZShpbnRlbF9jcnRjKTsKKwlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKKwkJcmV0dXJuOwog
Ci0JCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNydGMsIHBsYW5lLT5m
YiwKLQkJCQkJCSAgICAgICBjcnRjLT54LCBjcnRjLT55KTsKLQl9CisJaWYgKHN0YXRlLT52aXNp
YmxlKQorCQkvKiBGSVhNRToga2lsbCB0aGlzIGZhc3Rib290IGhhY2sgKi8KKwkJaW50ZWxfdXBk
YXRlX3BpcGVfc2l6ZShpbnRlbF9jcnRjKTsKKworCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9w
cmltYXJ5X3BsYW5lKGNydGMsIGZiLCBjcnRjLT54LCBjcnRjLT55KTsKIH0KIAogc3RhdGljIHZv
aWQKQEAgLTE0MDY3LDggKzE0MDY3LDggQEAgaW50ZWxfY29tbWl0X2N1cnNvcl9wbGFuZShzdHJ1
Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogCWludGVsX2NydGMtPmN1cnNvcl9hZGRyID0gYWRkcjsK
IAlpbnRlbF9jcnRjLT5jdXJzb3JfYm8gPSBvYmo7Ci11cGRhdGU6CiAKK3VwZGF0ZToKIAlpZiAo
aW50ZWxfY3J0Yy0+YWN0aXZlKQogCQlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0Yywgc3Rh
dGUtPnZpc2libGUpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
c3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBmNTky
MWI2NTJiOTAuLmM5MDliOGI4Y2U4NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMK
QEAgLTkyNywzMSArOTI3LDI2IEBAIGludGVsX2NvbW1pdF9zcHJpdGVfcGxhbmUoc3RydWN0IGRy
bV9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CiAJc3RydWN0
IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1
Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOwotCWludCBjcnRjX3gsIGNy
dGNfeTsKLQl1bnNpZ25lZCBpbnQgY3J0Y193LCBjcnRjX2g7Ci0JdWludDMyX3Qgc3JjX3gsIHNy
Y195LCBzcmNfdywgc3JjX2g7CiAKIAljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsK
IAlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAogCXBsYW5lLT5mYiA9IGZiOwog
Ci0JaWYgKGludGVsX2NydGMtPmFjdGl2ZSkgewotCQlpZiAoc3RhdGUtPnZpc2libGUpIHsKLQkJ
CWNydGNfeCA9IHN0YXRlLT5kc3QueDE7Ci0JCQljcnRjX3kgPSBzdGF0ZS0+ZHN0LnkxOwotCQkJ
Y3J0Y193ID0gZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5kc3QpOwotCQkJY3J0Y19oID0gZHJtX3Jl
Y3RfaGVpZ2h0KCZzdGF0ZS0+ZHN0KTsKLQkJCXNyY194ID0gc3RhdGUtPnNyYy54MSA+PiAxNjsK
LQkJCXNyY195ID0gc3RhdGUtPnNyYy55MSA+PiAxNjsKLQkJCXNyY193ID0gZHJtX3JlY3Rfd2lk
dGgoJnN0YXRlLT5zcmMpID4+IDE2OwotCQkJc3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnN0YXRl
LT5zcmMpID4+IDE2OwotCQkJaW50ZWxfcGxhbmUtPnVwZGF0ZV9wbGFuZShwbGFuZSwgY3J0Yywg
ZmIsCi0JCQkJCQkgIGNydGNfeCwgY3J0Y195LCBjcnRjX3csIGNydGNfaCwKLQkJCQkJCSAgc3Jj
X3gsIHNyY195LCBzcmNfdywgc3JjX2gpOwotCQl9IGVsc2UgewotCQkJaW50ZWxfcGxhbmUtPmRp
c2FibGVfcGxhbmUocGxhbmUsIGNydGMsIGZhbHNlKTsKLQkJfQorCWlmICghaW50ZWxfY3J0Yy0+
YWN0aXZlKQorCQlyZXR1cm47CisKKwlpZiAoc3RhdGUtPnZpc2libGUpIHsKKwkJaW50ZWxfcGxh
bmUtPnVwZGF0ZV9wbGFuZShwbGFuZSwgY3J0YywgZmIsCisJCQkJCSAgc3RhdGUtPmRzdC54MSwg
c3RhdGUtPmRzdC55MSwKKwkJCQkJICBkcm1fcmVjdF93aWR0aCgmc3RhdGUtPmRzdCksCisJCQkJ
CSAgZHJtX3JlY3RfaGVpZ2h0KCZzdGF0ZS0+ZHN0KSwKKwkJCQkJICBzdGF0ZS0+c3JjLngxID4+
IDE2LAorCQkJCQkgIHN0YXRlLT5zcmMueTEgPj4gMTYsCisJCQkJCSAgZHJtX3JlY3Rfd2lkdGgo
JnN0YXRlLT5zcmMpID4+IDE2LAorCQkJCQkgIGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPnNyYykg
Pj4gMTYpOworCX0gZWxzZSB7CisJCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lKHBsYW5lLCBj
cnRjLCBmYWxzZSk7CiAJfQogfQogCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA
bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h
bi9saXN0aW5mby9pbnRlbC1nZngK