From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 7/7] drm/atomic: Clean up update_connector_routing. Date: Thu, 3 Mar 2016 10:17:42 +0100 Message-ID: <1456996662-8704-8-git-send-email-maarten.lankhorst@linux.intel.com> References: <1456996662-8704-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: <1456996662-8704-1-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Y29ubmVjdG9yX3N0YXRlLT5jcnRjIGNhbiBubyBsb25nZXIgYmUgdW5zZXQgYnkgYWNjaWRlbnQs CnNvIHRoYXQgY2hlY2sgY2FuIGJlIHJlbW92ZWQuIFRoZSBvdGhlciBjb2RlIG9wZW4tY29kZXMK ZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZSwgc28gdXNlIHRoYXQuCgpTaWduZWQt b2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIHwgMTcgKysrKy0t LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIGIv ZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKaW5kZXggMjM5NTIwMWViN2FiLi45 ZjBkMTZlYjA0YjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCkBAIC0yNjUsNyAr MjY1LDcgQEAgdXBkYXRlX2Nvbm5lY3Rvcl9yb3V0aW5nKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSwKIAljb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MgKmZ1bmNz OwogCXN0cnVjdCBkcm1fZW5jb2RlciAqbmV3X2VuY29kZXI7CiAJc3RydWN0IGRybV9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlOwotCWludCBpZHgsIHJldDsKKwlpbnQgcmV0OwogCiAJRFJNX0RFQlVH X0FUT01JQygiVXBkYXRpbmcgcm91dGluZyBmb3IgW0NPTk5FQ1RPUjolZDolc11cbiIsCiAJCQkg Y29ubmVjdG9yLT5iYXNlLmlkLApAQCAtMjczLDE2ICsyNzMsMTIgQEAgdXBkYXRlX2Nvbm5lY3Rv cl9yb3V0aW5nKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAogCWlmIChjb25uZWN0 b3ItPnN0YXRlLT5jcnRjICE9IGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YykgewogCQlpZiAoY29ubmVj dG9yLT5zdGF0ZS0+Y3J0YykgewotCQkJaWR4ID0gZHJtX2NydGNfaW5kZXgoY29ubmVjdG9yLT5z dGF0ZS0+Y3J0Yyk7Ci0KLQkJCWNydGNfc3RhdGUgPSBzdGF0ZS0+Y3J0Y19zdGF0ZXNbaWR4XTsK KwkJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRl LCBjb25uZWN0b3ItPnN0YXRlLT5jcnRjKTsKIAkJCWNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hh bmdlZCA9IHRydWU7CiAJCX0KIAogCQlpZiAoY29ubmVjdG9yX3N0YXRlLT5jcnRjKSB7Ci0JCQlp ZHggPSBkcm1fY3J0Y19pbmRleChjb25uZWN0b3Jfc3RhdGUtPmNydGMpOwotCi0JCQljcnRjX3N0 YXRlID0gc3RhdGUtPmNydGNfc3RhdGVzW2lkeF07CisJCQljcnRjX3N0YXRlID0gZHJtX2F0b21p Y19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgY29ubmVjdG9yX3N0YXRlLT5jcnRjKTsK IAkJCWNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CiAJCX0KIAl9CkBAIC0z MzYsMTQgKzMzMiw5IEBAIHVwZGF0ZV9jb25uZWN0b3Jfcm91dGluZyhzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqc3RhdGUsCiAKIAlzdGVhbF9lbmNvZGVyKHN0YXRlLCBuZXdfZW5jb2Rlcik7CiAK LQlpZiAoV0FSTl9PTighY29ubmVjdG9yX3N0YXRlLT5jcnRjKSkKLQkJcmV0dXJuIC1FSU5WQUw7 Ci0KIAlzZXRfYmVzdF9lbmNvZGVyKHN0YXRlLCBjb25uZWN0b3Jfc3RhdGUsIG5ld19lbmNvZGVy KTsKIAotCWlkeCA9IGRybV9jcnRjX2luZGV4KGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7Ci0KLQlj cnRjX3N0YXRlID0gc3RhdGUtPmNydGNfc3RhdGVzW2lkeF07CisJY3J0Y19zdGF0ZSA9IGRybV9h dG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsIGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0 Yyk7CiAJY3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkID0gdHJ1ZTsKIAogCURSTV9ERUJV R19BVE9NSUMoIltDT05ORUNUT1I6JWQ6JXNdIHVzaW5nIFtFTkNPREVSOiVkOiVzXSBvbiBbQ1JU QzolZDolc11cbiIsCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==