From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 6/7] drm/atomic: Clean up steal_encoder, v2. Date: Thu, 3 Mar 2016 10:17:41 +0100 Message-ID: <1456996662-8704-7-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 Tm93IHRoYXQgb25seSBlbmNvZGVycyBjYW4gYmUgc3RvbGVuIHRoYXQgYXJlIHBhcnQgb2YgdGhl IHN0YXRlCnN0ZWFsX2VuY29kZXIgbm8gbG9uZ2VyIG5lZWRzIHRvIGluc3BlY3QgYWxsIGNvbm5l Y3RvcnMsCmp1c3QgdGhvc2UgdGhhdCBhcmUgcGFydCBvZiB0aGUgYXRvbWljIHN0YXRlLgoKQ2hh bmdlcyBzaW5jZSB2MToKLSBDaGFuZ2UgcmV0dXJuIHZhbHVlIHRvIHZvaWQsIGNhbiBubyBsb25n ZXIgZmFpbC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmto b3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVs cGVyLmMgfCAyNSArKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBp bnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vZHJtX2F0b21pY19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBl ci5jCmluZGV4IGJiNjAxNDhjNWM4ZC4uMjM5NTIwMWViN2FiIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pY19oZWxwZXIuYwpAQCAtMjI3LDI1ICsyMjcsMTggQEAgc2V0X2Jlc3RfZW5jb2RlcihzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJY29ubl9zdGF0ZS0+YmVzdF9lbmNvZGVyID0g ZW5jb2RlcjsKIH0KIAotc3RhdGljIGludAorc3RhdGljIHZvaWQKIHN0ZWFsX2VuY29kZXIoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCSAgICAgIHN0cnVjdCBkcm1fZW5jb2RlciAq ZW5jb2RlcikKIHsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJc3RydWN0 IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAq Y29ubmVjdG9yX3N0YXRlOworCWludCBpOwogCi0JZHJtX2Zvcl9lYWNoX2Nvbm5lY3Rvcihjb25u ZWN0b3IsIHN0YXRlLT5kZXYpIHsKKwlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUs IGNvbm5lY3RvciwgY29ubmVjdG9yX3N0YXRlLCBpKSB7CiAJCXN0cnVjdCBkcm1fY3J0YyAqZW5j b2Rlcl9jcnRjOwogCi0JCWlmIChjb25uZWN0b3ItPnN0YXRlLT5iZXN0X2VuY29kZXIgIT0gZW5j b2RlcikKLQkJCWNvbnRpbnVlOwotCi0JCWNvbm5lY3Rvcl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0 X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwKLQkJCQkJCQkJIGNvbm5lY3Rvcik7Ci0JCWlmIChJU19F UlIoY29ubmVjdG9yX3N0YXRlKSkKLQkJCXJldHVybiBQVFJfRVJSKGNvbm5lY3Rvcl9zdGF0ZSk7 Ci0KIAkJaWYgKGNvbm5lY3Rvcl9zdGF0ZS0+YmVzdF9lbmNvZGVyICE9IGVuY29kZXIpCiAJCQlj b250aW51ZTsKIApAQCAtMjYwLDEwICsyNTMsOCBAQCBzdGVhbF9lbmNvZGVyKHN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0 aW5nX2NydGNfc3RhdGUoc3RhdGUsIGVuY29kZXJfY3J0Yyk7CiAJCWNydGNfc3RhdGUtPmNvbm5l Y3RvcnNfY2hhbmdlZCA9IHRydWU7CiAKLQkJcmV0dXJuIDA7CisJCXJldHVybjsKIAl9Ci0KLQly ZXR1cm4gMDsKIH0KIAogc3RhdGljIGludApAQCAtMzQzLDEzICszMzQsNyBAQCB1cGRhdGVfY29u bmVjdG9yX3JvdXRpbmcoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQlyZXR1cm4g MDsKIAl9CiAKLQlyZXQgPSBzdGVhbF9lbmNvZGVyKHN0YXRlLCBuZXdfZW5jb2Rlcik7Ci0JaWYg KHJldCkgewotCQlEUk1fREVCVUdfQVRPTUlDKCJFbmNvZGVyIHN0ZWFsaW5nIGZhaWxlZCBmb3Ig W0NPTk5FQ1RPUjolZDolc11cbiIsCi0JCQkJIGNvbm5lY3Rvci0+YmFzZS5pZCwKLQkJCQkgY29u bmVjdG9yLT5uYW1lKTsKLQkJcmV0dXJuIHJldDsKLQl9CisJc3RlYWxfZW5jb2RlcihzdGF0ZSwg bmV3X2VuY29kZXIpOwogCiAJaWYgKFdBUk5fT04oIWNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YykpCiAJ CXJldHVybiAtRUlOVkFMOwotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=