From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH 3/4] drm/i915: Switch to full atomic helpers for plane updates/disable, take two Date: Thu, 9 Apr 2015 11:03:35 -0700 Message-ID: <20150409180334.GA9016@intel.com> References: <1428544614-28082-1-git-send-email-matthew.d.roper@intel.com> <1428544614-28082-4-git-send-email-matthew.d.roper@intel.com> <20150409124619.GK12038@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 06AE76E829 for ; Thu, 9 Apr 2015 11:03:35 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20150409124619.GK12038@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBBcHIgMDksIDIwMTUgYXQgMDI6NDY6MTlQTSArMDIwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBXZWQsIEFwciAwOCwgMjAxNSBhdCAwNjo1Njo1M1BNIC0wNzAwLCBNYXR0IFJv cGVyIHdyb3RlOgo+ID4gU3dpdGNoIGZyb20gb3VyIHBsYW5lIHVwZGF0ZS9kaXNhYmxlIGVudHJ5 cG9pbnRzIHRvIHVzZSB0aGUgZnVsbCBhdG9taWMKPiA+IGhlbHBlcnMgKHdoaWNoIGdlbmVyYXRl IGEgdG9wLWxldmVsIGF0b21pYyB0cmFuc2FjdGlvbikgcmF0aGVyIHRoYW4gdGhlCj4gPiB0cmFu c2l0aW9uYWwgaGVscGVycyAod2hpY2ggb25seSBjcmVhdGUvbWFuaXB1bGF0ZSBvcnBoYW5lZCBw bGFuZSBzdGF0ZXMKPiA+IGluZGVwZW5kZW50IG9mIGEgdG9wLWxldmVsIHRyYW5zYWN0aW9uKS4g IFZhcmlvdXMgdXBjb21pbmcgd29yayAoU0tMCj4gPiBzY2FsZXJzLCBhdG9taWMgd2F0ZXJtYXJr cywgZXRjLikgcmVxdWlyZXMgYSBmdWxsIGF0b21pYyB0cmFuc2FjdGlvbiB0bwo+ID4gYmVoYXZl IHByb3Blcmx5L2NsZWFubHkuCj4gPiAKPiA+IExhc3QgdGltZSB3ZSB0cmllZCB0aGlzLCB3ZSBo YWQgdG8gYmFjayBvdXQgdGhlIGNoYW5nZSBiZWNhdXNlIHdlIHN0aWxsCj4gPiBjYWxsIHRoZSBk cm1fcGxhbmUgdmZ1bmNzIGRpcmVjdGx5IGZyb20gd2l0aGluIG91ciBsZWdhY3kgbW9kZXNldHRp bmcKPiA+IGNvZGUuICBUaGlzIHBvdGVudGlhbGx5IHJlc3VsdHMgaW4gbmVzdGVkIGF0b21pYyB0 cmFuc2FjdGlvbnMsIGxvY2tpbmcKPiA+IGNvbGxpc2lvbnMsIGFuZCBvdGhlciBmYWlsdXJlcy4g IFRvIGF2b2lkIHRoYXQgcHJvYmxlbSBhZ2Fpbiwgd2UKPiA+IHNpZGVzdGVwIHRoZSBpc3N1ZSBi eSBjYWxsaW5nIHRoZSB0cmFuc2l0aW9uYWwgaGVscGVycyBkaXJlY3RseSAocmF0aGVyCj4gPiB0 aGFuIHRocm91Z2ggYSB2ZnVuYykgd2hlbiB3ZSdyZSBuZXN0ZWQgaW5zaWRlIG9mIG90aGVyIGxl Z2FjeQo+ID4gbW9kZXNldHRpbmcgY29kZS4gIEhvd2V2ZXIgdGhpcyBkb2VzIGFsbG93IGxlZ2Fj eSBTZXRQbGFuZSgpIGlvY3RsJ3MgdG8KPiA+IHByb2Nlc3MgYW4gZW50aXJlIGRybV9hdG9taWNf c3RhdGUgdHJhbnNhY3Rpb24sIHdoaWNoIGlzIGltcG9ydGFudCBmb3IKPiA+IHVwY29taW5nIHBh dGNoZXMuCj4gPiAKPiA+IENjOiBDaGFuZHJhIEtvbmR1cnUgPGNoYW5kcmEua29uZHVydUBpbnRl bC5jb20+Cj4gPiBTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50 ZWwuY29tPgo+IAo+IE1hYXJ0ZW4gaXMgd29ya2luZyB0byBmaXggdGhpcyBwcm9wZXJseSAoYnkg d2lyaW5nIHVwIHBsYW5lIHN0YXRlcyB0byB0aGUKPiB0cmFuc2l0aW9uYWwgZHJtX2F0b21pY19z dGF0ZSBzY2FmZm9sZGluZyBmcm9tIEFuZGVyKSwgYnV0IHNlZW1zIGxpa2UgYQo+IGdvb2QgaW50 ZXJpbSBpZGVhIHRvIGdldCBiYWNrIHNvbWUgc29saWQgdGVzdGluZyBmb3Igb3VyIGF0b21pYyBj b2RlLgo+IAo+IENhbiBJIGFwcGx5IHRoaXMgd2l0aG91dCBwYXRjaGVzIDEmMiByaWdodCBhd2F5 IG9yIGlzIHRoZXJlIGEgdHJpY2t5Cj4gZGVwZW5jeT8KPiAtRGFuaWVsCgpJIHRoaW5rIHRoaXMg b25lIGNhbiBiZSBhcHBsaWVkIGluZGVwZW5kZW50bHkgb2YgMSYyLiAgSSB0aGluayB0aGlzIG9u ZQptaWdodCBiZSBhIHByZXJlcSBmb3IgIzQgdG8gZnVsbHkgd29yayBhcyBhZHZlcnRpc2VkIHRo b3VnaC4uLndpdGhvdXQKdXNpbmcgdGhlIGZ1bGwgYXRvbWljIGhlbHBlcnMsIHdlIHNpbXBseSBk b24ndCBoYXZlIGEgJ3N0YXJ0IG9mCnRyYW5zYWN0aW9uJyBwb2ludCBhdCB3aGljaCB3ZSBjYW4g Y2xlYXIgdGhlIGV4aXN0aW5nIGF0b21pYyBmbGFncyB3aGVuCnVzaW5nIGxlZ2FjeSBwbGFuZSBp b2N0bHMuCgoKTWF0dAoKPiAKPiA+IC0tLQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyB8IDI0ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLQo+ID4gIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDEwICsrKysrLS0tLS0KPiA+ICAyIGZpbGVzIGNo YW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQo+ID4gCj4gPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gPiBpbmRleCAxY2Y5MWFkLi4zYTc0OTIzIDEwMDY0 NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gPiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiA+IEBAIC01NTc2LDcgKzU1 NzYsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpj cnRjKQo+ID4gIAlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoY3J0Yyk7Cj4gPiAgCWRl dl9wcml2LT5kaXNwbGF5Lm9mZihjcnRjKTsKPiA+ICAKPiA+IC0JY3J0Yy0+cHJpbWFyeS0+ZnVu Y3MtPmRpc2FibGVfcGxhbmUoY3J0Yy0+cHJpbWFyeSk7Cj4gPiArCWRybV9wbGFuZV9oZWxwZXJf ZGlzYWJsZShjcnRjLT5wcmltYXJ5KTsKPiA+ICAKPiA+ICAJLyogVXBkYXRlIGNvbXB1dGVkIHN0 YXRlLiAqLwo+ID4gIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwgJmRldi0+bW9kZV9j b25maWcuY29ubmVjdG9yX2xpc3QsIGhlYWQpIHsKPiA+IEBAIC0xMTczMSwxMSArMTE3MzEsMTEg QEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiA+ ICAJCWludCB2ZGlzcGxheSwgaGRpc3BsYXk7Cj4gPiAgCj4gPiAgCQlkcm1fY3J0Y19nZXRfaHZf dGltaW5nKG1vZGUsICZoZGlzcGxheSwgJnZkaXNwbGF5KTsKPiA+IC0JCXJldCA9IHByaW1hcnkt PmZ1bmNzLT51cGRhdGVfcGxhbmUocHJpbWFyeSwgJmludGVsX2NydGMtPmJhc2UsCj4gPiAtCQkJ CQkJICAgZmIsIDAsIDAsCj4gPiAtCQkJCQkJICAgaGRpc3BsYXksIHZkaXNwbGF5LAo+ID4gLQkJ CQkJCSAgIHggPDwgMTYsIHkgPDwgMTYsCj4gPiAtCQkJCQkJICAgaGRpc3BsYXkgPDwgMTYsIHZk aXNwbGF5IDw8IDE2KTsKPiA+ICsJCXJldCA9IGRybV9wbGFuZV9oZWxwZXJfdXBkYXRlKHByaW1h cnksICZpbnRlbF9jcnRjLT5iYXNlLAo+ID4gKwkJCQkJICAgICAgZmIsIDAsIDAsCj4gPiArCQkJ CQkgICAgICBoZGlzcGxheSwgdmRpc3BsYXksCj4gPiArCQkJCQkgICAgICB4IDw8IDE2LCB5IDw8 IDE2LAo+ID4gKwkJCQkJICAgICAgaGRpc3BsYXkgPDwgMTYsIHZkaXNwbGF5IDw8IDE2KTsKPiA+ ICAJfQo+ID4gIAo+ID4gIAkvKiBOb3cgZW5hYmxlIHRoZSBjbG9ja3MsIHBsYW5lLCBwaXBlLCBh bmQgY29ubmVjdG9ycyB0aGF0IHdlIHNldCB1cC4gKi8KPiA+IEBAIC0xMjI4NiwxMCArMTIyODYs MTAgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3NldF9jb25maWcoc3RydWN0IGRybV9tb2RlX3Nl dCAqc2V0KQo+ID4gIAkJaW50IHZkaXNwbGF5LCBoZGlzcGxheTsKPiA+ICAKPiA+ICAJCWRybV9j cnRjX2dldF9odl90aW1pbmcoc2V0LT5tb2RlLCAmaGRpc3BsYXksICZ2ZGlzcGxheSk7Cj4gPiAt CQlyZXQgPSBwcmltYXJ5LT5mdW5jcy0+dXBkYXRlX3BsYW5lKHByaW1hcnksIHNldC0+Y3J0Yywg c2V0LT5mYiwKPiA+IC0JCQkJCQkgICAwLCAwLCBoZGlzcGxheSwgdmRpc3BsYXksCj4gPiAtCQkJ CQkJICAgc2V0LT54IDw8IDE2LCBzZXQtPnkgPDwgMTYsCj4gPiAtCQkJCQkJICAgaGRpc3BsYXkg PDwgMTYsIHZkaXNwbGF5IDw8IDE2KTsKPiA+ICsJCXJldCA9IGRybV9wbGFuZV9oZWxwZXJfdXBk YXRlKHByaW1hcnksIHNldC0+Y3J0Yywgc2V0LT5mYiwKPiA+ICsJCQkJCSAgICAgIDAsIDAsIGhk aXNwbGF5LCB2ZGlzcGxheSwKPiA+ICsJCQkJCSAgICAgIHNldC0+eCA8PCAxNiwgc2V0LT55IDw8 IDE2LAo+ID4gKwkJCQkJICAgICAgaGRpc3BsYXkgPDwgMTYsIHZkaXNwbGF5IDw8IDE2KTsKPiA+ ICAKPiA+ICAJCS8qCj4gPiAgCQkgKiBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGUgcHJpbWFyeSBw bGFuZSBpcyByZS1lbmFibGVkIGlmIGl0Cj4gPiBAQCAtMTI4MzAsOCArMTI4MzAsOCBAQCB2b2lk IGludGVsX3BsYW5lX2Rlc3Ryb3koc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCj4gPiAgfQo+ID4g IAo+ID4gIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfcGxhbmVfZnVuY3MgPSB7 Cj4gPiAtCS51cGRhdGVfcGxhbmUgPSBkcm1fcGxhbmVfaGVscGVyX3VwZGF0ZSwKPiA+IC0JLmRp c2FibGVfcGxhbmUgPSBkcm1fcGxhbmVfaGVscGVyX2Rpc2FibGUsCj4gPiArCS51cGRhdGVfcGxh bmUgPSBkcm1fYXRvbWljX2hlbHBlcl91cGRhdGVfcGxhbmUsCj4gPiArCS5kaXNhYmxlX3BsYW5l ID0gZHJtX2F0b21pY19oZWxwZXJfZGlzYWJsZV9wbGFuZSwKPiA+ICAJLmRlc3Ryb3kgPSBpbnRl bF9wbGFuZV9kZXN0cm95LAo+ID4gIAkuc2V0X3Byb3BlcnR5ID0gZHJtX2F0b21pY19oZWxwZXJf cGxhbmVfc2V0X3Byb3BlcnR5LAo+ID4gIAkuYXRvbWljX2dldF9wcm9wZXJ0eSA9IGludGVsX3Bs YW5lX2F0b21pY19nZXRfcHJvcGVydHksCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu Ywo+ID4gaW5kZXggNDkyYWJjZC4uZjQwOTRkMiAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9zcHJpdGUuYwo+ID4gQEAgLTExNDksMTEgKzExNDksMTEgQEAgaW50IGludGVsX3BsYW5l X3Jlc3RvcmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCj4gPiAgCWlmICghcGxhbmUtPmNydGMg fHwgIXBsYW5lLT5zdGF0ZS0+ZmIpCj4gPiAgCQlyZXR1cm4gMDsKPiA+ICAKPiA+IC0JcmV0dXJu IHBsYW5lLT5mdW5jcy0+dXBkYXRlX3BsYW5lKHBsYW5lLCBwbGFuZS0+Y3J0YywgcGxhbmUtPnN0 YXRlLT5mYiwKPiA+IC0JCQkJICBwbGFuZS0+c3RhdGUtPmNydGNfeCwgcGxhbmUtPnN0YXRlLT5j cnRjX3ksCj4gPiAtCQkJCSAgcGxhbmUtPnN0YXRlLT5jcnRjX3csIHBsYW5lLT5zdGF0ZS0+Y3J0 Y19oLAo+ID4gLQkJCQkgIHBsYW5lLT5zdGF0ZS0+c3JjX3gsIHBsYW5lLT5zdGF0ZS0+c3JjX3ks Cj4gPiAtCQkJCSAgcGxhbmUtPnN0YXRlLT5zcmNfdywgcGxhbmUtPnN0YXRlLT5zcmNfaCk7Cj4g PiArCXJldHVybiBkcm1fcGxhbmVfaGVscGVyX3VwZGF0ZShwbGFuZSwgcGxhbmUtPmNydGMsIHBs YW5lLT5zdGF0ZS0+ZmIsCj4gPiArCQkJCSAgICAgICBwbGFuZS0+c3RhdGUtPmNydGNfeCwgcGxh bmUtPnN0YXRlLT5jcnRjX3ksCj4gPiArCQkJCSAgICAgICBwbGFuZS0+c3RhdGUtPmNydGNfdywg cGxhbmUtPnN0YXRlLT5jcnRjX2gsCj4gPiArCQkJCSAgICAgICBwbGFuZS0+c3RhdGUtPnNyY194 LCBwbGFuZS0+c3RhdGUtPnNyY195LAo+ID4gKwkJCQkgICAgICAgcGxhbmUtPnN0YXRlLT5zcmNf dywgcGxhbmUtPnN0YXRlLT5zcmNfaCk7Cj4gPiAgfQo+ID4gIAo+ID4gIHN0YXRpYyB1aW50MzJf dCBpbGtfcGxhbmVfZm9ybWF0c1tdID0gewo+ID4gLS0gCj4gPiAxLjguNS4xCj4gPiAKPiA+IF9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gPiBJbnRlbC1n ZnggbWFpbGluZyBsaXN0Cj4gPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gPiBo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cj4g Cj4gLS0gCj4gRGFuaWVsIFZldHRlcgo+IFNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3Jh dGlvbgo+IGh0dHA6Ly9ibG9nLmZmd2xsLmNoCgotLSAKTWF0dCBSb3BlcgpHcmFwaGljcyBTb2Z0 d2FyZSBFbmdpbmVlcgpJb1RHIFBsYXRmb3JtIEVuYWJsaW5nICYgRGV2ZWxvcG1lbnQKSW50ZWwg Q29ycG9yYXRpb24KKDkxNikgMzU2LTI3OTUKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK