From: Maarten Lankhorst Subject: [RESEND PATCH 5/6] drm/i915: Pass atomic state to verify_connector_state Date: Wed, 19 Oct 2016 15:55:38 +0200 Message-ID: <1476885339-2265-6-git-send-email-maarten.lankhorst@linux.intel.com> References: <1476885339-2265-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: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 59C3E6E91A for ; Wed, 19 Oct 2016 13:55:55 +0000 (UTC) In-Reply-To: <1476885339-2265-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyBnZXRzIHJpZCBvZiBhIHdhcm5pbmcgdGhhdCB0aGUgY29ubmVjdG9ycyBhcmUgdXNlZCB3 aXRob3V0IGxvY2tpbmcKd2hlbiBkb2luZyBhIG5vbmJsb2NraW5nIG1vZGVzZXQuCgpTaWduZWQt b2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI0ICsrKysr KysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGJhN2Y3 YmUzYWE0Zi4uNTRhNGIyNzA0MTc5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CkBAIC0xMzUwMSwxMSArMTM1MDEsMTUgQEAgc3RhdGljIHZvaWQgdmVyaWZ5X3dtX3N0YXRlKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKIH0KIAogc3RhdGljIHZvaWQKLXZlcmlmeV9jb25uZWN0b3Jf c3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9jcnRjICpjcnRjKQordmVy aWZ5X2Nvbm5lY3Rvcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkgICAgICAgc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAorCQkgICAgICAgc3RydWN0IGRybV9jcnRjICpj cnRjKQogewogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7CisJc3RydWN0IGRybV9j b25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlOworCWludCBpOwogCi0JZHJtX2Zvcl9lYWNo X2Nvbm5lY3Rvcihjb25uZWN0b3IsIGRldikgeworCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0 ZShzdGF0ZSwgY29ubmVjdG9yLCBvbGRfY29ubl9zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgZHJtX2Vu Y29kZXIgKmVuY29kZXIgPSBjb25uZWN0b3ItPmVuY29kZXI7CiAJCXN0cnVjdCBkcm1fY29ubmVj dG9yX3N0YXRlICpzdGF0ZSA9IGNvbm5lY3Rvci0+c3RhdGU7CiAKQEAgLTEzNzEzLDE1ICsxMzcx NywxNiBAQCB2ZXJpZnlfc2hhcmVkX2RwbGxfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg c3RydWN0IGRybV9jcnRjICpjcnRjLAogCiBzdGF0aWMgdm9pZAogaW50ZWxfbW9kZXNldF92ZXJp ZnlfY3J0YyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0JCQkgc3RydWN0IGRybV9jcnRjX3N0YXRl ICpvbGRfc3RhdGUsCi0JCQkgc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdfc3RhdGUpCisJCQkg IHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKKwkJCSAgc3RydWN0IGRybV9jcnRjX3N0 YXRlICpvbGRfc3RhdGUsCisJCQkgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X3N0YXRlKQog ewogCWlmICghbmVlZHNfbW9kZXNldChuZXdfc3RhdGUpICYmCiAJICAgICF0b19pbnRlbF9jcnRj X3N0YXRlKG5ld19zdGF0ZSktPnVwZGF0ZV9waXBlKQogCQlyZXR1cm47CiAKIAl2ZXJpZnlfd21f c3RhdGUoY3J0YywgbmV3X3N0YXRlKTsKLQl2ZXJpZnlfY29ubmVjdG9yX3N0YXRlKGNydGMtPmRl diwgY3J0Yyk7CisJdmVyaWZ5X2Nvbm5lY3Rvcl9zdGF0ZShjcnRjLT5kZXYsIHN0YXRlLCBjcnRj KTsKIAl2ZXJpZnlfY3J0Y19zdGF0ZShjcnRjLCBvbGRfc3RhdGUsIG5ld19zdGF0ZSk7CiAJdmVy aWZ5X3NoYXJlZF9kcGxsX3N0YXRlKGNydGMtPmRldiwgY3J0Yywgb2xkX3N0YXRlLCBuZXdfc3Rh dGUpOwogfQpAQCAtMTM3MzcsMTAgKzEzNzQyLDExIEBAIHZlcmlmeV9kaXNhYmxlZF9kcGxsX3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB9CiAKIHN0YXRpYyB2b2lkCi1pbnRlbF9tb2Rl c2V0X3ZlcmlmeV9kaXNhYmxlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraW50ZWxfbW9kZXNl dF92ZXJpZnlfZGlzYWJsZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCSAgICAgIHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAl2ZXJpZnlfZW5jb2Rlcl9zdGF0ZShkZXYp OwotCXZlcmlmeV9jb25uZWN0b3Jfc3RhdGUoZGV2LCBOVUxMKTsKKwl2ZXJpZnlfY29ubmVjdG9y X3N0YXRlKGRldiwgc3RhdGUsIE5VTEwpOwogCXZlcmlmeV9kaXNhYmxlZF9kcGxsX3N0YXRlKGRl dik7CiB9CiAKQEAgLTE0Mzk5LDcgKzE0NDA1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfYXRvbWlj X2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJaWYgKCFpbnRl bF9jYW5fZW5hYmxlX3NhZ3Yoc3RhdGUpKQogCQkJaW50ZWxfZGlzYWJsZV9zYWd2KGRldl9wcml2 KTsKIAotCQlpbnRlbF9tb2Rlc2V0X3ZlcmlmeV9kaXNhYmxlZChkZXYpOworCQlpbnRlbF9tb2Rl c2V0X3ZlcmlmeV9kaXNhYmxlZChkZXYsIHN0YXRlKTsKIAl9CiAKIAkvKiBDb21wbGV0ZSB0aGUg ZXZlbnRzIGZvciBwaXBlcyB0aGF0IGhhdmUgbm93IGJlZW4gZGlzYWJsZWQgKi8KQEAgLTE0NDUx LDcgKzE0NDU3LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJaWYgKHB1dF9kb21haW5zW2ldKQogCQkJbW9k ZXNldF9wdXRfcG93ZXJfZG9tYWlucyhkZXZfcHJpdiwgcHV0X2RvbWFpbnNbaV0pOwogCi0JCWlu dGVsX21vZGVzZXRfdmVyaWZ5X2NydGMoY3J0Yywgb2xkX2NydGNfc3RhdGUsIGNydGMtPnN0YXRl KTsKKwkJaW50ZWxfbW9kZXNldF92ZXJpZnlfY3J0YyhjcnRjLCBzdGF0ZSwgb2xkX2NydGNfc3Rh dGUsIGNydGMtPnN0YXRlKTsKIAl9CiAKIAlpZiAoaW50ZWxfc3RhdGUtPm1vZGVzZXQgJiYgaW50 ZWxfY2FuX2VuYWJsZV9zYWd2KHN0YXRlKSkKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK