From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v3 5/7] drm/atomic: Handle encoder assignment conflicts in a separate check, v3. Date: Fri, 4 Mar 2016 15:24:02 +0200 Message-ID: <20160304132402.GR10446@intel.com> References: <1456996662-8704-1-git-send-email-maarten.lankhorst@linux.intel.com> <1456996662-8704-6-git-send-email-maarten.lankhorst@linux.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: <1456996662-8704-6-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBNYXIgMDMsIDIwMTYgYXQgMTA6MTc6NDBBTSArMDEwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gVGhlIGN1cnJlbnQgY2hlY2sgZG9lc24ndCBoYW5kbGUgdGhlIGNhc2Ugd2hl cmUgd2UgZG9uJ3Qgc3RlYWwgYW4KPiBlbmNvZGVyLCBidXQga2VlcCBpdCBvbiB0aGUgY3VycmVu dCBjb25uZWN0b3IuIElmIHdlIHJlcHVycG9zZQo+IGRpc2FibGVfY29uZmxpY3RpbmdfZW5jb2Rl cnMgdG8gZG8gdGhlIGNoZWNraW5nLCB3ZSBqdXN0IGhhdmUKPiB0byByZWplY3QgdGhlIG9uZXMg dGhhdCBjb25mbGljdC4KPiAKPiBDaGFuZ2VzIHNpbmNlIHYxOgo+IC0gUmV0dXJuIGVhcmx5IHdp dGggZW1wdHkgZW5jb2Rlcl9tYXNrLCBkcm1fZm9yX2VhY2hfY29ubmVjdG9yCj4gICByZXF1aXJl cyBjb25uZWN0aW9uX211dGV4IGhlbGQuCj4gQ2hhbmdlcyBzaW5jZSB2MjoKPiAtIEFkZCBjb21t ZW50cyBmb3IgdGhlIGxvb3BzLgo+IAo+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0 IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Cj4gVGVzdGNhc2U6IGttc19zZXRt b2RlLmludmFsaWQtY2xvbmUtc2luZ2xlLWNydGMtc3RlYWxpbmcKCkkgd2FzIGEgYml0IGxhenkg b24gbG9va2luZyBhdCB0aGUgaW5kaXZpZHVhbCBwYXRjaGVzIDMtNSwgYnV0IHRoZSByZXN1bHQK bWFkZSBzZW5zZSB0byBtZSwgc28KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUu c3lyamFsYUBsaW51eC5pbnRlbC5jb20+CmZvciBhbGwgdGhyZWUuCgo+IC0tLQo+ICBkcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyB8IDc3ICsrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDQzIGluc2VydGlvbnMoKyksIDM0IGRl bGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19o ZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCj4gaW5kZXggZGIx MWMyZjliMDk4Li5iYjYwMTQ4YzVjOGQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9hdG9taWNfaGVscGVyLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxw ZXIuYwo+IEBAIC04Niw3ICs4Niw4IEBAIGRybV9hdG9taWNfaGVscGVyX3BsYW5lX2NoYW5nZWQo c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAo+ICAJfQo+ICB9Cj4gIAo+IC1zdGF0aWMg aW50IGRpc2FibGVfY29uZmxpY3RpbmdfY29ubmVjdG9ycyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUpCj4gK3N0YXRpYyBpbnQgaGFuZGxlX2NvbmZsaWN0aW5nX2VuY29kZXJzKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKPiArCQkJCSAgICAgICBib29sIGRpc2FibGVfY29u ZmxpY3RpbmdfZW5jb2RlcnMpCj4gIHsKPiAgCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpj b25uX3N0YXRlOwo+ICAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKPiBAQCAtOTQs NiArOTUsMTEgQEAgc3RhdGljIGludCBkaXNhYmxlX2NvbmZsaWN0aW5nX2Nvbm5lY3RvcnMoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQo+ICAJdW5zaWduZWQgZW5jb2Rlcl9tYXNrID0g MDsKPiAgCWludCBpLCByZXQ7Cj4gIAo+ICsJLyoKPiArCSAqIEZpcnN0IGxvb3AsIGZpbmQgYWxs IG5ld2x5IGFzc2lnbmVkIGVuY29kZXJzIGZyb20gdGhlIGNvbm5lY3RvcnMKPiArCSAqIHBhcnQg b2YgdGhlIHN0YXRlLiBJZiB0aGUgc2FtZSBlbmNvZGVyIGlzIGFzc2lnbmVkIHRvIG11bHRpcGxl Cj4gKwkgKiBjb25uZWN0b3JzIGJhaWwgb3V0Lgo+ICsJICovCj4gIAlmb3JfZWFjaF9jb25uZWN0 b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubl9zdGF0ZSwgaSkgewo+ICAJCWNvbnN0 IHN0cnVjdCBkcm1fY29ubmVjdG9yX2hlbHBlcl9mdW5jcyAqZnVuY3MgPSBjb25uZWN0b3ItPmhl bHBlcl9wcml2YXRlOwo+ICAJCXN0cnVjdCBkcm1fZW5jb2RlciAqbmV3X2VuY29kZXI7Cj4gQEAg LTEwNiwxMCArMTEyLDMzIEBAIHN0YXRpYyBpbnQgZGlzYWJsZV9jb25mbGljdGluZ19jb25uZWN0 b3JzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKPiAgCQllbHNlCj4gIAkJCW5ld19l bmNvZGVyID0gZnVuY3MtPmJlc3RfZW5jb2Rlcihjb25uZWN0b3IpOwo+ICAKPiAtCQlpZiAobmV3 X2VuY29kZXIpCj4gKwkJaWYgKG5ld19lbmNvZGVyKSB7Cj4gKwkJCWlmIChlbmNvZGVyX21hc2sg JiAoMSA8PCBkcm1fZW5jb2Rlcl9pbmRleChuZXdfZW5jb2RlcikpKSB7Cj4gKwkJCQlEUk1fREVC VUdfQVRPTUlDKCJbRU5DT0RFUjolZDolc10gb24gW0NPTk5FQ1RPUjolZDolc10gYWxyZWFkeSBh c3NpZ25lZFxuIiwKPiArCQkJCQluZXdfZW5jb2Rlci0+YmFzZS5pZCwgbmV3X2VuY29kZXItPm5h bWUsCj4gKwkJCQkJY29ubmVjdG9yLT5iYXNlLmlkLCBjb25uZWN0b3ItPm5hbWUpOwo+ICsKPiAr CQkJCXJldHVybiAtRUlOVkFMOwo+ICsJCQl9Cj4gKwo+ICAJCQllbmNvZGVyX21hc2sgfD0gMSA8 PCBkcm1fZW5jb2Rlcl9pbmRleChuZXdfZW5jb2Rlcik7Cj4gKwkJfQo+ICAJfQo+ICAKPiArCWlm ICghZW5jb2Rlcl9tYXNrKQo+ICsJCXJldHVybiAwOwo+ICsKPiArCS8qCj4gKwkgKiBTZWNvbmQg bG9vcCwgaXRlcmF0ZSBvdmVyIGFsbCBjb25uZWN0b3JzIG5vdCBwYXJ0IG9mIHRoZSBzdGF0ZS4K PiArCSAqCj4gKwkgKiBJZiBhIGNvbmZsaWN0aW5nIGVuY29kZXIgaXMgZm91bmQgYW5kIGRpc2Fi bGVfY29uZmxpY3RpbmdfZW5jb2RlcnMKPiArCSAqIGlzIG5vdCBzZXQsIGFuIGVycm9yIGlzIHJl dHVybmVkLiBVc2Vyc3BhY2UgY2FuIHByb3ZpZGUgYSBzb2x1dGlvbgo+ICsJICogdGhyb3VnaCB0 aGUgYXRvbWljIGlvY3RsLgo+ICsJICoKPiArCSAqIElmIHRoZSBmbGFnIGlzIHNldCBjb25mbGlj dGluZyBjb25uZWN0b3JzIGFyZSByZW1vdmVkIGZyb20gdGhlIGNydGMKPiArCSAqIGFuZCB0aGUg Y3J0YyBpcyBkaXNhYmxlZCBpZiBubyBlbmNvZGVyIGlzIGxlZnQuIFRoaXMgcHJlc2VydmVzCj4g KwkgKiBjb21wYXRpYmlsaXR5IHdpdGggdGhlIGxlZ2FjeSBzZXRfY29uZmlnIGJlaGF2aW9yLgo+ ICsJICovCj4gIAlkcm1fZm9yX2VhY2hfY29ubmVjdG9yKGNvbm5lY3Rvciwgc3RhdGUtPmRldikg ewo+ICAJCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKPiAgCj4gQEAgLTEyMCw2 ICsxNDksMTUgQEAgc3RhdGljIGludCBkaXNhYmxlX2NvbmZsaWN0aW5nX2Nvbm5lY3RvcnMoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQo+ICAJCWlmICghZW5jb2RlciB8fCAhKGVuY29k ZXJfbWFzayAmICgxIDw8IGRybV9lbmNvZGVyX2luZGV4KGVuY29kZXIpKSkpCj4gIAkJCWNvbnRp bnVlOwo+ICAKPiArCQlpZiAoIWRpc2FibGVfY29uZmxpY3RpbmdfZW5jb2RlcnMpIHsKPiArCQkJ RFJNX0RFQlVHX0FUT01JQygiW0VOQ09ERVI6JWQ6JXNdIGluIHVzZSBvbiBbQ1JUQzolZDolc10g YnkgW0NPTk5FQ1RPUjolZDolc11cbiIsCj4gKwkJCQkJIGVuY29kZXItPmJhc2UuaWQsIGVuY29k ZXItPm5hbWUsCj4gKwkJCQkJIGNvbm5lY3Rvci0+c3RhdGUtPmNydGMtPmJhc2UuaWQsCj4gKwkJ CQkJIGNvbm5lY3Rvci0+c3RhdGUtPmNydGMtPm5hbWUsCj4gKwkJCQkJIGNvbm5lY3Rvci0+YmFz ZS5pZCwgY29ubmVjdG9yLT5uYW1lKTsKPiArCQkJcmV0dXJuIC1FSU5WQUw7Cj4gKwkJfQo+ICsK PiAgCQljb25uX3N0YXRlID0gZHJtX2F0b21pY19nZXRfY29ubmVjdG9yX3N0YXRlKHN0YXRlLCBj b25uZWN0b3IpOwo+ICAJCWlmIChJU19FUlIoY29ubl9zdGF0ZSkpCj4gIAkJCXJldHVybiBQVFJf RVJSKGNvbm5fc3RhdGUpOwo+IEBAIC0xNDgsMjYgKzE4Niw2IEBAIHN0YXRpYyBpbnQgZGlzYWJs ZV9jb25mbGljdGluZ19jb25uZWN0b3JzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK PiAgCXJldHVybiAwOwo+ICB9Cj4gIAo+IC1zdGF0aWMgYm9vbAo+IC1jaGVja19wZW5kaW5nX2Vu Y29kZXJfYXNzaWdubWVudChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCj4gLQkJCQkg c3RydWN0IGRybV9lbmNvZGVyICpuZXdfZW5jb2RlcikKPiAtewo+IC0Jc3RydWN0IGRybV9jb25u ZWN0b3IgKmNvbm5lY3RvcjsKPiAtCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0 YXRlOwo+IC0JaW50IGk7Cj4gLQo+IC0JZm9yX2VhY2hfY29ubmVjdG9yX2luX3N0YXRlKHN0YXRl LCBjb25uZWN0b3IsIGNvbm5fc3RhdGUsIGkpIHsKPiAtCQlpZiAoY29ubl9zdGF0ZS0+YmVzdF9l bmNvZGVyICE9IG5ld19lbmNvZGVyKQo+IC0JCQljb250aW51ZTsKPiAtCj4gLQkJLyogZW5jb2Rl ciBhbHJlYWR5IGFzc2lnbmVkIGFuZCB3ZSdyZSB0cnlpbmcgdG8gcmUtc3RlYWwgaXQhICovCj4g LQkJaWYgKGNvbm5lY3Rvci0+c3RhdGUtPmJlc3RfZW5jb2RlciAhPSBjb25uX3N0YXRlLT5iZXN0 X2VuY29kZXIpCj4gLQkJCXJldHVybiBmYWxzZTsKPiAtCX0KPiAtCj4gLQlyZXR1cm4gdHJ1ZTsK PiAtfQo+IC0KPiAgc3RhdGljIHZvaWQKPiAgc2V0X2Jlc3RfZW5jb2RlcihzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUsCj4gIAkJIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25u X3N0YXRlLAo+IEBAIC0zMjUsMTMgKzM0Myw2IEBAIHVwZGF0ZV9jb25uZWN0b3Jfcm91dGluZyhz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCj4gIAkJcmV0dXJuIDA7Cj4gIAl9Cj4gIAo+ IC0JaWYgKCFjaGVja19wZW5kaW5nX2VuY29kZXJfYXNzaWdubWVudChzdGF0ZSwgbmV3X2VuY29k ZXIpKSB7Cj4gLQkJRFJNX0RFQlVHX0FUT01JQygiRW5jb2RlciBmb3IgW0NPTk5FQ1RPUjolZDol c10gYWxyZWFkeSBhc3NpZ25lZFxuIiwKPiAtCQkJCSBjb25uZWN0b3ItPmJhc2UuaWQsCj4gLQkJ CQkgY29ubmVjdG9yLT5uYW1lKTsKPiAtCQlyZXR1cm4gLUVJTlZBTDsKPiAtCX0KPiAtCj4gIAly ZXQgPSBzdGVhbF9lbmNvZGVyKHN0YXRlLCBuZXdfZW5jb2Rlcik7Cj4gIAlpZiAocmV0KSB7Cj4g IAkJRFJNX0RFQlVHX0FUT01JQygiRW5jb2RlciBzdGVhbGluZyBmYWlsZWQgZm9yIFtDT05ORUNU T1I6JWQ6JXNdXG4iLAo+IEBAIC01MTAsMTEgKzUyMSw5IEBAIGRybV9hdG9taWNfaGVscGVyX2No ZWNrX21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCQl9Cj4gIAl9Cj4gIAo+IC0J aWYgKHN0YXRlLT5sZWdhY3lfc2V0X2NvbmZpZykgewo+IC0JCXJldCA9IGRpc2FibGVfY29uZmxp Y3RpbmdfY29ubmVjdG9ycyhzdGF0ZSk7Cj4gLQkJaWYgKHJldCkKPiAtCQkJcmV0dXJuIHJldDsK PiAtCX0KPiArCXJldCA9IGhhbmRsZV9jb25mbGljdGluZ19lbmNvZGVycyhzdGF0ZSwgc3RhdGUt PmxlZ2FjeV9zZXRfY29uZmlnKTsKPiArCWlmIChyZXQpCj4gKwkJcmV0dXJuIHJldDsKPiAgCj4g IAlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubmVjdG9y X3N0YXRlLCBpKSB7Cj4gIAkJLyoKPiAtLSAKPiAyLjEuMAo+IAo+IF9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+ IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAoKLS0gClZpbGxlIFN5cmrDpGzDpApJ bnRlbCBPVEMKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==