From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 2/8] drm/i915: Handle cursor updating
 active_planes correctly, v2.
Date: Thu, 20 Sep 2018 12:27:05 +0200
Message-ID: <20180920102711.4184-3-maarten.lankhorst@linux.intel.com>
References: <20180920102711.4184-1-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 8C3176E581
 for <intel-gfx@lists.freedesktop.org>; Thu, 20 Sep 2018 10:27:25 +0000 (UTC)
In-Reply-To: <20180920102711.4184-1-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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

V2hpbGUgd2UgbWF5IG5vdCB1cGRhdGUgbmV3X2NydGNfc3RhdGUsIHdlIG1heSBjbGVhciBhY3Rp
dmVfcGxhbmVzCmlmIHRoZSBuZXcgY3Vyc29yIHVwZGF0ZSBzdGF0ZSB3aWxsIGRpc2FibGUgdGhl
IGN1cnNvciwgYnV0IHdlIGZhaWwKYWZ0ZXIuIElmIHRoaXMgaXMgaW1tZWRpYXRlbHkgZm9sbG93
ZWQgYnkgYSBtb2Rlc2V0IGRpc2FibGUsIHdlIG1heQpzb29uIG5vdCBkaXNhYmxlIHRoZSBwbGFu
ZXMgY29ycmVjdGx5IHdoZW4gd2Ugc3RhcnQgZGVwZW5kaW5nIG9uCmFjdGl2ZV9wbGFuZXMuCgpD
aGFuZ2VzIHNpbmNlIHYxOgotIENsYXJpZnkgd2h5IHdlIGNhbm5vdCBzd2FwIGNydGNfc3RhdGUu
IChNYXR0KQoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv
cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw
bGF5LmMgfCAzNiArKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg
MjggaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
aXNwbGF5LmMKaW5kZXggNThjMTg4NDgyYzc4Li4wNzhjZGNjYTg4ZTEgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzNTE1LDE0ICsxMzUxNSwxNiBAQCBpbnRlbF9sZWdh
Y3lfY3Vyc29yX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlzdHJ1Y3QgZHJtX3Bs
YW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUsICpuZXdfcGxhbmVfc3RhdGU7CiAJc3RydWN0IGlu
dGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3Qg
ZHJtX2ZyYW1lYnVmZmVyICpvbGRfZmI7Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0
YXRlID0gY3J0Yy0+c3RhdGU7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUg
PQorCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0
Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGU7CiAKIAkvKgogCSAqIFdoZW4gY3J0YyBpcyBpbmFjdGl2
ZSBvciB0aGVyZSBpcyBhIG1vZGVzZXQgcGVuZGluZywKIAkgKiB3YWl0IGZvciBpdCB0byBjb21w
bGV0ZSBpbiB0aGUgc2xvd3BhdGgKIAkgKi8KLQlpZiAoIWNydGNfc3RhdGUtPmFjdGl2ZSB8fCBu
ZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpIHx8Ci0JICAgIHRvX2ludGVsX2NydGNfc3RhdGUoY3J0
Y19zdGF0ZSktPnVwZGF0ZV9waXBlKQorCWlmICghY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgfHwg
bmVlZHNfbW9kZXNldCgmY3J0Y19zdGF0ZS0+YmFzZSkgfHwKKwkgICAgY3J0Y19zdGF0ZS0+dXBk
YXRlX3BpcGUpCiAJCWdvdG8gc2xvdzsKIAogCW9sZF9wbGFuZV9zdGF0ZSA9IHBsYW5lLT5zdGF0
ZTsKQEAgLTEzNTUyLDYgKzEzNTU0LDEyIEBAIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRlKHN0
cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlmICghbmV3X3BsYW5lX3N0YXRlKQogCQlyZXR1cm4g
LUVOT01FTTsKIAorCW5ld19jcnRjX3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShpbnRlbF9j
cnRjX2R1cGxpY2F0ZV9zdGF0ZShjcnRjKSk7CisJaWYgKCFuZXdfY3J0Y19zdGF0ZSkgeworCQly
ZXQgPSAtRU5PTUVNOworCQlnb3RvIG91dF9mcmVlOworCX0KKwogCWRybV9hdG9taWNfc2V0X2Zi
X2Zvcl9wbGFuZShuZXdfcGxhbmVfc3RhdGUsIGZiKTsKIAogCW5ld19wbGFuZV9zdGF0ZS0+c3Jj
X3ggPSBzcmNfeDsKQEAgLTEzNTYzLDkgKzEzNTcxLDggQEAgaW50ZWxfbGVnYWN5X2N1cnNvcl91
cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJbmV3X3BsYW5lX3N0YXRlLT5jcnRjX3cg
PSBjcnRjX3c7CiAJbmV3X3BsYW5lX3N0YXRlLT5jcnRjX2ggPSBjcnRjX2g7CiAKLQlyZXQgPSBp
bnRlbF9wbGFuZV9hdG9taWNfY2hlY2tfd2l0aF9zdGF0ZSh0b19pbnRlbF9jcnRjX3N0YXRlKGNy
dGMtPnN0YXRlKSwKLQkJCQkJCSAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSksIC8q
IEZJWE1FIG5lZWQgYSBuZXcgY3J0YyBzdGF0ZT8gKi8KLQkJCQkJCSAgdG9faW50ZWxfcGxhbmVf
c3RhdGUocGxhbmUtPnN0YXRlKSwKKwlyZXQgPSBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2tfd2l0
aF9zdGF0ZShjcnRjX3N0YXRlLCBuZXdfY3J0Y19zdGF0ZSwKKwkJCQkJCSAgdG9faW50ZWxfcGxh
bmVfc3RhdGUob2xkX3BsYW5lX3N0YXRlKSwKIAkJCQkJCSAgdG9faW50ZWxfcGxhbmVfc3RhdGUo
bmV3X3BsYW5lX3N0YXRlKSk7CiAJaWYgKHJldCkKIAkJZ290byBvdXRfZnJlZTsKQEAgLTEzNTg3
LDEwICsxMzU5NCwyMSBAQCBpbnRlbF9sZWdhY3lfY3Vyc29yX3VwZGF0ZShzdHJ1Y3QgZHJtX3Bs
YW5lICpwbGFuZSwKIAkvKiBTd2FwIHBsYW5lIHN0YXRlICovCiAJcGxhbmUtPnN0YXRlID0gbmV3
X3BsYW5lX3N0YXRlOwogCisJLyoKKwkgKiBXZSBjYW5ub3Qgc3dhcCBjcnRjX3N0YXRlIGFzIGl0
IG1heSBiZSBpbiB1c2UgYnkgYW4gYXRvbWljIGNvbW1pdCBvcgorCSAqIHBhZ2UgZmxpcCB0aGF0
J3MgcnVubmluZyBzaW11bHRhbmVvdXNseS4gSWYgd2Ugc3dhcCBjcnRjX3N0YXRlIGFuZAorCSAq
IGRlc3Ryb3kgdGhlIG9sZCBzdGF0ZSwgd2Ugd2lsbCBjYXVzZSBhIHVzZS1hZnRlci1mcmVlIHRo
ZXJlLgorCSAqCisJICogT25seSB1cGRhdGUgYWN0aXZlX3BsYW5lcywgd2hpY2ggaXMgbmVlZGVk
IGZvciBvdXIgaW50ZXJuYWwKKwkgKiBib29ra2VlcGluZy4gRWl0aGVyIHZhbHVlIHdpbGwgZG8g
dGhlIHJpZ2h0IHRoaW5nIHdoZW4gdXBkYXRpbmcKKwkgKiBwbGFuZXMgYXRvbWljYWxseS4gSWYg
dGhlIGN1cnNvciB3YXMgcGFydCBvZiB0aGUgYXRvbWljIHVwZGF0ZSB0aGVuCisJICogd2Ugd291
bGQgaGF2ZSB0YWtlbiB0aGUgc2xvd3BhdGguCisJICovCisJY3J0Y19zdGF0ZS0+YWN0aXZlX3Bs
YW5lcyA9IG5ld19jcnRjX3N0YXRlLT5hY3RpdmVfcGxhbmVzOworCiAJaWYgKHBsYW5lLT5zdGF0
ZS0+dmlzaWJsZSkgewogCQl0cmFjZV9pbnRlbF91cGRhdGVfcGxhbmUocGxhbmUsIHRvX2ludGVs
X2NydGMoY3J0YykpOwotCQlpbnRlbF9wbGFuZS0+dXBkYXRlX3BsYW5lKGludGVsX3BsYW5lLAot
CQkJCQkgIHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpLAorCQlpbnRlbF9wbGFuZS0+
dXBkYXRlX3BsYW5lKGludGVsX3BsYW5lLCBjcnRjX3N0YXRlLAogCQkJCQkgIHRvX2ludGVsX3Bs
YW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSkpOwogCX0gZWxzZSB7CiAJCXRyYWNlX2ludGVsX2Rpc2Fi
bGVfcGxhbmUocGxhbmUsIHRvX2ludGVsX2NydGMoY3J0YykpOwpAQCAtMTM2MDIsNiArMTM2MjAs
OCBAQCBpbnRlbF9sZWdhY3lfY3Vyc29yX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK
IG91dF91bmxvY2s6CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7
CiBvdXRfZnJlZToKKwlpZiAobmV3X2NydGNfc3RhdGUpCisJCWludGVsX2NydGNfZGVzdHJveV9z
dGF0ZShjcnRjLCAmbmV3X2NydGNfc3RhdGUtPmJhc2UpOwogCWlmIChyZXQpCiAJCWludGVsX3Bs
YW5lX2Rlc3Ryb3lfc3RhdGUocGxhbmUsIG5ld19wbGFuZV9zdGF0ZSk7CiAJZWxzZQotLSAKMi4x
OC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl
bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6
Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK