From: Maarten Lankhorst Subject: [PATCH 1/4] drm/atomic: Unify conflicting encoder handling. Date: Thu, 6 Apr 2017 13:19:00 +0200 Message-ID: <1491477543-31257-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1491477543-31257-1-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: In-Reply-To: <1491477543-31257-1-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: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Q3VycmVudGx5IHdlIHVzZSBhIGZsYWcgdG8gY2hhbmdlIGJlaGF2aW9yIGluIGF0b21pYyBjb21t aXQKd2hldGhlciBhIGNvbmZsaWN0aW5nIGVuY29kZXIgc2hvdWxkIGJlIGVuYWJsZWQgb3IgZGlz YWJsZWQuClRoaXMgaXMgdXNlZCBmb3IgdGhlIGxlZ2FjeSBzZXRfY29uZmlnIGhlbHBlciwgd2hp Y2ggZGlzYWJsZXMKY29ubmVjdG9ycyB0aGF0IGhhdmUgYSBjb25mbGljdGluZyBlbmNvZGVyIGJ1 dCBub3QgcGFydCBvZiB0aGUKYWN0aXZlIGNydGMgbGlzdC4KClRoZXJlJ3Mgbm8gbmVlZCBmb3Ig dGhpcyB0byBiZSBoYW5kbGVkIGluIGF0b21pYyBjb21taXQsIGl0CmNvdWxkIGJlIGRvbmUgaW4g dGhlIHNldF9jb25maWcgaGVscGVyIGluc3RlYWQuIFRoaXMgd2lsbApsZXQgdGhlIGF0b21pYyBj aGVjayBmdW5jdGlvbiByZWplY3QgYW55IGNvbmZsaWN0aW5nIGVuY29kZXJzLAp3aGlsZSBzZXRf Y29uZmlnIGNhbiBkaXNhYmxlIGNvbmZsaWN0aW5nIGNydGMncy4gVGhpcyBtYWtlcyBpdApwb3Nz aWJsZSB0byByZWNhbGN1bGF0ZSB0aGUgY2hhbmdlZCBmbGFncyBpbiAxIGxvb3AuCgpTaWduZWQt b2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIHwgNyArKysrKy0t CiBpbmNsdWRlL2RybS9kcm1fYXRvbWljLmggICAgICAgICAgICB8IDIgLS0KIDIgZmlsZXMgY2hh bmdlZCwgNSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWNfaGVscGVyLmMKaW5kZXggYzM5OTRiNGQ1ZjMyLi4xN2Y1NTdmOGVjYTYgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljX2hlbHBlci5jCkBAIC01MTcsNyArNTE3LDcgQEAgZHJtX2F0b21pY19oZWxw ZXJfY2hlY2tfbW9kZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQl9CiAJfQogCi0JcmV0 ID0gaGFuZGxlX2NvbmZsaWN0aW5nX2VuY29kZXJzKHN0YXRlLCBzdGF0ZS0+bGVnYWN5X3NldF9j b25maWcpOworCXJldCA9IGhhbmRsZV9jb25mbGljdGluZ19lbmNvZGVycyhzdGF0ZSwgZmFsc2Up OwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTIyODksMTIgKzIyODksMTUgQEAgaW50 IGRybV9hdG9taWNfaGVscGVyX3NldF9jb25maWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0LAog CWlmICghc3RhdGUpCiAJCXJldHVybiAtRU5PTUVNOwogCi0Jc3RhdGUtPmxlZ2FjeV9zZXRfY29u ZmlnID0gdHJ1ZTsKIAlzdGF0ZS0+YWNxdWlyZV9jdHggPSBjdHg7CiAJcmV0ID0gX19kcm1fYXRv bWljX2hlbHBlcl9zZXRfY29uZmlnKHNldCwgc3RhdGUpOwogCWlmIChyZXQgIT0gMCkKIAkJZ290 byBmYWlsOwogCisJcmV0ID0gaGFuZGxlX2NvbmZsaWN0aW5nX2VuY29kZXJzKHN0YXRlLCB0cnVl KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJcmV0ID0gZHJtX2F0b21pY19jb21taXQo c3RhdGUpOwogCiBmYWlsOgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oIGIv aW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oCmluZGV4IGZkMzNlZDVlYWViNC4uNzg4ZGFmNzU2ZjQ4 IDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fYXRvbWljLmgKKysrIGIvaW5jbHVkZS9kcm0v ZHJtX2F0b21pYy5oCkBAIC0xNjAsNyArMTYwLDYgQEAgc3RydWN0IF9fZHJtX2Nvbm5uZWN0b3Jz X3N0YXRlIHsKICAqIEBkZXY6IHBhcmVudCBEUk0gZGV2aWNlCiAgKiBAYWxsb3dfbW9kZXNldDog YWxsb3cgZnVsbCBtb2Rlc2V0CiAgKiBAbGVnYWN5X2N1cnNvcl91cGRhdGU6IGhpbnQgdG8gZW5m b3JjZSBsZWdhY3kgY3Vyc29yIElPQ1RMIHNlbWFudGljcwotICogQGxlZ2FjeV9zZXRfY29uZmln OiBEaXNhYmxlIGNvbmZsaWN0aW5nIGVuY29kZXJzIGluc3RlYWQgb2YgZmFpbGluZyB3aXRoIC1F SU5WQUwuCiAgKiBAcGxhbmVzOiBwb2ludGVyIHRvIGFycmF5IG9mIHN0cnVjdHVyZXMgd2l0aCBw ZXItcGxhbmUgZGF0YQogICogQGNydGNzOiBwb2ludGVyIHRvIGFycmF5IG9mIENSVEMgcG9pbnRl cnMKICAqIEBudW1fY29ubmVjdG9yOiBzaXplIG9mIHRoZSBAY29ubmVjdG9ycyBhbmQgQGNvbm5l Y3Rvcl9zdGF0ZXMgYXJyYXlzCkBAIC0xNzMsNyArMTcyLDYgQEAgc3RydWN0IGRybV9hdG9taWNf c3RhdGUgewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7CiAJYm9vbCBhbGxvd19tb2Rlc2V0IDog MTsKIAlib29sIGxlZ2FjeV9jdXJzb3JfdXBkYXRlIDogMTsKLQlib29sIGxlZ2FjeV9zZXRfY29u ZmlnIDogMTsKIAlzdHJ1Y3QgX19kcm1fcGxhbmVzX3N0YXRlICpwbGFuZXM7CiAJc3RydWN0IF9f ZHJtX2NydGNzX3N0YXRlICpjcnRjczsKIAlpbnQgbnVtX2Nvbm5lY3RvcjsKLS0gCjIuNy40Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK