From: Daniel Vetter Subject: Re: [PATCH 3/4] drm/i915: Switch to full atomic helpers for plane updates/disable, take two Date: Thu, 9 Apr 2015 14:46:19 +0200 Message-ID: <20150409124619.GK12038@phenom.ffwll.local> References: <1428544614-28082-1-git-send-email-matthew.d.roper@intel.com> <1428544614-28082-4-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by gabe.freedesktop.org (Postfix) with ESMTP id E7C806E794 for ; Thu, 9 Apr 2015 05:44:21 -0700 (PDT) Received: by wizk4 with SMTP id k4so90829157wiz.1 for ; Thu, 09 Apr 2015 05:44:21 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1428544614-28082-4-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBBcHIgMDgsIDIwMTUgYXQgMDY6NTY6NTNQTSAtMDcwMCwgTWF0dCBSb3BlciB3cm90 ZToKPiBTd2l0Y2ggZnJvbSBvdXIgcGxhbmUgdXBkYXRlL2Rpc2FibGUgZW50cnlwb2ludHMgdG8g dXNlIHRoZSBmdWxsIGF0b21pYwo+IGhlbHBlcnMgKHdoaWNoIGdlbmVyYXRlIGEgdG9wLWxldmVs IGF0b21pYyB0cmFuc2FjdGlvbikgcmF0aGVyIHRoYW4gdGhlCj4gdHJhbnNpdGlvbmFsIGhlbHBl cnMgKHdoaWNoIG9ubHkgY3JlYXRlL21hbmlwdWxhdGUgb3JwaGFuZWQgcGxhbmUgc3RhdGVzCj4g aW5kZXBlbmRlbnQgb2YgYSB0b3AtbGV2ZWwgdHJhbnNhY3Rpb24pLiAgVmFyaW91cyB1cGNvbWlu ZyB3b3JrIChTS0wKPiBzY2FsZXJzLCBhdG9taWMgd2F0ZXJtYXJrcywgZXRjLikgcmVxdWlyZXMg YSBmdWxsIGF0b21pYyB0cmFuc2FjdGlvbiB0bwo+IGJlaGF2ZSBwcm9wZXJseS9jbGVhbmx5Lgo+ IAo+IExhc3QgdGltZSB3ZSB0cmllZCB0aGlzLCB3ZSBoYWQgdG8gYmFjayBvdXQgdGhlIGNoYW5n ZSBiZWNhdXNlIHdlIHN0aWxsCj4gY2FsbCB0aGUgZHJtX3BsYW5lIHZmdW5jcyBkaXJlY3RseSBm cm9tIHdpdGhpbiBvdXIgbGVnYWN5IG1vZGVzZXR0aW5nCj4gY29kZS4gIFRoaXMgcG90ZW50aWFs bHkgcmVzdWx0cyBpbiBuZXN0ZWQgYXRvbWljIHRyYW5zYWN0aW9ucywgbG9ja2luZwo+IGNvbGxp c2lvbnMsIGFuZCBvdGhlciBmYWlsdXJlcy4gIFRvIGF2b2lkIHRoYXQgcHJvYmxlbSBhZ2Fpbiwg d2UKPiBzaWRlc3RlcCB0aGUgaXNzdWUgYnkgY2FsbGluZyB0aGUgdHJhbnNpdGlvbmFsIGhlbHBl cnMgZGlyZWN0bHkgKHJhdGhlcgo+IHRoYW4gdGhyb3VnaCBhIHZmdW5jKSB3aGVuIHdlJ3JlIG5l c3RlZCBpbnNpZGUgb2Ygb3RoZXIgbGVnYWN5Cj4gbW9kZXNldHRpbmcgY29kZS4gIEhvd2V2ZXIg dGhpcyBkb2VzIGFsbG93IGxlZ2FjeSBTZXRQbGFuZSgpIGlvY3RsJ3MgdG8KPiBwcm9jZXNzIGFu IGVudGlyZSBkcm1fYXRvbWljX3N0YXRlIHRyYW5zYWN0aW9uLCB3aGljaCBpcyBpbXBvcnRhbnQg Zm9yCj4gdXBjb21pbmcgcGF0Y2hlcy4KPiAKPiBDYzogQ2hhbmRyYSBLb25kdXJ1IDxjaGFuZHJh LmtvbmR1cnVAaW50ZWwuY29tPgo+IFNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcu ZC5yb3BlckBpbnRlbC5jb20+CgpNYWFydGVuIGlzIHdvcmtpbmcgdG8gZml4IHRoaXMgcHJvcGVy bHkgKGJ5IHdpcmluZyB1cCBwbGFuZSBzdGF0ZXMgdG8gdGhlCnRyYW5zaXRpb25hbCBkcm1fYXRv bWljX3N0YXRlIHNjYWZmb2xkaW5nIGZyb20gQW5kZXIpLCBidXQgc2VlbXMgbGlrZSBhCmdvb2Qg aW50ZXJpbSBpZGVhIHRvIGdldCBiYWNrIHNvbWUgc29saWQgdGVzdGluZyBmb3Igb3VyIGF0b21p YyBjb2RlLgoKQ2FuIEkgYXBwbHkgdGhpcyB3aXRob3V0IHBhdGNoZXMgMSYyIHJpZ2h0IGF3YXkg b3IgaXMgdGhlcmUgYSB0cmlja3kKZGVwZW5jeT8KLURhbmllbAoKPiAtLS0KPiAgZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMjQgKysrKysrKysrKysrLS0tLS0tLS0tLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDEwICsrKysrLS0tLS0K PiAgMiBmaWxlcyBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKPiAK PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXggMWNmOTFhZC4uM2E3NDky MyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtNTU3Niw3ICs1 NTc2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKPiAgCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZShjcnRjKTsKPiAgCWRldl9w cml2LT5kaXNwbGF5Lm9mZihjcnRjKTsKPiAgCj4gLQljcnRjLT5wcmltYXJ5LT5mdW5jcy0+ZGlz YWJsZV9wbGFuZShjcnRjLT5wcmltYXJ5KTsKPiArCWRybV9wbGFuZV9oZWxwZXJfZGlzYWJsZShj cnRjLT5wcmltYXJ5KTsKPiAgCj4gIAkvKiBVcGRhdGUgY29tcHV0ZWQgc3RhdGUuICovCj4gIAls aXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwgJmRldi0+bW9kZV9jb25maWcuY29ubmVjdG9y X2xpc3QsIGhlYWQpIHsKPiBAQCAtMTE3MzEsMTEgKzExNzMxLDExIEBAIHN0YXRpYyBpbnQgX19p bnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gIAkJaW50IHZkaXNwbGF5LCBo ZGlzcGxheTsKPiAgCj4gIAkJZHJtX2NydGNfZ2V0X2h2X3RpbWluZyhtb2RlLCAmaGRpc3BsYXks ICZ2ZGlzcGxheSk7Cj4gLQkJcmV0ID0gcHJpbWFyeS0+ZnVuY3MtPnVwZGF0ZV9wbGFuZShwcmlt YXJ5LCAmaW50ZWxfY3J0Yy0+YmFzZSwKPiAtCQkJCQkJICAgZmIsIDAsIDAsCj4gLQkJCQkJCSAg IGhkaXNwbGF5LCB2ZGlzcGxheSwKPiAtCQkJCQkJICAgeCA8PCAxNiwgeSA8PCAxNiwKPiAtCQkJ CQkJICAgaGRpc3BsYXkgPDwgMTYsIHZkaXNwbGF5IDw8IDE2KTsKPiArCQlyZXQgPSBkcm1fcGxh bmVfaGVscGVyX3VwZGF0ZShwcmltYXJ5LCAmaW50ZWxfY3J0Yy0+YmFzZSwKPiArCQkJCQkgICAg ICBmYiwgMCwgMCwKPiArCQkJCQkgICAgICBoZGlzcGxheSwgdmRpc3BsYXksCj4gKwkJCQkJICAg ICAgeCA8PCAxNiwgeSA8PCAxNiwKPiArCQkJCQkgICAgICBoZGlzcGxheSA8PCAxNiwgdmRpc3Bs YXkgPDwgMTYpOwo+ICAJfQo+ICAKPiAgCS8qIE5vdyBlbmFibGUgdGhlIGNsb2NrcywgcGxhbmUs IHBpcGUsIGFuZCBjb25uZWN0b3JzIHRoYXQgd2Ugc2V0IHVwLiAqLwo+IEBAIC0xMjI4NiwxMCAr MTIyODYsMTAgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3NldF9jb25maWcoc3RydWN0IGRybV9t b2RlX3NldCAqc2V0KQo+ICAJCWludCB2ZGlzcGxheSwgaGRpc3BsYXk7Cj4gIAo+ICAJCWRybV9j cnRjX2dldF9odl90aW1pbmcoc2V0LT5tb2RlLCAmaGRpc3BsYXksICZ2ZGlzcGxheSk7Cj4gLQkJ cmV0ID0gcHJpbWFyeS0+ZnVuY3MtPnVwZGF0ZV9wbGFuZShwcmltYXJ5LCBzZXQtPmNydGMsIHNl dC0+ZmIsCj4gLQkJCQkJCSAgIDAsIDAsIGhkaXNwbGF5LCB2ZGlzcGxheSwKPiAtCQkJCQkJICAg c2V0LT54IDw8IDE2LCBzZXQtPnkgPDwgMTYsCj4gLQkJCQkJCSAgIGhkaXNwbGF5IDw8IDE2LCB2 ZGlzcGxheSA8PCAxNik7Cj4gKwkJcmV0ID0gZHJtX3BsYW5lX2hlbHBlcl91cGRhdGUocHJpbWFy eSwgc2V0LT5jcnRjLCBzZXQtPmZiLAo+ICsJCQkJCSAgICAgIDAsIDAsIGhkaXNwbGF5LCB2ZGlz cGxheSwKPiArCQkJCQkgICAgICBzZXQtPnggPDwgMTYsIHNldC0+eSA8PCAxNiwKPiArCQkJCQkg ICAgICBoZGlzcGxheSA8PCAxNiwgdmRpc3BsYXkgPDwgMTYpOwo+ICAKPiAgCQkvKgo+ICAJCSAq IFdlIG5lZWQgdG8gbWFrZSBzdXJlIHRoZSBwcmltYXJ5IHBsYW5lIGlzIHJlLWVuYWJsZWQgaWYg aXQKPiBAQCAtMTI4MzAsOCArMTI4MzAsOCBAQCB2b2lkIGludGVsX3BsYW5lX2Rlc3Ryb3koc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUpCj4gIH0KPiAgCj4gIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVf ZnVuY3MgaW50ZWxfcGxhbmVfZnVuY3MgPSB7Cj4gLQkudXBkYXRlX3BsYW5lID0gZHJtX3BsYW5l X2hlbHBlcl91cGRhdGUsCj4gLQkuZGlzYWJsZV9wbGFuZSA9IGRybV9wbGFuZV9oZWxwZXJfZGlz YWJsZSwKPiArCS51cGRhdGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl91cGRhdGVfcGxhbmUs Cj4gKwkuZGlzYWJsZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfcGxhbmUsCj4g IAkuZGVzdHJveSA9IGludGVsX3BsYW5lX2Rlc3Ryb3ksCj4gIAkuc2V0X3Byb3BlcnR5ID0gZHJt X2F0b21pY19oZWxwZXJfcGxhbmVfc2V0X3Byb3BlcnR5LAo+ICAJLmF0b21pY19nZXRfcHJvcGVy dHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfZ2V0X3Byb3BlcnR5LAo+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Nwcml0ZS5jCj4gaW5kZXggNDkyYWJjZC4uZjQwOTRkMiAxMDA2NDQKPiAtLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Nwcml0ZS5jCj4gQEAgLTExNDksMTEgKzExNDksMTEgQEAgaW50IGludGVsX3Bs YW5lX3Jlc3RvcmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCj4gIAlpZiAoIXBsYW5lLT5jcnRj IHx8ICFwbGFuZS0+c3RhdGUtPmZiKQo+ICAJCXJldHVybiAwOwo+ICAKPiAtCXJldHVybiBwbGFu ZS0+ZnVuY3MtPnVwZGF0ZV9wbGFuZShwbGFuZSwgcGxhbmUtPmNydGMsIHBsYW5lLT5zdGF0ZS0+ ZmIsCj4gLQkJCQkgIHBsYW5lLT5zdGF0ZS0+Y3J0Y194LCBwbGFuZS0+c3RhdGUtPmNydGNfeSwK PiAtCQkJCSAgcGxhbmUtPnN0YXRlLT5jcnRjX3csIHBsYW5lLT5zdGF0ZS0+Y3J0Y19oLAo+IC0J CQkJICBwbGFuZS0+c3RhdGUtPnNyY194LCBwbGFuZS0+c3RhdGUtPnNyY195LAo+IC0JCQkJICBw bGFuZS0+c3RhdGUtPnNyY193LCBwbGFuZS0+c3RhdGUtPnNyY19oKTsKPiArCXJldHVybiBkcm1f cGxhbmVfaGVscGVyX3VwZGF0ZShwbGFuZSwgcGxhbmUtPmNydGMsIHBsYW5lLT5zdGF0ZS0+ZmIs Cj4gKwkJCQkgICAgICAgcGxhbmUtPnN0YXRlLT5jcnRjX3gsIHBsYW5lLT5zdGF0ZS0+Y3J0Y195 LAo+ICsJCQkJICAgICAgIHBsYW5lLT5zdGF0ZS0+Y3J0Y193LCBwbGFuZS0+c3RhdGUtPmNydGNf aCwKPiArCQkJCSAgICAgICBwbGFuZS0+c3RhdGUtPnNyY194LCBwbGFuZS0+c3RhdGUtPnNyY195 LAo+ICsJCQkJICAgICAgIHBsYW5lLT5zdGF0ZS0+c3JjX3csIHBsYW5lLT5zdGF0ZS0+c3JjX2gp Owo+ICB9Cj4gIAo+ICBzdGF0aWMgdWludDMyX3QgaWxrX3BsYW5lX2Zvcm1hdHNbXSA9IHsKPiAt LSAKPiAxLjguNS4xCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBD b3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=