From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>
Subject: Re: [PATCH v2 5/6] drm/atomic: Handle encoder
 assignment conflicts in a separate check.
Date: Tue, 1 Mar 2016 19:21:19 +0200
Message-ID: <20160301172119.GL15993@intel.com>
References: <1456303053-28806-1-git-send-email-maarten.lankhorst@linux.intel.com>
 <1456303053-28806-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: <intel-gfx-bounces@lists.freedesktop.org>
Content-Disposition: inline
In-Reply-To: <1456303053-28806-6-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

T24gV2VkLCBGZWIgMjQsIDIwMTYgYXQgMDk6Mzc6MzJBTSArMDEwMCwgTWFhcnRlbiBMYW5raG9y
c3Qgd3JvdGU6Cj4gVGhlIGN1cnJlbnQgY2hlY2sgZG9lc24ndCBoYW5kbGUgdGhlIGNhc2Ugd2hl
cmUgd2UgZG9uJ3Qgc3RlYWwgYW4KPiBlbmNvZGVyLCBidXQga2VlcCBpdCBvbiB0aGUgY3VycmVu
dCBjb25uZWN0b3IuIElmIHdlIHJlcHVycG9zZQo+IGRpc2FibGVfY29uZmxpY3RpbmdfZW5jb2Rl
cnMgdG8gZG8gdGhlIGNoZWNraW5nLCB3ZSBqdXN0IGhhdmUKPiB0byByZWplY3QgdGhlIG9uZXMg
dGhhdCBjb25mbGljdC4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh
cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+IFRlc3RjYXNlOiBrbXNfc2V0bW9kZS5p
bnZhbGlkLWNsb25lLXNpbmdsZS1jcnRjLXN0ZWFsaW5nCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2Ry
bS9kcm1fYXRvbWljX2hlbHBlci5jIHwgNTggKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25z
KC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5j
IGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKPiBpbmRleCAzNTQzYzdmY2Qw
NzIuLjMyYmQ1YmViZWYwYiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21p
Y19oZWxwZXIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCj4g
QEAgLTg2LDcgKzg2LDggQEAgZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfY2hhbmdlZChzdHJ1Y3Qg
ZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCj4gIAl9Cj4gIH0KPiAgCj4gLXN0YXRpYyBpbnQgZGlz
YWJsZV9jb25mbGljdGluZ19jb25uZWN0b3JzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0
ZSkKPiArc3RhdGljIGludCBoYW5kbGVfY29uZmxpY3RpbmdfZW5jb2RlcnMoc3RydWN0IGRybV9h
dG9taWNfc3RhdGUgKnN0YXRlLAo+ICsJCQkJICAgICAgIGJvb2wgZGlzYWJsZV9jb25mbGljdGlu
Z19lbmNvZGVycykKPiAgewo+ICAJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3Rh
dGU7Cj4gIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwo+IEBAIC0xMDYsOCArMTA3
LDE3IEBAIHN0YXRpYyBpbnQgZGlzYWJsZV9jb25mbGljdGluZ19jb25uZWN0b3JzKHN0cnVjdCBk
cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKPiAgCQllbHNlCj4gIAkJCW5ld19lbmNvZGVyID0gZnVu
Y3MtPmJlc3RfZW5jb2Rlcihjb25uZWN0b3IpOwo+ICAKPiAtCQlpZiAobmV3X2VuY29kZXIpCj4g
KwkJaWYgKG5ld19lbmNvZGVyKSB7Cj4gKwkJCWlmIChlbmNvZGVyX21hc2sgJiAoMSA8PCBkcm1f
ZW5jb2Rlcl9pbmRleChuZXdfZW5jb2RlcikpKSB7Cj4gKwkJCQlEUk1fREVCVUdfQVRPTUlDKCJb
RU5DT0RFUjolZDolc10gb24gW0NPTk5FQ1RPUjolZDolc10gYWxyZWFkeSBhc3NpZ25lZFxuIiwK
PiArCQkJCQluZXdfZW5jb2Rlci0+YmFzZS5pZCwgbmV3X2VuY29kZXItPm5hbWUsCj4gKwkJCQkJ
Y29ubmVjdG9yLT5iYXNlLmlkLCBjb25uZWN0b3ItPm5hbWUpOwo+ICsKPiArCQkJCXJldHVybiAt
RUlOVkFMOwo+ICsJCQl9Cj4gKwo+ICAJCQllbmNvZGVyX21hc2sgfD0gMSA8PCBkcm1fZW5jb2Rl
cl9pbmRleChuZXdfZW5jb2Rlcik7Cj4gKwkJfQo+ICAJfQo+ICAKPiAgCWRybV9mb3JfZWFjaF9j
b25uZWN0b3IoY29ubmVjdG9yLCBzdGF0ZS0+ZGV2KSB7Cj4gQEAgLTEyMCw2ICsxMzAsMTUgQEAg
c3RhdGljIGludCBkaXNhYmxlX2NvbmZsaWN0aW5nX2Nvbm5lY3RvcnMoc3RydWN0IGRybV9hdG9t
aWNfc3RhdGUgKnN0YXRlKQo+ICAJCWlmICghZW5jb2RlciB8fCAhKGVuY29kZXJfbWFzayAmICgx
IDw8IGRybV9lbmNvZGVyX2luZGV4KGVuY29kZXIpKSkpCj4gIAkJCWNvbnRpbnVlOwo+ICAKPiAr
CQlpZiAoIWRpc2FibGVfY29uZmxpY3RpbmdfZW5jb2RlcnMpIHsKPiArCQkJRFJNX0RFQlVHX0FU
T01JQygiW0VOQ09ERVI6JWQ6JXNdIGluIHVzZSBvbiBbQ1JUQzolZDolc10gYnkgW0NPTk5FQ1RP
UjolZDolc11cbiIsCj4gKwkJCQkJIGVuY29kZXItPmJhc2UuaWQsIGVuY29kZXItPm5hbWUsCj4g
KwkJCQkJIGNvbm5lY3Rvci0+c3RhdGUtPmNydGMtPmJhc2UuaWQsCj4gKwkJCQkJIGNvbm5lY3Rv
ci0+c3RhdGUtPmNydGMtPm5hbWUsCj4gKwkJCQkJIGNvbm5lY3Rvci0+YmFzZS5pZCwgY29ubmVj
dG9yLT5uYW1lKTsKPiArCQkJcmV0dXJuIC1FSU5WQUw7Cj4gKwkJfQo+ICsKCkhtbS4gVGhpcyBj
YW4ndCBwb3NzaWJseSB3b3JrIGNhbiBpdD8gSWYgSSdtIHJlZGluZyB0aGluZ3MgY29ycmVjdGx5
CnRoaXMgd291bGQgYWxyZWFkeSBmYWlsIGlmIHdlIGhhdmUgY3J0YzAtPmVuYzAtPmNvbm4wIGFu
ZCB0aGVuIHRyeSB0bwpjaGFuZ2UgaXQgdG8gY3J0YzEtPmVuYzAtPmNvbm4wLiBCdXQgcGVyaGFw
cyBJJ20gbWlzc2luZyBzb21lIHN1YnRsZQp0aGluZyAodGhlcmUgYXJlIGEgbG90IG9mIHRob3Nl
IGluIG91ciBhdG9taWMgZnJhbWV3b3JrIGR1ZSB0byB0aGluZwphdXRvbWFnaWNhbGx5IGdldHRp
bmcgYWRkZWQgdG8gdGhlIHN0YXRlKS4KClRoZSBpZGVhIEkgaGFkIGZvciBjaGVja2luZyB0aGlu
Z3Mgd2FzIHNvbWV0aGluZyBsaWtlOgpmb3IgbGVnYWN5IHNldGNydGM6CiBmb3JfbmV3X2Nvbm5z
dGF0ZSgpCiAJaWYgKCFzdGF0ZS0+Y3J0YykKCQljb250aW51ZTsKCWVuYyA9IC0+YmVzdF9lbmNv
ZGVyKCk7CglpZiAoZW5jb2Rlcl9tYXNrICYgMSA8PCBlbmMuaW5kZXgpCgkJZmFpbDsKIAllbmNv
ZGVyX21hc2sgfD0gMSA8PCBlbmMuaW5kZXg7CiBmb3JfYWxsX2Nvbm5lY3RvcnMKIAlpZiAobmV3
X3N0YXRlKQoJCWNvbnRpbnVlOwoJaWYgKCFvbGRfc3RhdGUtPmNydGMpCgkJY29udGludWU7Cgll
bmMgPSBjb25uLT5iZXN0X2VuY29kZXI7CglpZiAoZW5jb2Rlcl9tYXNrICYgMSA8PCBlbmMuaW5k
ZXgpCgkJZGlzYWJsZV9jb25uZWN0b3I7Cgpmb3IgYXRvbWljOiAKIGZvcl9hbGxfY29ubmVjdG9y
cwogCWlmIChuZXdfc3RhdGUpCgkJc3RhdGUgPSBuZXdfc3RhdGU7CgllbHNlCgkJc3RhdGUgPSBv
bGRfc3RhdGU7CglpZiAoIXN0YXRlLT5jcnRjKQoJCWNvbnRpbnVlOwoJaWYgKG5ld19zdGF0ZSkK
CQllbmMgPSAtPmJlc3RfZW5jb2RlcigpCgllbHNlCgkJZW5jID0gY29ubi0+YmVzdF9lbmNvZGVy
OwoJaWYgKGVuY29kZXJfbWFzayAmIDEgPDwgZW5jLmluZGV4KQoJCWZhaWw7CgllbmNvZGVyX21h
c2sgfD0gMSA8PCBlbmMuaW5kZXg7CgpUaG91Z2ggSSdtIG5vdCBlbnRpcmVseSBzdXJlIHRoZSBs
ZWdhY3kgdmFyaWFudCB3b3VsZCB3b3JrIGNvcnJlY3RseSBkdWUKdG8gc29tZXRoaW5nIG1heWJl
IGFkZGluZyB0aGUgY29ubmVjdG9yIHRvIHRoZSBzdGF0ZSBldmVuIHRob3VnaCBpdCdzCm5vdCBw
YXJ0IG9mIHRoZSBzZXQgdGhhdCB0aGUgdXNlciByZXF1ZXN0ZWQuIEkgbWlnaHQgbmVlZCB0byB0
aGluayBtb3JlCm9uIHRoaXMuCgoKPiAgCQljb25uX3N0YXRlID0gZHJtX2F0b21pY19nZXRfY29u
bmVjdG9yX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IpOwo+ICAJCWlmIChJU19FUlIoY29ubl9zdGF0
ZSkpCj4gIAkJCXJldHVybiBQVFJfRVJSKGNvbm5fc3RhdGUpOwo+IEBAIC0xNDgsMjYgKzE2Nyw2
IEBAIHN0YXRpYyBpbnQgZGlzYWJsZV9jb25mbGljdGluZ19jb25uZWN0b3JzKHN0cnVjdCBkcm1f
YXRvbWljX3N0YXRlICpzdGF0ZSkKPiAgCXJldHVybiAwOwo+ICB9Cj4gIAo+IC1zdGF0aWMgYm9v
bAo+IC1jaGVja19wZW5kaW5nX2VuY29kZXJfYXNzaWdubWVudChzdHJ1Y3QgZHJtX2F0b21pY19z
dGF0ZSAqc3RhdGUsCj4gLQkJCQkgc3RydWN0IGRybV9lbmNvZGVyICpuZXdfZW5jb2RlcikKPiAt
ewo+IC0Jc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKPiAtCXN0cnVjdCBkcm1fY29u
bmVjdG9yX3N0YXRlICpjb25uX3N0YXRlOwo+IC0JaW50IGk7Cj4gLQo+IC0JZm9yX2VhY2hfY29u
bmVjdG9yX2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IsIGNvbm5fc3RhdGUsIGkpIHsKPiAtCQlp
ZiAoY29ubl9zdGF0ZS0+YmVzdF9lbmNvZGVyICE9IG5ld19lbmNvZGVyKQo+IC0JCQljb250aW51
ZTsKPiAtCj4gLQkJLyogZW5jb2RlciBhbHJlYWR5IGFzc2lnbmVkIGFuZCB3ZSdyZSB0cnlpbmcg
dG8gcmUtc3RlYWwgaXQhICovCj4gLQkJaWYgKGNvbm5lY3Rvci0+c3RhdGUtPmJlc3RfZW5jb2Rl
ciAhPSBjb25uX3N0YXRlLT5iZXN0X2VuY29kZXIpCj4gLQkJCXJldHVybiBmYWxzZTsKPiAtCX0K
PiAtCj4gLQlyZXR1cm4gdHJ1ZTsKPiAtfQo+IC0KPiAgc3RhdGljIHZvaWQKPiAgc2V0X2Jlc3Rf
ZW5jb2RlcihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCj4gIAkJIHN0cnVjdCBkcm1f
Y29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlLAo+IEBAIC0zMjYsMTMgKzMyNSw2IEBAIHVwZGF0
ZV9jb25uZWN0b3Jfcm91dGluZyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCj4gIAkJ
cmV0dXJuIDA7Cj4gIAl9Cj4gIAo+IC0JaWYgKCFjaGVja19wZW5kaW5nX2VuY29kZXJfYXNzaWdu
bWVudChzdGF0ZSwgbmV3X2VuY29kZXIpKSB7Cj4gLQkJRFJNX0RFQlVHX0FUT01JQygiRW5jb2Rl
ciBmb3IgW0NPTk5FQ1RPUjolZDolc10gYWxyZWFkeSBhc3NpZ25lZFxuIiwKPiAtCQkJCSBjb25u
ZWN0b3ItPmJhc2UuaWQsCj4gLQkJCQkgY29ubmVjdG9yLT5uYW1lKTsKPiAtCQlyZXR1cm4gLUVJ
TlZBTDsKPiAtCX0KPiAtCj4gIAlyZXQgPSBzdGVhbF9lbmNvZGVyKHN0YXRlLCBuZXdfZW5jb2Rl
cik7Cj4gIAlpZiAocmV0KSB7Cj4gIAkJRFJNX0RFQlVHX0FUT01JQygiRW5jb2RlciBzdGVhbGlu
ZyBmYWlsZWQgZm9yIFtDT05ORUNUT1I6JWQ6JXNdXG4iLAo+IEBAIC01MTEsMTEgKzUwMyw5IEBA
IGRybV9hdG9taWNfaGVscGVyX2NoZWNrX21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK
PiAgCQl9Cj4gIAl9Cj4gIAo+IC0JaWYgKHN0YXRlLT5sZWdhY3lfc2V0X2NvbmZpZykgewo+IC0J
CXJldCA9IGRpc2FibGVfY29uZmxpY3RpbmdfY29ubmVjdG9ycyhzdGF0ZSk7Cj4gLQkJaWYgKHJl
dCkKPiAtCQkJcmV0dXJuIHJldDsKPiAtCX0KPiArCXJldCA9IGhhbmRsZV9jb25mbGljdGluZ19l
bmNvZGVycyhzdGF0ZSwgc3RhdGUtPmxlZ2FjeV9zZXRfY29uZmlnKTsKPiArCWlmIChyZXQpCj4g
KwkJcmV0dXJuIHJldDsKPiAgCj4gIAlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUs
IGNvbm5lY3RvciwgY29ubmVjdG9yX3N0YXRlLCBpKSB7Cj4gIAkJLyoKPiAtLSAKPiAyLjEuMAo+
IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gSW50
ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBo
dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoK
LS0gClZpbGxlIFN5cmrDpGzDpApJbnRlbCBPVEMKX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz
dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v
bGlzdGluZm8vaW50ZWwtZ2Z4Cg==