From: Maarten Lankhorst Subject: [PATCH 3/4] drm/atomic: Move enable/connector check up in check_modeset() Date: Thu, 6 Apr 2017 13:19:02 +0200 Message-ID: <1491477543-31257-4-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: 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 Tm93IHRoYXQgaGFuZGxlX2NvbmZsaWN0aW5nX2VuY29kZXJzIG5vIGxvbmdlciB0b3VjaGVzIGFj dGl2ZSBzdGF0ZSwKc28gdGhlcmUncyBubyBuZWVkIHRvIGRvIHRoZSBjaGVjayBxdWl0ZSB0aGF0 IGxhdGUgYW55IG1vcmUuCgpEb2luZyBpdCB3aXRoIGFsbCB0aGUgb3RoZXIgY2hlY2tzIG1ha2Vz IGl0IGEgbG90IG1vcmUgY2xlYXIgd2hhdCB0aGUKYmVsb3cgYmxvY2sgdHJpZXMgdG8gYWNjb21w bGlzaCwgYW5kIHRoaXMgZmVlbHMgbGlrZSBhIGJldHRlciBwbGFjZSB0bwpwdXQgdGhlIGNoZWNr LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxp bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyB8 IDIwICsrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygr KSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwppbmRleCBk MjY3ZjQ1ZDJjOWEuLjU0M2FjMzMwYTFhZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9hdG9taWNfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVy LmMKQEAgLTQ5NCw2ICs0OTQsOSBAQCBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19tb2Rlc2V0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50IGksIHJldDsKIAogCWZvcl9lYWNoX29sZG5ld19j cnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUs IGkpIHsKKwkJYm9vbCBoYXNfY29ubmVjdG9ycyA9CisJCQkhIW5ld19jcnRjX3N0YXRlLT5jb25u ZWN0b3JfbWFzazsKKwogCQlpZiAoIWRybV9tb2RlX2VxdWFsKCZvbGRfY3J0Y19zdGF0ZS0+bW9k ZSwgJm5ld19jcnRjX3N0YXRlLT5tb2RlKSkgewogCQkJRFJNX0RFQlVHX0FUT01JQygiW0NSVEM6 JWQ6JXNdIG1vZGUgY2hhbmdlZFxuIiwKIAkJCQkJIGNydGMtPmJhc2UuaWQsIGNydGMtPm5hbWUp OwpAQCAtNTIxLDYgKzUyNCwxMyBAQCBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19tb2Rlc2V0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJCSBjcnRjLT5iYXNlLmlkLCBjcnRjLT5uYW1lKTsK IAkJCW5ld19jcnRjX3N0YXRlLT5hY3RpdmVfY2hhbmdlZCA9IHRydWU7CiAJCX0KKworCQlpZiAo bmV3X2NydGNfc3RhdGUtPmVuYWJsZSAhPSBoYXNfY29ubmVjdG9ycykgeworCQkJRFJNX0RFQlVH X0FUT01JQygiW0NSVEM6JWQ6JXNdIGVuYWJsZWQvY29ubmVjdG9ycyBtaXNtYXRjaFxuIiwKKwkJ CQkJIGNydGMtPmJhc2UuaWQsIGNydGMtPm5hbWUpOworCisJCQlyZXR1cm4gLUVJTlZBTDsKKwkJ fQogCX0KIAogCXJldCA9IGhhbmRsZV9jb25mbGljdGluZ19lbmNvZGVycyhzdGF0ZSwgZmFsc2Up OwpAQCAtNTU0LDkgKzU2NCw2IEBAIGRybV9hdG9taWNfaGVscGVyX2NoZWNrX21vZGVzZXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAkgKiBjcnRjIG9ubHkgY2hhbmdlZCBpdHMgbW9kZSBidXQg aGFzIHRoZSBzYW1lIHNldCBvZiBjb25uZWN0b3JzLgogCSAqLwogCWZvcl9lYWNoX29sZG5ld19j cnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUs IGkpIHsKLQkJYm9vbCBoYXNfY29ubmVjdG9ycyA9Ci0JCQkhIW5ld19jcnRjX3N0YXRlLT5jb25u ZWN0b3JfbWFzazsKLQogCQlpZiAoIWRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KG5ld19j cnRjX3N0YXRlKSkKIAkJCWNvbnRpbnVlOwogCkBAIC01NzIsMTMgKzU3OSw2IEBAIGRybV9hdG9t aWNfaGVscGVyX2NoZWNrX21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJcmV0ID0g ZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfcGxhbmVzKHN0YXRlLCBjcnRjKTsKIAkJaWYgKHJldCAh PSAwKQogCQkJcmV0dXJuIHJldDsKLQotCQlpZiAobmV3X2NydGNfc3RhdGUtPmVuYWJsZSAhPSBo YXNfY29ubmVjdG9ycykgewotCQkJRFJNX0RFQlVHX0FUT01JQygiW0NSVEM6JWQ6JXNdIGVuYWJs ZWQvY29ubmVjdG9ycyBtaXNtYXRjaFxuIiwKLQkJCQkJIGNydGMtPmJhc2UuaWQsIGNydGMtPm5h bWUpOwotCi0JCQlyZXR1cm4gLUVJTlZBTDsKLQkJfQogCX0KIAogCXJldHVybiBtb2RlX2ZpeHVw KHN0YXRlKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK