From: Maarten Lankhorst Subject: [PATCH 1/2] drm/i915: Unset legacy_cursor_update early in intel_atomic_commit, v3. Date: Tue, 19 Sep 2017 14:14:18 +0200 Message-ID: <20170919121419.13708-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id B345489E2C for ; Tue, 19 Sep 2017 12:14:25 +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 aW50ZWxfY3J0Y19pbl9zdGF0ZS4gKFZpbGxlKQpDaGFuZ2VzIHNpbmNlIHYyOgotIE1vdmUgdGhl IG9wdGltaXphdGlvbiB0byBhIHNlcGFyYXRlIGNvbW1pdC4gKFZpbGxlKQoKU2lnbmVkLW9mZi1i eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K Rml4ZXM6IGI0NGQ1YzBjMTA1YSAoImRybS9pOTE1OiBBbHdheXMgd2FpdCBmb3IgZmxpcF9kb25l LCB2Mi4iKQpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTAyNjc1ClRlc3RjYXNlOiBrbXNfY3Vyc29yX2NyYwpDYzogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBsaW51 eC5pbnRlbC5jb20+ClJlcG9ydGVkLWJ5OiBNYXJ0YSBMw7Zmc3RlZHQgPG1hcnRhLmxvZnN0ZWR0 QGludGVsLmNvbT4KQ2M6IE1hcnRhIEzDtmZzdGVkdCA8bWFydGEubG9mc3RlZHRAaW50ZWwuY29t PgpUZXN0ZWQtYnk6IE1hcnRhIEzDtmZzdGVkdCA8bWFydGEubG9mc3RlZHRAaW50ZWwuY29tPgpD YzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAzMyArKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxNyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggODU5OWU0 MjVhYmIxLi5hODVjYTE5YTBjNDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTEyNTE3LDIxICsxMjUxNywxMCBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jb21taXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7CiAJaW50IHJldCA9IDA7CiAKLQlyZXQgPSBkcm1fYXRvbWljX2hl bHBlcl9zZXR1cF9jb21taXQoc3RhdGUsIG5vbmJsb2NrKTsKLQlpZiAocmV0KQotCQlyZXR1cm4g cmV0OwotCiAJZHJtX2F0b21pY19zdGF0ZV9nZXQoc3RhdGUpOwogCWk5MTVfc3dfZmVuY2VfaW5p dCgmaW50ZWxfc3RhdGUtPmNvbW1pdF9yZWFkeSwKIAkJCSAgIGludGVsX2F0b21pY19jb21taXRf cmVhZHkpOwogCi0JcmV0ID0gaW50ZWxfYXRvbWljX3ByZXBhcmVfY29tbWl0KGRldiwgc3RhdGUp OwotCWlmIChyZXQpIHsKLQkJRFJNX0RFQlVHX0FUT01JQygiUHJlcGFyaW5nIHN0YXRlIGZhaWxl ZCB3aXRoICVpXG4iLCByZXQpOwotCQlpOTE1X3N3X2ZlbmNlX2NvbW1pdCgmaW50ZWxfc3RhdGUt PmNvbW1pdF9yZWFkeSk7Ci0JCXJldHVybiByZXQ7Ci0JfQotCiAJLyoKIAkgKiBUaGUgaW50ZWxf bGVnYWN5X2N1cnNvcl91cGRhdGUoKSBmYXN0IHBhdGggdGFrZXMgY2FyZQogCSAqIG9mIGF2b2lk aW5nIHRoZSB2Ymxhbmsgd2FpdHMgZm9yIHNpbXBsZSBjdXJzb3IKQEAgLTEyNTQwLDExICsxMjUy OSwxMSBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAkgKiB1cGRhdGVzIGhhcHBlbiBkdXJpbmcgdGhlIGNvcnJlY3QgZnJhbWVzLiBHZW45 KyBoYXZlCiAJICogZG91YmxlIGJ1ZmZlcmVkIHdhdGVybWFya3MgYW5kIHNvIHNob3VsZG4ndCBu ZWVkIHRoaXMuCiAJICoKLQkgKiBEbyB0aGlzIGFmdGVyIGRybV9hdG9taWNfaGVscGVyX3NldHVw X2NvbW1pdCgpIGFuZAotCSAqIGludGVsX2F0b21pY19wcmVwYXJlX2NvbW1pdCgpIGJlY2F1c2Ug d2Ugc3RpbGwgd2FudAotCSAqIHRvIHNraXAgdGhlIGZsaXAgYW5kIGZiIGNsZWFudXAgd2FpdHMu IEFsdGhvdWdoIHRoYXQKLQkgKiBkb2VzIHJpc2sgeWFua2luZyB0aGUgbWFwcGluZyBmcm9tIHVu ZGVyIHRoZSBkaXNwbGF5Ci0JICogZW5naW5lLgorCSAqIFVuc2V0IHN0YXRlLT5sZWdhY3lfY3Vy c29yX3VwZGF0ZSBiZWZvcmUgdGhlIGNhbGwgdG8KKwkgKiBkcm1fYXRvbWljX2hlbHBlcl9zZXR1 cF9jb21taXQoKSBiZWNhdXNlIG90aGVyd2lzZQorCSAqIGRybV9hdG9taWNfaGVscGVyX3dhaXRf Zm9yX2ZsaXBfZG9uZSgpIGlzIGEgbm9vcCBhbmQKKwkgKiB3ZSBnZXQgRklGTyB1bmRlcnJ1bnMg YmVjYXVzZSB3ZSBkaWRuJ3Qgd2FpdAorCSAqIGZvciB2YmxhbmsuCiAJICoKIAkgKiBGSVhNRSBk b2luZyB3YXRlcm1hcmtzIGFuZCBmYiBjbGVhbnVwIGZyb20gYSB2Ymxhbmsgd29ya2VyCiAJICog KGFzc3VtaW5nIHdlIGhhZCBhbnkpIHdvdWxkIHNvbHZlIHRoZXNlIHByb2JsZW1zLgpAQCAtMTI1 NTIsNyArMTI1NDEsMTcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA5KQogCQlzdGF0ZS0+ bGVnYWN5X2N1cnNvcl91cGRhdGUgPSBmYWxzZTsKIAotCXJldCA9IGRybV9hdG9taWNfaGVscGVy X3N3YXBfc3RhdGUoc3RhdGUsIHRydWUpOworCXJldCA9IGludGVsX2F0b21pY19wcmVwYXJlX2Nv bW1pdChkZXYsIHN0YXRlKTsKKwlpZiAocmV0KSB7CisJCURSTV9ERUJVR19BVE9NSUMoIlByZXBh cmluZyBzdGF0ZSBmYWlsZWQgd2l0aCAlaVxuIiwgcmV0KTsKKwkJaTkxNV9zd19mZW5jZV9jb21t aXQoJmludGVsX3N0YXRlLT5jb21taXRfcmVhZHkpOworCQlyZXR1cm4gcmV0OworCX0KKworCXJl dCA9IGRybV9hdG9taWNfaGVscGVyX3NldHVwX2NvbW1pdChzdGF0ZSwgbm9uYmxvY2spOworCWlm ICghcmV0KQorCQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9zd2FwX3N0YXRlKHN0YXRlLCB0cnVl KTsKKwogCWlmIChyZXQpIHsKIAkJaTkxNV9zd19mZW5jZV9jb21taXQoJmludGVsX3N0YXRlLT5j b21taXRfcmVhZHkpOwogCi0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=