From: Maarten Lankhorst Subject: [PATCH] drm/i915: Unset legacy_cursor_update early in intel_atomic_commit, v2. Date: Mon, 18 Sep 2017 12:12:50 +0200 Message-ID: <20170918101250.6076-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 A286C89FC0 for ; Mon, 18 Sep 2017 10:12:59 +0000 (UTC) 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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org Q29tbWl0IGI0NGQ1YzBjMTA1YSAoImRybS9pOTE1OiBBbHdheXMgd2FpdCBmb3IgZmxpcF9kb25l LCB2Mi4iKSByZW1vdmVkCnRoZSBjYWxsIHRvIHdhaXRfZm9yX3ZibGFua3MgYW5kIHJlcGxhY2Vk IGl0IHdpdGggZmxpcF9kb25lLgoKVW5mb3J0dW5hdGVseSBsZWdhY3lfY3Vyc29yX3VwZGF0ZSB3 YXMgdW5zZXQgdG9vIGxhdGUsIGFuZCB0aGUKcmVwbGFjZW1lbnQgY2FsbCBkcm1fYXRvbWljX2hl bHBlcl93YWl0X2Zvcl9mbGlwX2RvbmUoKSB3YXMKYSBub29wLiBNYWtlIHN1cmUgdGhhdCBpdHMg dW5zZXQgYmVmb3JlIHNldHVwX2NvbW1pdCgpIGlzCmNhbGxlZCB0byBmaXggdGhpcyBpc3N1ZS4K CkNoYW5nZXMgc2luY2UgdjE6Ci0gRm9yY2UgdmJsYW5rIHdhaXQgZm9yIHdhdGVybWFya3Mgbm90 IHlldCBjb252ZXJ0ZWQgdG8gYXRvbWljIHRvby4gKFZpbGxlKQotIFVzZSBmb3JfZWFjaF9uZXdf aW50ZWxfY3J0Y19pbl9zdGF0ZS4gKFZpbGxlKQoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5r aG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KRml4ZXM6IGI0NGQ1YzBj MTA1YSAoImRybS9pOTE1OiBBbHdheXMgd2FpdCBmb3IgZmxpcF9kb25lLCB2Mi4iKQpCdWd6aWxs YTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyNjc1ClRl c3RjYXNlOiBrbXNfY3Vyc29yX2NyYwpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBm ZndsbC5jaD4KQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+ClJl cG9ydGVkLWJ5OiBNYXJ0YSBMw7Zmc3RlZHQgPG1hcnRhLmxvZnN0ZWR0QGludGVsLmNvbT4KQ2M6 IE1hcnRhIEzDtmZzdGVkdCA8bWFydGEubG9mc3RlZHRAaW50ZWwuY29tPgpUZXN0ZWQtYnk6IE1h cnRhIEzDtmZzdGVkdCA8bWFydGEubG9mc3RlZHRAaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOk bMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0NSArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggODU5OWU0MjVhYmIxLi44ZDA1 MTI1NmRhMWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyNTE3LDIx ICsxMjUxNywxMCBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGRldik7CiAJaW50IHJldCA9IDA7CiAKLQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9zZXR1cF9j b21taXQoc3RhdGUsIG5vbmJsb2NrKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCiAJZHJt X2F0b21pY19zdGF0ZV9nZXQoc3RhdGUpOwogCWk5MTVfc3dfZmVuY2VfaW5pdCgmaW50ZWxfc3Rh dGUtPmNvbW1pdF9yZWFkeSwKIAkJCSAgIGludGVsX2F0b21pY19jb21taXRfcmVhZHkpOwogCi0J cmV0ID0gaW50ZWxfYXRvbWljX3ByZXBhcmVfY29tbWl0KGRldiwgc3RhdGUpOwotCWlmIChyZXQp IHsKLQkJRFJNX0RFQlVHX0FUT01JQygiUHJlcGFyaW5nIHN0YXRlIGZhaWxlZCB3aXRoICVpXG4i LCByZXQpOwotCQlpOTE1X3N3X2ZlbmNlX2NvbW1pdCgmaW50ZWxfc3RhdGUtPmNvbW1pdF9yZWFk eSk7Ci0JCXJldHVybiByZXQ7Ci0JfQotCiAJLyoKIAkgKiBUaGUgaW50ZWxfbGVnYWN5X2N1cnNv cl91cGRhdGUoKSBmYXN0IHBhdGggdGFrZXMgY2FyZQogCSAqIG9mIGF2b2lkaW5nIHRoZSB2Ymxh bmsgd2FpdHMgZm9yIHNpbXBsZSBjdXJzb3IKQEAgLTEyNTQwLDE5ICsxMjUyOSwzNyBAQCBzdGF0 aWMgaW50IGludGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkgKiB1 cGRhdGVzIGhhcHBlbiBkdXJpbmcgdGhlIGNvcnJlY3QgZnJhbWVzLiBHZW45KyBoYXZlCiAJICog ZG91YmxlIGJ1ZmZlcmVkIHdhdGVybWFya3MgYW5kIHNvIHNob3VsZG4ndCBuZWVkIHRoaXMuCiAJ ICoKLQkgKiBEbyB0aGlzIGFmdGVyIGRybV9hdG9taWNfaGVscGVyX3NldHVwX2NvbW1pdCgpIGFu ZAotCSAqIGludGVsX2F0b21pY19wcmVwYXJlX2NvbW1pdCgpIGJlY2F1c2Ugd2Ugc3RpbGwgd2Fu dAotCSAqIHRvIHNraXAgdGhlIGZsaXAgYW5kIGZiIGNsZWFudXAgd2FpdHMuIEFsdGhvdWdoIHRo YXQKLQkgKiBkb2VzIHJpc2sgeWFua2luZyB0aGUgbWFwcGluZyBmcm9tIHVuZGVyIHRoZSBkaXNw bGF5Ci0JICogZW5naW5lLgorCSAqIFVuc2V0IHN0YXRlLT5sZWdhY3lfY3Vyc29yX3VwZGF0ZSBi ZWZvcmUgdGhlIGNhbGwgdG8KKwkgKiBkcm1fYXRvbWljX2hlbHBlcl9zZXR1cF9jb21taXQoKSBi ZWNhdXNlIG90aGVyd2lzZQorCSAqIGRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX2ZsaXBfZG9u ZSgpIGlzIGEgbm9vcCBhbmQKKwkgKiB3ZSBnZXQgRklGTyB1bmRlcnJ1bnMgYmVjYXVzZSB3ZSBk aWRuJ3Qgd2FpdAorCSAqIGZvciB2YmxhbmsuCiAJICoKIAkgKiBGSVhNRSBkb2luZyB3YXRlcm1h cmtzIGFuZCBmYiBjbGVhbnVwIGZyb20gYSB2Ymxhbmsgd29ya2VyCiAJICogKGFzc3VtaW5nIHdl IGhhZCBhbnkpIHdvdWxkIHNvbHZlIHRoZXNlIHByb2JsZW1zLgogCSAqLwotCWlmIChJTlRFTF9H RU4oZGV2X3ByaXYpIDwgOSkKLQkJc3RhdGUtPmxlZ2FjeV9jdXJzb3JfdXBkYXRlID0gZmFsc2U7 CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA5ICYmIHN0YXRlLT5sZWdhY3lfY3Vyc29yX3Vw ZGF0ZSkgeworCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGU7CisJCXN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjOworCQlpbnQgaTsKKworCQlmb3JfZWFjaF9uZXdfaW50ZWxf Y3J0Y19pbl9zdGF0ZShpbnRlbF9zdGF0ZSwgY3J0YywgbmV3X2NydGNfc3RhdGUsIGkpCisJCQlp ZiAobmV3X2NydGNfc3RhdGUtPndtLm5lZWRfcG9zdHZibF91cGRhdGUgfHwKKwkJCSAgICBuZXdf Y3J0Y19zdGF0ZS0+dXBkYXRlX3dtX3Bvc3QpCisJCQkJc3RhdGUtPmxlZ2FjeV9jdXJzb3JfdXBk YXRlID0gZmFsc2U7CisJfQorCisJcmV0ID0gaW50ZWxfYXRvbWljX3ByZXBhcmVfY29tbWl0KGRl diwgc3RhdGUpOworCWlmIChyZXQpIHsKKwkJRFJNX0RFQlVHX0FUT01JQygiUHJlcGFyaW5nIHN0 YXRlIGZhaWxlZCB3aXRoICVpXG4iLCByZXQpOworCQlpOTE1X3N3X2ZlbmNlX2NvbW1pdCgmaW50 ZWxfc3RhdGUtPmNvbW1pdF9yZWFkeSk7CisJCXJldHVybiByZXQ7CisJfQorCisJcmV0ID0gZHJt X2F0b21pY19oZWxwZXJfc2V0dXBfY29tbWl0KHN0YXRlLCBub25ibG9jayk7CisJaWYgKCFyZXQp CisJCXJldCA9IGRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoc3RhdGUsIHRydWUpOwogCi0J cmV0ID0gZHJtX2F0b21pY19oZWxwZXJfc3dhcF9zdGF0ZShzdGF0ZSwgdHJ1ZSk7CiAJaWYgKHJl dCkgewogCQlpOTE1X3N3X2ZlbmNlX2NvbW1pdCgmaW50ZWxfc3RhdGUtPmNvbW1pdF9yZWFkeSk7 CiAKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==