From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 04/13] drm/i915: Convert connector checking to atomic, v2. Date: Wed, 5 Aug 2015 12:37:02 +0200 Message-ID: <1438771031-23227-5-git-send-email-maarten.lankhorst@linux.intel.com> References: <1438771031-23227-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id D17A26E6D7 for ; Wed, 5 Aug 2015 03:37:17 -0700 (PDT) In-Reply-To: <1438771031-23227-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 UmlnaHQgbm93IGRwbXMgY2FsbGJhY2tzIGNhbiBzdGlsbCBmaWRkbGUgd2l0aCB0aGUgY29ubmVj dG9yIHN0YXRlLApidXQgaXQgY2FuIG9ubHkgdHVybiBjb25uZWN0b3JzIG9mZi4KClRoaXMgaXMg cmVtZWRpYXRlZCBieSBvbmx5IGNoZWNraW5nIGNydGMtPnN0YXRlLT5hY3RpdmUgd2hlbiB0aGUK Y29ubmVjdG9yIGlzIGFjdGl2ZSwgYW5kIGlnbm9yZSBjcnRjLT5zdGF0ZS0+YWN0aXZlIHdoZW4g dGhlCmNvbm5lY3RvciBpcyBvZmYuCgpjb25uZWN0b3JzX2FjdGl2ZSBpcyBubyBsb25nZXIgY2hl Y2tlZCwgYW5kIHdpbGwgYmUgcmVtb3ZlZCBsYXRlcgppbiB0aGlzIHNlcmllcyB0b2dldGhlciB3 aXRoIGRwbXMuCgpBbm90aGVyIGNoZWNrIGZvciAhZW5jb2Rlci0+Y3J0YyBpcyBwZXJmb3JtZWQg YnkgY2hlY2tfZW5jb2Rlcl9zdGF0ZQp0b28sIHNvIGl0IGNhbiBiZSByZW1vdmVkLgoKQ2hhbmdl cyBzaW5jZSB2MToKLSBBZGQgY29tbWl0IG1lc3NhZ2UuCi0gcmVuYW1lIHN0YXRlIHRvIG9sZF9z dGF0ZS4KLSBNb3ZlIGRlbGV0aW9uIG9mIG1zdF9wb3J0IGNoZWNrIHRvIG1zdCBwYXRjaC4KClNp Z25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5p bnRlbC5jb20+ClJldmlld2VkLWJ5OiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGNvbnNl bHZhbjJAZ21haWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyB8IDY2ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDMyIGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwppbmRleCA3N2I0ZGE3ZTY5OGMuLjg3NjA3MWFkNDY4MSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNjM2MCwzOCArNjM2MCwzMyBAQCBzdGF0aWMg dm9pZCBpbnRlbF9lbmNvZGVyX2RwbXMoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsIGlu dCBtb2RlKQogICogaW50ZXJuYWwgY29uc2lzdGVuY3kpLiAqLwogc3RhdGljIHZvaWQgaW50ZWxf Y29ubmVjdG9yX2NoZWNrX3N0YXRlKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikK IHsKLQlpZiAoY29ubmVjdG9yLT5nZXRfaHdfc3RhdGUoY29ubmVjdG9yKSkgewotCQlzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciA9IGNvbm5lY3Rvci0+ZW5jb2RlcjsKLQkJc3RydWN0IGRy bV9jcnRjICpjcnRjOwotCQlib29sIGVuY29kZXJfZW5hYmxlZDsKLQkJZW51bSBwaXBlIHBpcGU7 CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gY29ubmVjdG9yLT5iYXNlLnN0YXRlLT5jcnRjOwog Ci0JCURSTV9ERUJVR19LTVMoIltDT05ORUNUT1I6JWQ6JXNdXG4iLAotCQkJICAgICAgY29ubmVj dG9yLT5iYXNlLmJhc2UuaWQsCi0JCQkgICAgICBjb25uZWN0b3ItPmJhc2UubmFtZSk7CisJRFJN X0RFQlVHX0tNUygiW0NPTk5FQ1RPUjolZDolc11cbiIsCisJCSAgICAgIGNvbm5lY3Rvci0+YmFz ZS5iYXNlLmlkLAorCQkgICAgICBjb25uZWN0b3ItPmJhc2UubmFtZSk7CiAKLQkJSTkxNV9TVEFU RV9XQVJOKGNvbm5lY3Rvci0+YmFzZS5kcG1zID09IERSTV9NT0RFX0RQTVNfT0ZGLAotCQkgICAg ICJ3cm9uZyBjb25uZWN0b3IgZHBtcyBzdGF0ZVxuIik7Ci0JCUk5MTVfU1RBVEVfV0FSTihjb25u ZWN0b3ItPmJhc2UuZW5jb2RlciAhPSAmZW5jb2Rlci0+YmFzZSwKLQkJICAgICAiYWN0aXZlIGNv bm5lY3RvciBub3QgbGlua2VkIHRvIGVuY29kZXJcbiIpOworCWlmIChjb25uZWN0b3ItPmdldF9o d19zdGF0ZShjb25uZWN0b3IpKSB7CisJCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciA9ICZj b25uZWN0b3ItPmVuY29kZXItPmJhc2U7CisJCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpj b25uX3N0YXRlID0gY29ubmVjdG9yLT5iYXNlLnN0YXRlOwogCi0JCWlmIChlbmNvZGVyKSB7Ci0J CQlJOTE1X1NUQVRFX1dBUk4oIWVuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlLAotCQkJICAgICAi ZW5jb2Rlci0+Y29ubmVjdG9yc19hY3RpdmUgbm90IHNldFxuIik7CisJCUk5MTVfU1RBVEVfV0FS TighY3J0YywKKwkJCSAiY29ubmVjdG9yIGVuYWJsZWQgd2l0aG91dCBhdHRhY2hlZCBjcnRjXG4i KTsKIAotCQkJZW5jb2Rlcl9lbmFibGVkID0gZW5jb2Rlci0+Z2V0X2h3X3N0YXRlKGVuY29kZXIs ICZwaXBlKTsKLQkJCUk5MTVfU1RBVEVfV0FSTighZW5jb2Rlcl9lbmFibGVkLCAiZW5jb2RlciBu b3QgZW5hYmxlZFxuIik7Ci0JCQlpZiAoSTkxNV9TVEFURV9XQVJOX09OKCFlbmNvZGVyLT5iYXNl LmNydGMpKQotCQkJCXJldHVybjsKKwkJaWYgKCFjcnRjKQorCQkJcmV0dXJuOwogCi0JCQljcnRj ID0gZW5jb2Rlci0+YmFzZS5jcnRjOworCQlJOTE1X1NUQVRFX1dBUk4oIWNydGMtPnN0YXRlLT5h Y3RpdmUsCisJCSAgICAgICJjb25uZWN0b3IgaXMgYWN0aXZlLCBidXQgYXR0YWNoZWQgY3J0YyBp c24ndFxuIik7CiAKLQkJCUk5MTVfU1RBVEVfV0FSTighY3J0Yy0+c3RhdGUtPmVuYWJsZSwKLQkJ CQkJImNydGMgbm90IGVuYWJsZWRcbiIpOwotCQkJSTkxNV9TVEFURV9XQVJOKCF0b19pbnRlbF9j cnRjKGNydGMpLT5hY3RpdmUsICJjcnRjIG5vdCBhY3RpdmVcbiIpOwotCQkJSTkxNV9TVEFURV9X QVJOKHBpcGUgIT0gdG9faW50ZWxfY3J0YyhjcnRjKS0+cGlwZSwKLQkJCSAgICAgImVuY29kZXIg YWN0aXZlIG9uIHRoZSB3cm9uZyBwaXBlXG4iKTsKLQkJfQorCQlJOTE1X1NUQVRFX1dBUk4oY29u bl9zdGF0ZS0+YmVzdF9lbmNvZGVyICE9IGVuY29kZXIsCisJCQkiYXRvbWljIGVuY29kZXIgZG9l c24ndCBtYXRjaCBhdHRhY2hlZCBlbmNvZGVyXG4iKTsKKworCQlJOTE1X1NUQVRFX1dBUk4oY29u bl9zdGF0ZS0+Y3J0YyAhPSBlbmNvZGVyLT5jcnRjLAorCQkJImF0dGFjaGVkIGVuY29kZXIgY3J0 YyBkaWZmZXJzIGZyb20gY29ubmVjdG9yIGNydGNcbiIpOworCX0gZWxzZSB7CisJCUk5MTVfU1RB VEVfV0FSTighY3J0YyAmJiBjb25uZWN0b3ItPmJhc2Uuc3RhdGUtPmJlc3RfZW5jb2RlciwKKwkJ CSJiZXN0IGVuY29kZXIgc2V0IHdpdGhvdXQgY3J0YyFcbiIpOwogCX0KIH0KIApAQCAtMTI2OTks MjAgKzEyNjk0LDIzIEBAIHN0YXRpYyB2b2lkIGNoZWNrX3dtX3N0YXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiB9CiAKIHN0YXRpYyB2b2lkCi1jaGVja19jb25uZWN0b3Jfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKK2NoZWNrX2Nvbm5lY3Rvcl9zdGF0ZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAorCQkgICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKQogewot CXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcjsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3Rv cl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGU7CisJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv cjsKKwlpbnQgaTsKIAotCWZvcl9lYWNoX2ludGVsX2Nvbm5lY3RvcihkZXYsIGNvbm5lY3Rvcikg ewotCQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSBjb25uZWN0b3ItPmJhc2UuZW5jb2Rl cjsKLQkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKnN0YXRlID0gY29ubmVjdG9yLT5iYXNl LnN0YXRlOworCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0ZShvbGRfc3RhdGUsIGNvbm5lY3Rv ciwgb2xkX2Nvbm5fc3RhdGUsIGkpIHsKKwkJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyID0g Y29ubmVjdG9yLT5lbmNvZGVyOworCQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqc3RhdGUg PSBjb25uZWN0b3ItPnN0YXRlOwogCiAJCS8qIFRoaXMgYWxzbyBjaGVja3MgdGhlIGVuY29kZXIv Y29ubmVjdG9yIGh3IHN0YXRlIHdpdGggdGhlCiAJCSAqIC0+Z2V0X2h3X3N0YXRlIGNhbGxiYWNr cy4gKi8KLQkJaW50ZWxfY29ubmVjdG9yX2NoZWNrX3N0YXRlKGNvbm5lY3Rvcik7CisJCWludGVs X2Nvbm5lY3Rvcl9jaGVja19zdGF0ZSh0b19pbnRlbF9jb25uZWN0b3IoY29ubmVjdG9yKSk7CiAK IAkJSTkxNV9TVEFURV9XQVJOKHN0YXRlLT5iZXN0X2VuY29kZXIgIT0gZW5jb2RlciwKLQkJICAg ICAiY29ubmVjdG9yJ3Mgc3RhZ2VkIGVuY29kZXIgZG9lc24ndCBtYXRjaCBjdXJyZW50IGVuY29k ZXJcbiIpOworCQkgICAgICJjb25uZWN0b3IncyBhdG9taWMgZW5jb2RlciBkb2Vzbid0IG1hdGNo IGxlZ2FjeSBlbmNvZGVyXG4iKTsKIAl9CiB9CiAKQEAgLTEyOTAzLDcgKzEyOTAxLDcgQEAgaW50 ZWxfbW9kZXNldF9jaGVja19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICBzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKQogewogCWNoZWNrX3dtX3N0YXRlKGRldik7 Ci0JY2hlY2tfY29ubmVjdG9yX3N0YXRlKGRldik7CisJY2hlY2tfY29ubmVjdG9yX3N0YXRlKGRl diwgb2xkX3N0YXRlKTsKIAljaGVja19lbmNvZGVyX3N0YXRlKGRldik7CiAJY2hlY2tfY3J0Y19z dGF0ZShkZXYpOwogCWNoZWNrX3NoYXJlZF9kcGxsX3N0YXRlKGRldik7Ci0tIAoyLjEuMAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK