From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 5/7] drm/i915: Use the plane state for cursor
	updates.
Date: Thu,  7 Jan 2016 11:54:10 +0100
Message-ID: <1452164052-21752-6-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1452164052-21752-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 ESMTPS id 8CD6E8A2BF
 for <intel-gfx@lists.freedesktop.org>; Thu,  7 Jan 2016 02:55:13 -0800 (PST)
In-Reply-To: <1452164052-21752-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

Q3Vyc29yIHBsYW5lcyBncmFiIHRoZSBzdGF0ZSBmcm9tIHBsYW5lLT5zdGF0ZSBpbnN0ZWFkIG9m
IHRoZSBzdGF0ZQp0aGF0IHdhcyBwYXNzZWQuIFRoZSBvbmx5IHVwZGF0ZXMgYXJlIGF0b21pYyBu
b3csIHNvIHVzZSB0aGUgcGxhbmVfc3RhdGUKdGhhdCdzIHBhc3NlZCBpbi4KClNpZ25lZC1vZmYt
Ynk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+
Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgOTIgKysrKysrKysr
KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDYgaW5zZXJ0aW9u
cygrKSwgNDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu
ZGV4IDdlYTQ5ZDVlMmNlMC4uZjdjMjkzNjM4ZGY0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jCkBAIC0xMDA3NiwxNiArMTAwNzYsMTcgQEAgc3RhdGljIGJvb2wgaGFzd2VsbF9n
ZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJcmV0dXJuIHRydWU7CiB9
CiAKLXN0YXRpYyB2b2lkIGk4NDVfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgZHJtX2NydGMgKmNydGMs
IHUzMiBiYXNlLCBib29sIG9uKQorc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfY3Vyc29yKHN0cnVj
dCBkcm1fY3J0YyAqY3J0YywgdTMyIGJhc2UsCisJCQkgICAgICAgY29uc3Qgc3RydWN0IGludGVs
X3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g
Y3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2
X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj
KGNydGMpOwogCXVpbnQzMl90IGNudGwgPSAwLCBzaXplID0gMDsKIAotCWlmIChvbikgewotCQl1
bnNpZ25lZCBpbnQgd2lkdGggPSBpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+c3RhdGUtPmNydGNf
dzsKLQkJdW5zaWduZWQgaW50IGhlaWdodCA9IGludGVsX2NydGMtPmJhc2UuY3Vyc29yLT5zdGF0
ZS0+Y3J0Y19oOworCWlmIChwbGFuZV9zdGF0ZSAmJiBwbGFuZV9zdGF0ZS0+dmlzaWJsZSkgewor
CQl1bnNpZ25lZCBpbnQgd2lkdGggPSBwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX3c7CisJCXVuc2ln
bmVkIGludCBoZWlnaHQgPSBwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX2g7CiAJCXVuc2lnbmVkIGlu
dCBzdHJpZGUgPSByb3VuZHVwX3Bvd19vZl90d28od2lkdGgpICogNDsKIAogCQlzd2l0Y2ggKHN0
cmlkZSkgewpAQCAtMTAxMzgsNyArMTAxMzksOCBAQCBzdGF0aWMgdm9pZCBpODQ1X3VwZGF0ZV9j
dXJzb3Ioc3RydWN0IGRybV9jcnRjICpjcnRjLCB1MzIgYmFzZSwgYm9vbCBvbikKIAl9CiB9CiAK
LXN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHUz
MiBiYXNlLCBib29sIG9uKQorc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfY3Vyc29yKHN0cnVjdCBk
cm1fY3J0YyAqY3J0YywgdTMyIGJhc2UsCisJCQkgICAgICAgY29uc3Qgc3RydWN0IGludGVsX3Bs
YW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0
Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By
aXZhdGU7CkBAIC0xMDE0Niw5ICsxMDE0OCw5IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX2N1
cnNvcihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHUzMiBiYXNlLCBib29sIG9uKQogCWludCBwaXBl
ID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAl1aW50MzJfdCBjbnRsID0gMDsKIAotCWlmIChvbikgewor
CWlmIChwbGFuZV9zdGF0ZSAmJiBwbGFuZV9zdGF0ZS0+dmlzaWJsZSkgewogCQljbnRsID0gTUNV
UlNPUl9HQU1NQV9FTkFCTEU7Ci0JCXN3aXRjaCAoaW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0
YXRlLT5jcnRjX3cpIHsKKwkJc3dpdGNoIChwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX3cpIHsKIAkJ
CWNhc2UgNjQ6CiAJCQkJY250bCB8PSBDVVJTT1JfTU9ERV82NF9BUkdCX0FYOwogCQkJCWJyZWFr
OwpAQCAtMTAxNTksMTcgKzEwMTYxLDE3IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX2N1cnNv
cihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHUzMiBiYXNlLCBib29sIG9uKQogCQkJCWNudGwgfD0g
Q1VSU09SX01PREVfMjU2X0FSR0JfQVg7CiAJCQkJYnJlYWs7CiAJCQlkZWZhdWx0OgotCQkJCU1J
U1NJTkdfQ0FTRShpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+c3RhdGUtPmNydGNfdyk7CisJCQkJ
TUlTU0lOR19DQVNFKHBsYW5lX3N0YXRlLT5iYXNlLmNydGNfdyk7CiAJCQkJcmV0dXJuOwogCQl9
CiAJCWNudGwgfD0gcGlwZSA8PCAyODsgLyogQ29ubmVjdCB0byBjb3JyZWN0IHBpcGUgKi8KIAog
CQlpZiAoSEFTX0RESShkZXYpKQogCQkJY250bCB8PSBDVVJTT1JfUElQRV9DU0NfRU5BQkxFOwot
CX0KIAotCWlmIChjcnRjLT5jdXJzb3ItPnN0YXRlLT5yb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFU
RV8xODApKQotCQljbnRsIHw9IENVUlNPUl9ST1RBVEVfMTgwOworCQlpZiAocGxhbmVfc3RhdGUt
PmJhc2Uucm90YXRpb24gPT0gQklUKERSTV9ST1RBVEVfMTgwKSkKKwkJCWNudGwgfD0gQ1VSU09S
X1JPVEFURV8xODA7CisJfQogCiAJaWYgKGludGVsX2NydGMtPmN1cnNvcl9jbnRsICE9IGNudGwp
IHsKIAkJSTkxNV9XUklURShDVVJDTlRSKHBpcGUpLCBjbnRsKTsKQEAgLTEwMTg2LDQ0ICsxMDE4
OCw0NSBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9jdXJzb3Ioc3RydWN0IGRybV9jcnRjICpj
cnRjLCB1MzIgYmFzZSwgYm9vbCBvbikKIAogLyogSWYgbm8tcGFydCBvZiB0aGUgY3Vyc29yIGlz
IHZpc2libGUgb24gdGhlIGZyYW1lYnVmZmVyLCB0aGVuIHRoZSBHUFUgbWF5IGhhbmcuLi4gKi8K
IHN0YXRpYyB2b2lkIGludGVsX2NydGNfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgZHJtX2NydGMgKmNy
dGMsCi0JCQkJICAgICBib29sIG9uKQorCQkJCSAgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5l
X3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+
ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh
dGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMp
OwogCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl
ICpjdXJzb3Jfc3RhdGUgPSBjcnRjLT5jdXJzb3ItPnN0YXRlOwotCWludCB4ID0gY3Vyc29yX3N0
YXRlLT5jcnRjX3g7Ci0JaW50IHkgPSBjdXJzb3Jfc3RhdGUtPmNydGNfeTsKLQl1MzIgYmFzZSA9
IDAsIHBvcyA9IDA7CisJdTMyIGJhc2UgPSBpbnRlbF9jcnRjLT5jdXJzb3JfYWRkcjsKKwl1MzIg
cG9zID0gMDsKIAotCWJhc2UgPSBpbnRlbF9jcnRjLT5jdXJzb3JfYWRkcjsKKwlpZiAocGxhbmVf
c3RhdGUpIHsKKwkJaW50IHggPSBwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX3g7CisJCWludCB5ID0g
cGxhbmVfc3RhdGUtPmJhc2UuY3J0Y195OwogCi0JaWYgKHggPCAwKSB7Ci0JCXBvcyB8PSBDVVJT
T1JfUE9TX1NJR04gPDwgQ1VSU09SX1hfU0hJRlQ7Ci0JCXggPSAteDsKLQl9Ci0JcG9zIHw9IHgg
PDwgQ1VSU09SX1hfU0hJRlQ7CisJCWlmICh4IDwgMCkgeworCQkJcG9zIHw9IENVUlNPUl9QT1Nf
U0lHTiA8PCBDVVJTT1JfWF9TSElGVDsKKwkJCXggPSAteDsKKwkJfQorCQlwb3MgfD0geCA8PCBD
VVJTT1JfWF9TSElGVDsKIAotCWlmICh5IDwgMCkgewotCQlwb3MgfD0gQ1VSU09SX1BPU19TSUdO
IDw8IENVUlNPUl9ZX1NISUZUOwotCQl5ID0gLXk7CisJCWlmICh5IDwgMCkgeworCQkJcG9zIHw9
IENVUlNPUl9QT1NfU0lHTiA8PCBDVVJTT1JfWV9TSElGVDsKKwkJCXkgPSAteTsKKwkJfQorCQlw
b3MgfD0geSA8PCBDVVJTT1JfWV9TSElGVDsKKworCQkvKiBJTEsrIGRvIHRoaXMgYXV0b21hZ2lj
YWxseSAqLworCQlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXYpICYmCisJCSAgICBwbGFuZV9zdGF0
ZS0+YmFzZS5yb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKSB7CisJCQliYXNlICs9IChw
bGFuZV9zdGF0ZS0+YmFzZS5jcnRjX2ggKgorCQkJCSBwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX3cg
LSAxKSAqIDQ7CisJCX0KIAl9Ci0JcG9zIHw9IHkgPDwgQ1VSU09SX1lfU0hJRlQ7CiAKIAlJOTE1
X1dSSVRFKENVUlBPUyhwaXBlKSwgcG9zKTsKIAotCS8qIElMSysgZG8gdGhpcyBhdXRvbWFnaWNh
bGx5ICovCi0JaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2KSAmJgotCSAgICBjcnRjLT5jdXJzb3It
PnN0YXRlLT5yb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKSB7Ci0JCWJhc2UgKz0gKGN1
cnNvcl9zdGF0ZS0+Y3J0Y19oICoKLQkJCSBjdXJzb3Jfc3RhdGUtPmNydGNfdyAtIDEpICogNDsK
LQl9Ci0KIAlpZiAoSVNfODQ1RyhkZXYpIHx8IElTX0k4NjVHKGRldikpCi0JCWk4NDVfdXBkYXRl
X2N1cnNvcihjcnRjLCBiYXNlLCBvbik7CisJCWk4NDVfdXBkYXRlX2N1cnNvcihjcnRjLCBiYXNl
LCBwbGFuZV9zdGF0ZSk7CiAJZWxzZQotCQlpOXh4X3VwZGF0ZV9jdXJzb3IoY3J0YywgYmFzZSwg
b24pOworCQlpOXh4X3VwZGF0ZV9jdXJzb3IoY3J0YywgYmFzZSwgcGxhbmVfc3RhdGUpOwogfQog
CiBzdGF0aWMgYm9vbCBjdXJzb3Jfc2l6ZV9vayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LApAQCAt
MTQxODAsMjIgKzE0MTgzLDIwIEBAIGludGVsX2Rpc2FibGVfY3Vyc29yX3BsYW5lKHN0cnVjdCBk
cm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50
ZWxfY3J0YyhjcnRjKTsKIAogCWludGVsX2NydGMtPmN1cnNvcl9hZGRyID0gMDsKLQlpbnRlbF9j
cnRjX3VwZGF0ZV9jdXJzb3IoY3J0YywgZmFsc2UpOworCWludGVsX2NydGNfdXBkYXRlX2N1cnNv
cihjcnRjLCBOVUxMKTsKIH0KIAogc3RhdGljIHZvaWQKLWludGVsX2NvbW1pdF9jdXJzb3JfcGxh
bmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkgIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0
ZSAqc3RhdGUpCitpbnRlbF91cGRhdGVfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBs
YW5lLAorCQkJICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJ
CSAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJt
X2NydGMgKmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRjOworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9
IGNydGNfc3RhdGUtPmJhc2UuY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9
IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5k
ZXY7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CiAJc3RydWN0IGRybV9pOTE1X2dl
bV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihzdGF0ZS0+YmFzZS5mYik7CiAJdWludDMyX3Qg
YWRkcjsKIAotCWNydGMgPSBjcnRjID8gY3J0YyA6IHBsYW5lLT5jcnRjOwotCWludGVsX2NydGMg
PSB0b19pbnRlbF9jcnRjKGNydGMpOwotCiAJaWYgKCFvYmopCiAJCWFkZHIgPSAwOwogCWVsc2Ug
aWYgKCFJTlRFTF9JTkZPKGRldiktPmN1cnNvcl9uZWVkc19waHlzaWNhbCkKQEAgLTE0MjA0LDgg
KzE0MjA1LDcgQEAgaW50ZWxfY29tbWl0X2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw
bGFuZSwKIAkJYWRkciA9IG9iai0+cGh5c19oYW5kbGUtPmJ1c2FkZHI7CiAKIAlpbnRlbF9jcnRj
LT5jdXJzb3JfYWRkciA9IGFkZHI7Ci0KLQlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0Yywg
c3RhdGUtPnZpc2libGUpOworCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihjcnRjLCBzdGF0ZSk7
CiB9CiAKIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9jdXJzb3JfcGxhbmVfY3JlYXRl
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCkBAIC0xNDIzMSw3ICsxNDIzMSw3IEBAIHN0YXRpYyBz
dHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9jdXJzb3JfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2
aWNlICpkZXYsCiAJY3Vyc29yLT5wbGFuZSA9IHBpcGU7CiAJY3Vyc29yLT5mcm9udGJ1ZmZlcl9i
aXQgPSBJTlRFTF9GUk9OVEJVRkZFUl9DVVJTT1IocGlwZSk7CiAJY3Vyc29yLT5jaGVja19wbGFu
ZSA9IGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZTsKLQljdXJzb3ItPmNvbW1pdF9wbGFuZSA9IGlu
dGVsX2NvbW1pdF9jdXJzb3JfcGxhbmU7CisJY3Vyc29yLT51cGRhdGVfcGxhbmUgPSBpbnRlbF91
cGRhdGVfY3Vyc29yX3BsYW5lOwogCWN1cnNvci0+ZGlzYWJsZV9wbGFuZSA9IGludGVsX2Rpc2Fi
bGVfY3Vyc29yX3BsYW5lOwogCiAJZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KGRldiwgJmN1cnNv
ci0+YmFzZSwgMCwKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl
ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv
L2ludGVsLWdmeAo=