From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 2/5] drm/i915: Always prepare planes at the start of an atomic commit Date: Tue, 15 Nov 2016 08:58:14 +0000 Message-ID: <20161115085817.4210-2-chris@chris-wilson.co.uk> References: <20161115085817.4210-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9B39F6E56D for ; Tue, 15 Nov 2016 08:58:22 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id g23so23504968wme.1 for ; Tue, 15 Nov 2016 00:58:22 -0800 (PST) In-Reply-To: <20161115085817.4210-1-chris@chris-wilson.co.uk> 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 VGhlIGdlbmVyaWMgYXRvbWljIGhlbHBlciBsaWtlcyB0byBza2lwIGEgcHJlcGFyZV9wbGFuZV9m YigpIGlmIGl0CmRlY2lkZXMgdGhhdCB0aGUgcGxhbmUtPmZiIGlzIHVuY2hhbmdlZC4gVGhpcyBp cyB3cm9uZyBmb3IgdXMgZm9yIGEKY291cGxlIG9mIHJlYXNvbnM6CgogLSBpZiB0aGUgcGlwZSBp cyByZWNvbmZpZ3VyZWQgKGkuZS4gYSBzaXplIGNoYW5nZSkgYnV0IHRoZSBmcmFtZWJ1ZmZlcgog ICBpcyB1bnRvdWNoZWQsIHdlIHN0aWxsIGhhdmUgdG8gZmx1c2ggYW55IHJlbmRlcmluZyBwcmlv ciB0byB0aGUKICAgcmVjb25maWd1cmF0aW9uIHRvIHByZXZlbnQgd2FpdC1mb3Itc2NhbmxpbmUg R1BVIGhhbmdzCgogLSBpZiB0aGUgZnJhbWVidWZmZXIgaXMgcm90YXRlZCwgaXQgcmVtYWlucyB0 aGUgc2FtZSBidXQgaGFzIGEKICAgZGlmZmVyZW50IHZpZXcgYW5kIGEgZGlmZmVyZW50IGFkZHJl c3MuCgpGaW5hbGx5LCBldmVuIGlmIHRoZSBmcmFtZWJ1ZmZlciBpcyB1bmNoYW5nZWQgdGhlIGZs aXAvbW9kZXNldCBzaG91bGQgYmUKb3JkZXJlZCB3aXRoIHJlc3BlY3QgdG8gcmVuZGVyaW5nIHRv IHRoZSBmcm9udGJ1ZmZlci4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19w bGFuZS5jIHwgIDIgLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAg IHwgNjAgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggICAgICAgICAgfCAgNCAtLS0KIDMgZmlsZXMgY2hhbmdlZCwgNDcgaW5z ZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9h dG9taWNfcGxhbmUuYwppbmRleCBmZjgyMTY0OTQ4NmUuLjg5YTM0MzUwYTM1ZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKQEAgLTIwMSw4ICsyMDEsNiBAQCBz dGF0aWMgdm9pZCBpbnRlbF9wbGFuZV9hdG9taWNfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lLAogfQogCiBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2hlbHBlcl9mdW5jcyBpbnRlbF9wbGFu ZV9oZWxwZXJfZnVuY3MgPSB7Ci0JLnByZXBhcmVfZmIgPSBpbnRlbF9wcmVwYXJlX3BsYW5lX2Zi LAotCS5jbGVhbnVwX2ZiID0gaW50ZWxfY2xlYW51cF9wbGFuZV9mYiwKIAkuYXRvbWljX2NoZWNr ID0gaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrLAogCS5hdG9taWNfdXBkYXRlID0gaW50ZWxfcGxh bmVfYXRvbWljX3VwZGF0ZSwKIH07CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggOGUwNGYzMWJmMTJlLi5kY2ExZTBiNTEyZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTE0MTU4LDcgKzE0MTU4LDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNf Y2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKICAqCiAgKiBSZXR1cm5zIDAgb24gc3VjY2Vz cywgbmVnYXRpdmUgZXJyb3IgY29kZSBvbiBmYWlsdXJlLgogICovCi1pbnQKK3N0YXRpYyBpbnQK IGludGVsX3ByZXBhcmVfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCSAgICAg ICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpuZXdfc3RhdGUpCiB7CkBAIC0xNDI1Miw3ICsxNDI1 Miw3IEBAIGludGVsX3ByZXBhcmVfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAg KgogICogTXVzdCBiZSBjYWxsZWQgd2l0aCBzdHJ1Y3RfbXV0ZXggaGVsZC4KICAqLwotdm9pZAor c3RhdGljIHZvaWQKIGludGVsX2NsZWFudXBfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsCiAJCSAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfc3RhdGUpCiB7CkBAIC0x NDI3MSw2ICsxNDI3MSw0OSBAQCBpbnRlbF9jbGVhbnVwX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lLAogCQlpbnRlbF91bnBpbl9mYl9vYmoob2xkX3N0YXRlLT5mYiwgb2xkX3N0YXRl LT5yb3RhdGlvbik7CiB9CiAKK3N0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdF9wcmVwYXJl X3BsYW5lcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCit7CisJc3RydWN0IGRybV9w bGFuZSAqcGxhbmU7CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7CisJaW50 IGksIGosIHJldDsKKworCXJldCA9IG11dGV4X2xvY2tfaW50ZXJydXB0aWJsZSgmc3RhdGUtPmRl di0+c3RydWN0X211dGV4KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJZm9yX2VhY2hf cGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBwbGFuZV9zdGF0ZSwgaSkgeworCQlyZXQgPSBp bnRlbF9wcmVwYXJlX3BsYW5lX2ZiKHBsYW5lLCBwbGFuZV9zdGF0ZSk7CisJCWlmIChyZXQpCisJ CQlicmVhazsKKwl9CisKKwlpZiAocmV0KSB7CisJCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0 YXRlLCBwbGFuZSwgcGxhbmVfc3RhdGUsIGopIHsKKwkJCWlmIChqID49IGkpCisJCQkJYnJlYWs7 CisKKwkJCWludGVsX2NsZWFudXBfcGxhbmVfZmIocGxhbmUsIHBsYW5lX3N0YXRlKTsKKwkJfQor CX0KKworCW11dGV4X3VubG9jaygmc3RhdGUtPmRldi0+c3RydWN0X211dGV4KTsKKworCXJldHVy biByZXQ7Cit9CisKK3N0YXRpYyB2b2lkIGludGVsX2F0b21pY19jb21taXRfY2xlYW51cF9wbGFu ZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQoreworCXN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lOworCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCWludCBpOwor CisJbXV0ZXhfbG9jaygmc3RhdGUtPmRldi0+c3RydWN0X211dGV4KTsKKworCWZvcl9lYWNoX3Bs YW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcGxhbmVfc3RhdGUsIGkpCisJCWludGVsX2NsZWFu dXBfcGxhbmVfZmIocGxhbmUsIHBsYW5lX3N0YXRlKTsKKworCW11dGV4X3VubG9jaygmc3RhdGUt PmRldi0+c3RydWN0X211dGV4KTsKK30KIAogc3RhdGljIGludCBpbnRlbF9hdG9taWNfcHJlcGFy ZV9jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgICAgICAgc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKnN0YXRlKQpAQCAtMTQyOTIsMTQgKzE0MzM1LDcgQEAgc3RhdGljIGludCBp bnRlbF9hdG9taWNfcHJlcGFyZV9jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCWZs dXNoX3dvcmtxdWV1ZShkZXZfcHJpdi0+d3EpOwogCX0KIAotCXJldCA9IG11dGV4X2xvY2tfaW50 ZXJydXB0aWJsZSgmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7 Ci0KLQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9wcmVwYXJlX3BsYW5lcyhkZXYsIHN0YXRlKTsK LQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQotCXJldHVybiByZXQ7CisJcmV0 dXJuIGludGVsX2F0b21pY19jb21taXRfcHJlcGFyZV9wbGFuZXMoc3RhdGUpOwogfQogCiB1MzIg aW50ZWxfY3J0Y19nZXRfdmJsYW5rX2NvdW50ZXIoc3RydWN0IGludGVsX2NydGMgKmNydGMpCkBA IC0xNDYyMiw5ICsxNDY1OCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2F0b21pY19jb21taXRfdGFp bChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJaWYgKGludGVsX3N0YXRlLT5tb2Rl c2V0KQogCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwgUE9XRVJfRE9NQUlOX01P REVTRVQpOwogCi0JbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWRybV9hdG9taWNf aGVscGVyX2NsZWFudXBfcGxhbmVzKGRldiwgc3RhdGUpOwotCW11dGV4X3VubG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOworCWludGVsX2F0b21pY19jb21taXRfY2xlYW51cF9wbGFuZXMoc3RhdGUp OwogCiAJZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X2NsZWFudXBfZG9uZShzdGF0ZSk7CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNGNiODI1NGM2NmRkLi5mZmY1NWQ5M2NhNzMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMjgxLDEwICsxMjgxLDYgQEAgX19pbnRlbF9m cmFtZWJ1ZmZlcl9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHZvaWQgaW50ZWxfZmlu aXNoX3BhZ2VfZmxpcF9jcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCBw aXBlKTsKIHZvaWQgaW50ZWxfZmluaXNoX3BhZ2VfZmxpcF9tbWlvKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgaW50IHBpcGUpOwogdm9pZCBpbnRlbF9jaGVja19wYWdlX2ZsaXAo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgcGlwZSk7Ci1pbnQgaW50ZWxf cHJlcGFyZV9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCSAgIHN0cnVjdCBk cm1fcGxhbmVfc3RhdGUgKm5ld19zdGF0ZSk7Ci12b2lkIGludGVsX2NsZWFudXBfcGxhbmVfZmIo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAq b2xkX3N0YXRlKTsKIGludCBpbnRlbF9wbGFuZV9hdG9taWNfZ2V0X3Byb3BlcnR5KHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogCQkJCSAgICBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpz dGF0ZSwKIAkJCQkgICAgc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydHksCi0tIAoyLjEwLjIK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=