From: Maarten Lankhorst Subject: [PATCH] drm/i915: Unset legacy_cursor_update early in intel_atomic_commit Date: Wed, 13 Sep 2017 11:25:54 +0200 Message-ID: <20170913092554.22976-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 2D2CA6E7B6 for ; Wed, 13 Sep 2017 09:26:02 +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 ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51 eC5pbnRlbC5jb20+CkZpeGVzOiBiNDRkNWMwYzEwNWEgKCJkcm0vaTkxNTogQWx3YXlzIHdhaXQg Zm9yIGZsaXBfZG9uZSwgdjIuIikKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5v cmcvc2hvd19idWcuY2dpP2lkPTEwMjY3NQpUZXN0Y2FzZToga21zX2N1cnNvcl9jcmMKQ2M6IERh bmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBKYW5pIE5pa3VsYSA8amFu aS5uaWt1bGFAbGludXguaW50ZWwuY29tPgpSZXBvcnRlZC1ieTogTWFydGEgTMO2ZnN0ZWR0IDxt YXJ0YS5sb2ZzdGVkdEBpbnRlbC5jb20+CkNjOiBNYXJ0YSBMw7Zmc3RlZHQgPG1hcnRhLmxvZnN0 ZWR0QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCA0NCArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyNCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggYmE3NmIyZGI5MzljLi5jMWRhNDhkNzdjOGUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyNDEyLDIzICsxMjQxMiwxNCBAQCBzdGF0aWMg aW50IGludGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHsKIAlzdHJ1 Y3QgaW50ZWxfYXRvbWljX3N0YXRlICppbnRlbF9zdGF0ZSA9IHRvX2ludGVsX2F0b21pY19zdGF0 ZShzdGF0ZSk7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShk ZXYpOwotCWludCByZXQgPSAwOwotCi0JcmV0ID0gZHJtX2F0b21pY19oZWxwZXJfc2V0dXBfY29t bWl0KHN0YXRlLCBub25ibG9jayk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKKwlzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsK KwlpbnQgaSwgcmV0ID0gMDsKIAogCWRybV9hdG9taWNfc3RhdGVfZ2V0KHN0YXRlKTsKIAlpOTE1 X3N3X2ZlbmNlX2luaXQoJmludGVsX3N0YXRlLT5jb21taXRfcmVhZHksCiAJCQkgICBpbnRlbF9h dG9taWNfY29tbWl0X3JlYWR5KTsKIAotCXJldCA9IGludGVsX2F0b21pY19wcmVwYXJlX2NvbW1p dChkZXYsIHN0YXRlKTsKLQlpZiAocmV0KSB7Ci0JCURSTV9ERUJVR19BVE9NSUMoIlByZXBhcmlu ZyBzdGF0ZSBmYWlsZWQgd2l0aCAlaVxuIiwgcmV0KTsKLQkJaTkxNV9zd19mZW5jZV9jb21taXQo JmludGVsX3N0YXRlLT5jb21taXRfcmVhZHkpOwotCQlyZXR1cm4gcmV0OwotCX0KLQogCS8qCiAJ ICogVGhlIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRlKCkgZmFzdCBwYXRoIHRha2VzIGNhcmUK IAkgKiBvZiBhdm9pZGluZyB0aGUgdmJsYW5rIHdhaXRzIGZvciBzaW1wbGUgY3Vyc29yCkBAIC0x MjQzNywxOSArMTI0MjgsMzIgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJICogdXBkYXRlcyBoYXBwZW4gZHVyaW5nIHRoZSBjb3JyZWN0 IGZyYW1lcy4gR2VuOSsgaGF2ZQogCSAqIGRvdWJsZSBidWZmZXJlZCB3YXRlcm1hcmtzIGFuZCBz byBzaG91bGRuJ3QgbmVlZCB0aGlzLgogCSAqCi0JICogRG8gdGhpcyBhZnRlciBkcm1fYXRvbWlj X2hlbHBlcl9zZXR1cF9jb21taXQoKSBhbmQKLQkgKiBpbnRlbF9hdG9taWNfcHJlcGFyZV9jb21t aXQoKSBiZWNhdXNlIHdlIHN0aWxsIHdhbnQKLQkgKiB0byBza2lwIHRoZSBmbGlwIGFuZCBmYiBj bGVhbnVwIHdhaXRzLiBBbHRob3VnaCB0aGF0Ci0JICogZG9lcyByaXNrIHlhbmtpbmcgdGhlIG1h cHBpbmcgZnJvbSB1bmRlciB0aGUgZGlzcGxheQotCSAqIGVuZ2luZS4KKwkgKiBVbnNldCBzdGF0 ZS0+bGVnYWN5X2N1cnNvcl91cGRhdGUgYmVmb3JlIHRoZSBjYWxsIHRvCisJICogZHJtX2F0b21p Y19oZWxwZXJfc2V0dXBfY29tbWl0KCkgYmVjYXVzZSBvdGhlcndpc2UKKwkgKiBkcm1fYXRvbWlj X2hlbHBlcl93YWl0X2Zvcl9mbGlwX2RvbmUoKSBpcyBhIG5vb3AgYW5kCisJICogd2UgZ2V0IEZJ Rk8gdW5kZXJydW5zIGJlY2F1c2Ugd2UgZGlkbid0IHdhaXQKKwkgKiBmb3IgdmJsYW5rLgogCSAq CiAJICogRklYTUUgZG9pbmcgd2F0ZXJtYXJrcyBhbmQgZmIgY2xlYW51cCBmcm9tIGEgdmJsYW5r IHdvcmtlcgogCSAqIChhc3N1bWluZyB3ZSBoYWQgYW55KSB3b3VsZCBzb2x2ZSB0aGVzZSBwcm9i bGVtcy4KIAkgKi8KLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDkpCi0JCXN0YXRlLT5sZWdh Y3lfY3Vyc29yX3VwZGF0ZSA9IGZhbHNlOworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOSAm JiBzdGF0ZS0+bGVnYWN5X2N1cnNvcl91cGRhdGUpIHsKKwkJZm9yX2VhY2hfbmV3X2NydGNfaW5f c3RhdGUoc3RhdGUsIGNydGMsIG5ld19jcnRjX3N0YXRlLCBpKQorCQkJaWYgKHRvX2ludGVsX2Ny dGNfc3RhdGUobmV3X2NydGNfc3RhdGUpLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlKQorCQkJCXN0 YXRlLT5sZWdhY3lfY3Vyc29yX3VwZGF0ZSA9IGZhbHNlOworCX0KKworCXJldCA9IGludGVsX2F0 b21pY19wcmVwYXJlX2NvbW1pdChkZXYsIHN0YXRlKTsKKwlpZiAocmV0KSB7CisJCURSTV9ERUJV R19BVE9NSUMoIlByZXBhcmluZyBzdGF0ZSBmYWlsZWQgd2l0aCAlaVxuIiwgcmV0KTsKKwkJaTkx NV9zd19mZW5jZV9jb21taXQoJmludGVsX3N0YXRlLT5jb21taXRfcmVhZHkpOworCQlyZXR1cm4g cmV0OworCX0KKworCXJldCA9IGRybV9hdG9taWNfaGVscGVyX3NldHVwX2NvbW1pdChzdGF0ZSwg bm9uYmxvY2spOworCWlmICghcmV0KQorCQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9zd2FwX3N0 YXRlKHN0YXRlLCB0cnVlKTsKIAotCXJldCA9IGRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUo c3RhdGUsIHRydWUpOwogCWlmIChyZXQpIHsKIAkJaTkxNV9zd19mZW5jZV9jb21taXQoJmludGVs X3N0YXRlLT5jb21taXRfcmVhZHkpOwogCi0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=