From: Maarten Lankhorst Subject: [PATCH 02/15] drm/i915: Handle cursor updating active_planes correctly. Date: Wed, 19 Sep 2018 15:56:31 +0200 Message-ID: <20180919135644.14182-3-maarten.lankhorst@linux.intel.com> References: <20180919135644.14182-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 228226E223 for ; Wed, 19 Sep 2018 13:56:52 +0000 (UTC) In-Reply-To: <20180919135644.14182-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2hpbGUgd2UgbWF5IG5vdCB1cGRhdGUgbmV3X2NydGNfc3RhdGUsIHdlIG1heSBjbGVhciBhY3Rp dmVfcGxhbmVzCmlmIHRoZSBuZXcgY3Vyc29yIHVwZGF0ZSBzdGF0ZSB3aWxsIGRpc2FibGUgdGhl IGN1cnNvciwgYnV0IHdlIGZhaWwKYWZ0ZXIuIElmIHRoaXMgaXMgaW1tZWRpYXRlbHkgZm9sbG93 ZWQgYnkgYSBtb2Rlc2V0IGRpc2FibGUsIHdlIG1heQpzb29uIG5vdCBkaXNhYmxlIHRoZSBwbGFu ZXMgY29ycmVjdGx5IHdoZW4gd2Ugc3RhcnQgZGVwZW5kaW5nIG9uCmFjdGl2ZV9wbGFuZXMuCgpT aWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXgu aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI1 ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25z KCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl eCAyYWMzODFlYjgxMDMuLjdhN2ZmMWQ3NjAzMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwpAQCAtMTM1MTcsMTQgKzEzNTE3LDE2IEBAIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBk YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9s ZF9wbGFuZV9zdGF0ZSwgKm5ld19wbGFuZV9zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmlu dGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKm9sZF9mYjsKLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPSBjcnRjLT5z dGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9CisJCXRvX2ludGVs X2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdf Y3J0Y19zdGF0ZTsKIAogCS8qCiAJICogV2hlbiBjcnRjIGlzIGluYWN0aXZlIG9yIHRoZXJlIGlz IGEgbW9kZXNldCBwZW5kaW5nLAogCSAqIHdhaXQgZm9yIGl0IHRvIGNvbXBsZXRlIGluIHRoZSBz bG93cGF0aAogCSAqLwotCWlmICghY3J0Y19zdGF0ZS0+YWN0aXZlIHx8IG5lZWRzX21vZGVzZXQo Y3J0Y19zdGF0ZSkgfHwKLQkgICAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKS0+dXBk YXRlX3BpcGUpCisJaWYgKCFjcnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCBuZWVkc19tb2Rlc2V0 KCZjcnRjX3N0YXRlLT5iYXNlKSB8fAorCSAgICBjcnRjX3N0YXRlLT51cGRhdGVfcGlwZSkKIAkJ Z290byBzbG93OwogCiAJb2xkX3BsYW5lX3N0YXRlID0gcGxhbmUtPnN0YXRlOwpAQCAtMTM1NTQs NiArMTM1NTYsMTIgQEAgaW50ZWxfbGVnYWN5X2N1cnNvcl91cGRhdGUoc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsCiAJaWYgKCFuZXdfcGxhbmVfc3RhdGUpCiAJCXJldHVybiAtRU5PTUVNOwogCisJ bmV3X2NydGNfc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGludGVsX2NydGNfZHVwbGljYXRl X3N0YXRlKGNydGMpKTsKKwlpZiAoIW5ld19jcnRjX3N0YXRlKSB7CisJCXJldCA9IC1FTk9NRU07 CisJCWdvdG8gb3V0X2ZyZWU7CisJfQorCiAJZHJtX2F0b21pY19zZXRfZmJfZm9yX3BsYW5lKG5l d19wbGFuZV9zdGF0ZSwgZmIpOwogCiAJbmV3X3BsYW5lX3N0YXRlLT5zcmNfeCA9IHNyY194OwpA QCAtMTM1NjUsOSArMTM1NzMsOCBAQCBpbnRlbF9sZWdhY3lfY3Vyc29yX3VwZGF0ZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKIAluZXdfcGxhbmVfc3RhdGUtPmNydGNfdyA9IGNydGNfdzsKIAlu ZXdfcGxhbmVfc3RhdGUtPmNydGNfaCA9IGNydGNfaDsKIAotCXJldCA9IGludGVsX3BsYW5lX2F0 b21pY19jaGVja193aXRoX3N0YXRlKHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpLAot CQkJCQkJICB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKSwgLyogRklYTUUgbmVlZCBh IG5ldyBjcnRjIHN0YXRlPyAqLwotCQkJCQkJICB0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+ c3RhdGUpLAorCXJldCA9IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0YXRlKGNydGNf c3RhdGUsIG5ld19jcnRjX3N0YXRlLAorCQkJCQkJICB0b19pbnRlbF9wbGFuZV9zdGF0ZShvbGRf cGxhbmVfc3RhdGUpLAogCQkJCQkJICB0b19pbnRlbF9wbGFuZV9zdGF0ZShuZXdfcGxhbmVfc3Rh dGUpKTsKIAlpZiAocmV0KQogCQlnb3RvIG91dF9mcmVlOwpAQCAtMTM1ODgsMTEgKzEzNTk1LDEx IEBAIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog CiAJLyogU3dhcCBwbGFuZSBzdGF0ZSAqLwogCXBsYW5lLT5zdGF0ZSA9IG5ld19wbGFuZV9zdGF0 ZTsKKwljcnRjX3N0YXRlLT5hY3RpdmVfcGxhbmVzID0gbmV3X2NydGNfc3RhdGUtPmFjdGl2ZV9w bGFuZXM7CiAKIAlpZiAocGxhbmUtPnN0YXRlLT52aXNpYmxlKSB7CiAJCXRyYWNlX2ludGVsX3Vw ZGF0ZV9wbGFuZShwbGFuZSwgdG9faW50ZWxfY3J0YyhjcnRjKSk7Ci0JCWludGVsX3BsYW5lLT51 cGRhdGVfcGxhbmUoaW50ZWxfcGxhbmUsCi0JCQkJCSAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj LT5zdGF0ZSksCisJCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUoaW50ZWxfcGxhbmUsIGNydGNf c3RhdGUsCiAJCQkJCSAgdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPnN0YXRlKSk7CiAJfSBl bHNlIHsKIAkJdHJhY2VfaW50ZWxfZGlzYWJsZV9wbGFuZShwbGFuZSwgdG9faW50ZWxfY3J0Yyhj cnRjKSk7CkBAIC0xMzYwNCw2ICsxMzYxMSw4IEBAIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRl KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogb3V0X3VubG9jazoKIAltdXRleF91bmxvY2soJmRl dl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIG91dF9mcmVlOgorCWlmIChuZXdfY3J0Y19zdGF0 ZSkKKwkJaW50ZWxfY3J0Y19kZXN0cm95X3N0YXRlKGNydGMsICZuZXdfY3J0Y19zdGF0ZS0+YmFz ZSk7CiAJaWYgKHJldCkKIAkJaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZShwbGFuZSwgbmV3X3Bs YW5lX3N0YXRlKTsKIAllbHNlCi0tIAoyLjE4LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=