From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: Re: [PATCH v2.1 5/6] drm/atomic: Handle encoder assignment conflicts
 in a separate check, v2.
Date: Thu, 25 Feb 2016 10:34:36 +0100
Message-ID: <56CECAAC.5020303@linux.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: <dri-devel-bounces@lists.freedesktop.org>
In-Reply-To: <1456303053-28806-6-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

VGhlIGN1cnJlbnQgY2hlY2sgZG9lc24ndCBoYW5kbGUgdGhlIGNhc2Ugd2hlcmUgd2UgZG9uJ3Qg
c3RlYWwgYW4KZW5jb2RlciwgYnV0IGtlZXAgaXQgb24gdGhlIGN1cnJlbnQgY29ubmVjdG9yLiBJ
ZiB3ZSByZXB1cnBvc2UKZGlzYWJsZV9jb25mbGljdGluZ19lbmNvZGVycyB0byBkbyB0aGUgY2hl
Y2tpbmcsIHdlIGp1c3QgaGF2ZQp0byByZWplY3QgdGhlIG9uZXMgdGhhdCBjb25mbGljdC4KCkNo
YW5nZXMgc2luY2UgdjE6Ci0gUmV0dXJuIGVhcmx5IHdoZW4gZW5jb2Rlcl9tYXNrIGlzIGVtcHR5
LCBkcm1fZm9yX2VhY2hfY29ubmVjdG9yCiAgcmVxdWlyZXMgY29ubmVjdGlvbl9tdXRleCBoZWxk
LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxp
bnV4LmludGVsLmNvbT4KVGVzdGNhc2U6IGttc19zZXRtb2RlLmludmFsaWQtY2xvbmUtc2luZ2xl
LWNydGMtc3RlYWxpbmcKLS0tCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21p
Y19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IDM1
NDNjN2ZjZDA3Mi4uZjQ0YzA0MzU5NmQwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJt
X2F0b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIu
YwpAQCAtODYsNyArODYsOCBAQCBkcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9jaGFuZ2VkKHN0cnVj
dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAl9CiB9CiAKLXN0YXRpYyBpbnQgZGlzYWJsZV9j
b25mbGljdGluZ19jb25uZWN0b3JzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKK3N0
YXRpYyBpbnQgaGFuZGxlX2NvbmZsaWN0aW5nX2VuY29kZXJzKHN0cnVjdCBkcm1fYXRvbWljX3N0
YXRlICpzdGF0ZSwKKwkJCQkgICAgICAgYm9vbCBkaXNhYmxlX2NvbmZsaWN0aW5nX2VuY29kZXJz
KQogewogCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlOwogCXN0cnVjdCBk
cm1fY29ubmVjdG9yICpjb25uZWN0b3I7CkBAIC0xMDYsMTAgKzEwNywyMiBAQCBzdGF0aWMgaW50
IGRpc2FibGVfY29uZmxpY3RpbmdfY29ubmVjdG9ycyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq
c3RhdGUpCiAJCWVsc2UKIAkJCW5ld19lbmNvZGVyID0gZnVuY3MtPmJlc3RfZW5jb2Rlcihjb25u
ZWN0b3IpOwogCi0JCWlmIChuZXdfZW5jb2RlcikKKwkJaWYgKG5ld19lbmNvZGVyKSB7CisJCQlp
ZiAoZW5jb2Rlcl9tYXNrICYgKDEgPDwgZHJtX2VuY29kZXJfaW5kZXgobmV3X2VuY29kZXIpKSkg
eworCQkJCURSTV9ERUJVR19BVE9NSUMoIltFTkNPREVSOiVkOiVzXSBvbiBbQ09OTkVDVE9SOiVk
OiVzXSBhbHJlYWR5IGFzc2lnbmVkXG4iLAorCQkJCQluZXdfZW5jb2Rlci0+YmFzZS5pZCwgbmV3
X2VuY29kZXItPm5hbWUsCisJCQkJCWNvbm5lY3Rvci0+YmFzZS5pZCwgY29ubmVjdG9yLT5uYW1l
KTsKKworCQkJCXJldHVybiAtRUlOVkFMOworCQkJfQorCiAJCQllbmNvZGVyX21hc2sgfD0gMSA8
PCBkcm1fZW5jb2Rlcl9pbmRleChuZXdfZW5jb2Rlcik7CisJCX0KIAl9CiAKKwlpZiAoIWVuY29k
ZXJfbWFzaykKKwkJcmV0dXJuIDA7CisKIAlkcm1fZm9yX2VhY2hfY29ubmVjdG9yKGNvbm5lY3Rv
ciwgc3RhdGUtPmRldikgewogCQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAK
QEAgLTEyMCw2ICsxMzMsMTUgQEAgc3RhdGljIGludCBkaXNhYmxlX2NvbmZsaWN0aW5nX2Nvbm5l
Y3RvcnMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQlpZiAoIWVuY29kZXIgfHwg
IShlbmNvZGVyX21hc2sgJiAoMSA8PCBkcm1fZW5jb2Rlcl9pbmRleChlbmNvZGVyKSkpKQogCQkJ
Y29udGludWU7CiAKKwkJaWYgKCFkaXNhYmxlX2NvbmZsaWN0aW5nX2VuY29kZXJzKSB7CisJCQlE
Uk1fREVCVUdfQVRPTUlDKCJbRU5DT0RFUjolZDolc10gaW4gdXNlIG9uIFtDUlRDOiVkOiVzXSBi
eSBbQ09OTkVDVE9SOiVkOiVzXVxuIiwKKwkJCQkJIGVuY29kZXItPmJhc2UuaWQsIGVuY29kZXIt
Pm5hbWUsCisJCQkJCSBjb25uZWN0b3ItPnN0YXRlLT5jcnRjLT5iYXNlLmlkLAorCQkJCQkgY29u
bmVjdG9yLT5zdGF0ZS0+Y3J0Yy0+bmFtZSwKKwkJCQkJIGNvbm5lY3Rvci0+YmFzZS5pZCwgY29u
bmVjdG9yLT5uYW1lKTsKKwkJCXJldHVybiAtRUlOVkFMOworCQl9CisKIAkJY29ubl9zdGF0ZSA9
IGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yKTsKIAkJaWYg
KElTX0VSUihjb25uX3N0YXRlKSkKIAkJCXJldHVybiBQVFJfRVJSKGNvbm5fc3RhdGUpOwpAQCAt
MTQ4LDI2ICsxNzAsNiBAQCBzdGF0aWMgaW50IGRpc2FibGVfY29uZmxpY3RpbmdfY29ubmVjdG9y
cyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRp
YyBib29sCi1jaGVja19wZW5kaW5nX2VuY29kZXJfYXNzaWdubWVudChzdHJ1Y3QgZHJtX2F0b21p
Y19zdGF0ZSAqc3RhdGUsCi0JCQkJIHN0cnVjdCBkcm1fZW5jb2RlciAqbmV3X2VuY29kZXIpCi17
Ci0Jc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rv
cl9zdGF0ZSAqY29ubl9zdGF0ZTsKLQlpbnQgaTsKLQotCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9z
dGF0ZShzdGF0ZSwgY29ubmVjdG9yLCBjb25uX3N0YXRlLCBpKSB7Ci0JCWlmIChjb25uX3N0YXRl
LT5iZXN0X2VuY29kZXIgIT0gbmV3X2VuY29kZXIpCi0JCQljb250aW51ZTsKLQotCQkvKiBlbmNv
ZGVyIGFscmVhZHkgYXNzaWduZWQgYW5kIHdlJ3JlIHRyeWluZyB0byByZS1zdGVhbCBpdCEgKi8K
LQkJaWYgKGNvbm5lY3Rvci0+c3RhdGUtPmJlc3RfZW5jb2RlciAhPSBjb25uX3N0YXRlLT5iZXN0
X2VuY29kZXIpCi0JCQlyZXR1cm4gZmFsc2U7Ci0JfQotCi0JcmV0dXJuIHRydWU7Ci19Ci0KIHN0
YXRpYyB2b2lkCiBzZXRfYmVzdF9lbmNvZGVyKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0
ZSwKIAkJIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlLApAQCAtMzI2LDEz
ICszMjgsNiBAQCB1cGRhdGVfY29ubmVjdG9yX3JvdXRpbmcoc3RydWN0IGRybV9hdG9taWNfc3Rh
dGUgKnN0YXRlLAogCQlyZXR1cm4gMDsKIAl9CiAKLQlpZiAoIWNoZWNrX3BlbmRpbmdfZW5jb2Rl
cl9hc3NpZ25tZW50KHN0YXRlLCBuZXdfZW5jb2RlcikpIHsKLQkJRFJNX0RFQlVHX0FUT01JQygi
RW5jb2RlciBmb3IgW0NPTk5FQ1RPUjolZDolc10gYWxyZWFkeSBhc3NpZ25lZFxuIiwKLQkJCQkg
Y29ubmVjdG9yLT5iYXNlLmlkLAotCQkJCSBjb25uZWN0b3ItPm5hbWUpOwotCQlyZXR1cm4gLUVJ
TlZBTDsKLQl9Ci0KIAlyZXQgPSBzdGVhbF9lbmNvZGVyKHN0YXRlLCBuZXdfZW5jb2Rlcik7CiAJ
aWYgKHJldCkgewogCQlEUk1fREVCVUdfQVRPTUlDKCJFbmNvZGVyIHN0ZWFsaW5nIGZhaWxlZCBm
b3IgW0NPTk5FQ1RPUjolZDolc11cbiIsCkBAIC01MTEsMTEgKzUwNiw5IEBAIGRybV9hdG9taWNf
aGVscGVyX2NoZWNrX21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJfQogCX0KIAot
CWlmIChzdGF0ZS0+bGVnYWN5X3NldF9jb25maWcpIHsKLQkJcmV0ID0gZGlzYWJsZV9jb25mbGlj
dGluZ19jb25uZWN0b3JzKHN0YXRlKTsKLQkJaWYgKHJldCkKLQkJCXJldHVybiByZXQ7Ci0JfQor
CXJldCA9IGhhbmRsZV9jb25mbGljdGluZ19lbmNvZGVycyhzdGF0ZSwgc3RhdGUtPmxlZ2FjeV9z
ZXRfY29uZmlnKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OwogCiAJZm9yX2VhY2hfY29ubmVj
dG9yX2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IsIGNvbm5lY3Rvcl9zdGF0ZSwgaSkgewogCQkv
KgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl
dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v
bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==