From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH 2/7] drm/i915: Allow intel_plane_disable() to operate on all plane types Date: Thu, 13 Nov 2014 14:15:10 -0800 Message-ID: <20141113221510.GE29178@intel.com> References: <1415904206-22548-1-git-send-email-matthew.d.roper@intel.com> <1415904206-22548-3-git-send-email-matthew.d.roper@intel.com> <20141113111138.46193957@bpaauwe-desk.fm.intel.com> <20141113192302.GW10649@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20141113192302.GW10649@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBOb3YgMTMsIDIwMTQgYXQgMDk6MjM6MDJQTSArMDIwMCwgVmlsbGUgU3lyasOkbMOk IHdyb3RlOgo+IE9uIFRodSwgTm92IDEzLCAyMDE0IGF0IDExOjExOjM4QU0gLTA4MDAsIEJvYiBQ YWF1d2Ugd3JvdGU6Cj4gPiBPbiBUaHUsIDEzIE5vdiAyMDE0IDEwOjQzOjIxIC0wODAwCj4gPiBN YXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPiB3cm90ZToKPiA+IAo+ID4gPiBX ZSdsbCB3YW50IHRvIGNhbGwgdGhpcyBmcm9tIHRoZSB0eXBlLWFnbm9zdGljIGF0b21pYyBwbGFu ZSBoZWxwZXIKPiA+ID4gaG9va3MuICBTaW5jZSBpdCdzIG5vdCBzcHJpdGUtc3BlY2lmaWMgYW55 bW9yZSwgbW9yZSBpdCB0bwo+ID4gPiBpbnRlbF9kaXNwbGF5LmMgYXMgd2VsbC4KPiA+ID4gCj4g PiA+IFNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ Cj4gPiA+IC0tLQo+ID4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwg MjEgKysrKysrKysrKysrKysrKysrKysrCj4gPiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaCAgICAgfCAgMyArKy0KPiA+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jICB8IDEwICstLS0tLS0tLS0KPiA+ID4gIDMgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0 aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCj4gPiA+IAo+ID4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCj4gPiA+IGluZGV4IGE5ZjkwYjguLmM2NTk4ZTkgMTAwNjQ0Cj4gPiA+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ID4gPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiA+ID4gQEAgLTEzNjc5LDMgKzEzNjc5 LDI0IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9wcmVjbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCj4gPiA+ICAJCXNwaW5fdW5sb2NrX2lycSgmZGV2LT5l dmVudF9sb2NrKTsKPiA+ID4gIAl9Cj4gPiA+ICB9Cj4gPiA+ICsKPiA+ID4gK3ZvaWQgaW50ZWxf cGxhbmVfZGlzYWJsZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKPiA+ID4gK3sKPiA+ID4gKwlp ZiAoIXBsYW5lLT5jcnRjIHx8ICFwbGFuZS0+ZmIpCj4gPiA+ICsJCXJldHVybjsKPiA+ID4gKwo+ ID4gPiArCXN3aXRjaCAocGxhbmUtPnR5cGUpIHsKPiA+ID4gKwljYXNlIERSTV9QTEFORV9UWVBF X1BSSU1BUlk6Cj4gPiA+ICsJCWludGVsX3ByaW1hcnlfcGxhbmVfZGlzYWJsZShwbGFuZSk7Cj4g PiA+ICsJCWJyZWFrOwo+ID4gPiArCWNhc2UgRFJNX1BMQU5FX1RZUEVfQ1VSU09SOgo+ID4gPiAr CQlpbnRlbF9jdXJzb3JfcGxhbmVfZGlzYWJsZShwbGFuZSk7Cj4gPiA+ICsJCWJyZWFrOwo+ID4g PiArCWNhc2UgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWToKPiA+ID4gKwkJaW50ZWxfZGlzYWJsZV9w bGFuZShwbGFuZSk7Cj4gPiA+ICsJCWJyZWFrOwo+ID4gPiArCWRlZmF1bHQ6Cj4gPiA+ICsJCVdB Uk4oMSwgIlVua25vd24gcGxhbmUgdHlwZSIpOwo+ID4gPiArCX0KPiA+ID4gK30KPiA+ID4gKwo+ ID4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+ID4gPiBpbmRleCBiZDVlZjRlLi5kZjE0MjBi IDEwMDY0NAo+ID4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+ID4g PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+ID4gPiBAQCAtOTIwLDYg KzkyMCw3IEBAIHZvaWQgaW50ZWxfcHJlcGFyZV9wYWdlX2ZsaXAoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgaW50IHBsYW5lKTsKPiA+ID4gIHZvaWQgaW50ZWxfZmluaXNoX3BhZ2VfZmxpcChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSk7Cj4gPiA+ICB2b2lkIGludGVsX2ZpbmlzaF9w YWdlX2ZsaXBfcGxhbmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBsYW5lKTsKPiA+ID4g IHZvaWQgaW50ZWxfY2hlY2tfcGFnZV9mbGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBw aXBlKTsKPiA+ID4gK3ZvaWQgaW50ZWxfcGxhbmVfZGlzYWJsZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSk7Cj4gPiA+ICAKPiA+ID4gIC8qIHNoYXJlZCBkcGxsIGZ1bmN0aW9ucyAqLwo+ID4gPiAg c3RydWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9jcnRjX3RvX3NoYXJlZF9kcGxsKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKTsKPiA+ID4gQEAgLTExODAsNyArMTE4MSw2IEBAIGludCBpbnRl bF9wbGFuZV9zZXRfcHJvcGVydHkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gPiA+ICAJCQkg ICAgIHN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3AsCj4gPiA+ICAJCQkgICAgIHVpbnQ2NF90IHZh bCk7Cj4gPiA+ICBpbnQgaW50ZWxfcGxhbmVfcmVzdG9yZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSk7Cj4gPiA+IC12b2lkIGludGVsX3BsYW5lX2Rpc2FibGUoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUpOwo+ID4gPiAgaW50IGludGVsX3Nwcml0ZV9zZXRfY29sb3JrZXkoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgdm9pZCAqZGF0YSwKPiA+ID4gIAkJCSAgICAgIHN0cnVjdCBkcm1fZmlsZSAqZmls ZV9wcml2KTsKPiA+ID4gIGludCBpbnRlbF9zcHJpdGVfZ2V0X2NvbG9ya2V5KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCj4gPiA+IEBAIC0xMTg4LDYgKzExODgsNyBAQCBpbnQg aW50ZWxfc3ByaXRlX2dldF9jb2xvcmtleShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk YXRhLAo+ID4gPiAgYm9vbCBpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKPiA+ID4gIAkJCSAgICAgdWludDMyX3QgKnN0YXJ0X3ZibF9jb3VudCk7Cj4gPiA+ ICB2b2lkIGludGVsX3BpcGVfdXBkYXRlX2VuZChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywgdTMy IHN0YXJ0X3ZibF9jb3VudCk7Cj4gPiA+ICtpbnQgaW50ZWxfZGlzYWJsZV9wbGFuZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSk7Cj4gPiAKPiA+IFdvdWxkIGl0IG1ha2Ugc2Vuc2UgdG8gcmVuYW1l IHRoaXMgdG8gaW50ZWxfc3ByaXRlX3BsYW5lX2Rpc2FibGUoKSBhcwo+ID4gcGFydCBvZiB0aGlz PyAgSXQgd291bGQgYmUgbW9yZSBjb25zaXN0ZW50IHdpdGggdGhlIGN1cnNvciBhbmQgcHJpbWFy eQo+ID4gcGxhbmUgbmFtaW5nIGNvbnZlbnRpb25zIGFuZCBsaWtlbHkgYXZvaWQgc29tZSBjb25m dXNpb24gd2l0aCB0aGUKPiA+IGludGVsX3BsYW5lX2Rpc2FibGUoKSBmdW5jdGlvbi4KPiAKPiBI bW0uIFdoeSBkbyB3ZSBldmVuIHN0aWxsIGhhdmUgc29tZSBraW5kIG9mIGRpc2FibGUgaG9vayBp biB0aGUgYXRvbWljCj4gYWdlPyBJIHdvdWxkIGV4cGVjdCB0byBqdXN0IGhhdmUgLmNvbW1pdCgp IG9yIHNvbWVzdWNoIHRoaW5nLgo+IAo+IEJ1dCBpcyB0aGVyZSdzIHN0aWxsIHNvbWUgbmVlZCBm b3IgYSBkaXNhYmxlIGhvb2ssIHNob3VsZG4ndCB3ZSBqdXN0IGNhbGwKPiB0aGUgLmRpc2FibGVf cGxhbmUoKSBob29rIG9mIGRybV9wbGFuZT8gSSBndWVzcyBJIHNob3VsZCByZWFsbHkgZ28gYW5k Cj4gcmVhZCBzb21lIHRoaXMgbmV3IGhlbHBlciBzdHVmZi4uLgoKWW91J3JlIHJpZ2h0IHRoYXQg aXQgZG9lcyBldmVudHVhbGx5IGNvbWUgZG93biB0bwpkcm1fcGxhbmVfaGVscGVyX2NvbW1pdCgp IC0tPiBpbnRlbF9wbGFuZV9hdG9taWNfdXBkYXRlKCkgd2hpY2ggc2hvdWxkCmJlIGFibGUgdG8g cHJvZ3JhbSB0aGUgcGxhbmUgdG8gZWl0aGVyIGEgbmV3IHN0YXRlIG9yIG9mZi4gIFRvIHJldXNl IGFzCm11Y2ggb2Ygb3VyIGV4aXN0aW5nIGNvZGUgYXMgcG9zc2libGUgYW5kIGtlZXAgbXkgY2hh bmdlcyBtaW5pbWFsLCBJJ20KanVzdCBpbXBsZW1lbnRpbmcgaW50ZWxfcGxhbmVfYXRvbWljX3Vw ZGF0ZSgpIGFzOgoKICAgICAgICBpZiAoIXBsYW5lLT5zdGF0ZS0+ZmIpCiAgICAgICAgICAgICAg ICBpbnRlbF9wbGFuZV9kaXNhYmxlKHBsYW5lKTsKICAgICAgICBlbHNlICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIAogICAgICAgICAgICAgICAgaW50ZWxfcGxhbmUtPmNvbW1pdF9wbGFuZShwbGFuZSwgaW50 ZWxfc3RhdGUpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAoKc2luY2Ugd2UgYWxyZWFkeSBo YWQgYm90aCBvZiB0aG9zZSBmdW5jdGlvbnMgaW1wbGVtZW50ZWQgYW5kIHdvcmtpbmcuCmludGVs X3BsYW5lLT5jb21taXRfcGxhbmUoKSBkb2Vzbid0IGV4cGVjdCB0byBiZSBjYWxsZWQgaW4gdGhl IGRpc2FibGVkCmNhc2UgdG9kYXkgKGFzc3VtZXMgY3J0YyBhbmQvb3IgZmIgYXJlIG5vbi1OVUxM KSwgYnV0IGl0IGRlZmluaXRlbHkKc2VlbXMgcmVhc29uYWJsZS9lYXN5IHRvIHR3ZWFrIHRoYXQg YW5kIHJvbGwgdGhlIGRpc2FibGUgbG9naWMgZGlyZWN0bHkKaW50byB0aGUgbG93ZXN0LWxldmVs IGNvbW1pdF9wbGFuZSBpbiB0aGUgZnV0dXJlLiAgSSBqdXN0IHdhbnRlZCB0byBrZWVwCnRoaW5n cyBhcyBzaW1wbGUgYXMgcG9zc2libGUgd2l0aCBtaW5pbWFsIGNvZGUgY2hhbmdlcyBmb3IgdGhl IGluaXRpYWwKcGF0Y2hzZXQuCgoKTWF0dAoKPiAKPiA+ID4gIAo+ID4gPiAgLyogaW50ZWxfdHYu YyAqLwo+ID4gPiAgdm9pZCBpbnRlbF90dl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+ ID4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwo+ID4gPiBpbmRleCBmYzk2ZDEzLi4x MTVhY2QzIDEwMDY0NAo+ID4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYwo+ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwo+ID4g PiBAQCAtMTQyNSw3ICsxNDI1LDcgQEAgaW50ZWxfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gPiA+ICAJcmV0dXJuIDA7Cj4gPiA+ ICB9Cj4gPiA+ICAKPiA+ID4gLXN0YXRpYyBpbnQKPiA+ID4gK2ludAo+ID4gPiAgaW50ZWxfZGlz YWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKPiA+ID4gIHsKPiA+ID4gIAlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKPiA+ID4gQEAgLTE1NzYsMTQgKzE1NzYs NiBAQCBpbnQgaW50ZWxfcGxhbmVfcmVzdG9yZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKPiA+ ID4gIAkJCQkgIGludGVsX3BsYW5lLT5zcmNfdywgaW50ZWxfcGxhbmUtPnNyY19oKTsKPiA+ID4g IH0KPiA+ID4gIAo+ID4gPiAtdm9pZCBpbnRlbF9wbGFuZV9kaXNhYmxlKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lKQo+ID4gPiAtewo+ID4gPiAtCWlmICghcGxhbmUtPmNydGMgfHwgIXBsYW5lLT5m YikKPiA+ID4gLQkJcmV0dXJuOwo+ID4gPiAtCj4gPiA+IC0JaW50ZWxfZGlzYWJsZV9wbGFuZShw bGFuZSk7Cj4gPiA+IC19Cj4gPiA+IC0KPiA+ID4gIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3Bs YW5lX2Z1bmNzIGludGVsX3BsYW5lX2Z1bmNzID0gewo+ID4gPiAgCS51cGRhdGVfcGxhbmUgPSBp bnRlbF91cGRhdGVfcGxhbmUsCj4gPiA+ICAJLmRpc2FibGVfcGxhbmUgPSBpbnRlbF9kaXNhYmxl X3BsYW5lLAo+ID4gCj4gPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwo+ID4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+ID4gZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwo+ID4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbAo+IAo+IC0tIAo+IFZpbGxlIFN5cmrDpGzDpAo+IEludGVsIE9UQwoK LS0gCk1hdHQgUm9wZXIKR3JhcGhpY3MgU29mdHdhcmUgRW5naW5lZXIKSW9URyBQbGF0Zm9ybSBF bmFibGluZyAmIERldmVsb3BtZW50CkludGVsIENvcnBvcmF0aW9uCig5MTYpIDM1Ni0yNzk1Cl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==