From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2.1 03/12] drm/i915: Convert connector checking to atomic, v2. Date: Thu, 30 Jul 2015 14:57:59 +0200 Message-ID: <55BA1F57.4000406@linux.intel.com> References: <1438000541-3219-1-git-send-email-maarten.lankhorst@linux.intel.com> <1438000541-3219-4-git-send-email-maarten.lankhorst@linux.intel.com> <1438089223.2727.17.camel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id B39227A147 for ; Thu, 30 Jul 2015 05:58:02 -0700 (PDT) In-Reply-To: <1438089223.2727.17.camel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ander Conselvan De Oliveira , 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+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNjYg KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzIg aW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IDc3YjRkYTdlNjk4Yy4uODc2MDcxYWQ0NjgxIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC02MzYwLDM4ICs2MzYwLDMzIEBAIHN0YXRpYyB2b2lkIGlu dGVsX2VuY29kZXJfZHBtcyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwgaW50IG1vZGUp CiAgKiBpbnRlcm5hbCBjb25zaXN0ZW5jeSkuICovCiBzdGF0aWMgdm9pZCBpbnRlbF9jb25uZWN0 b3JfY2hlY2tfc3RhdGUoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogewotCWlm IChjb25uZWN0b3ItPmdldF9od19zdGF0ZShjb25uZWN0b3IpKSB7Ci0JCXN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyID0gY29ubmVjdG9yLT5lbmNvZGVyOwotCQlzdHJ1Y3QgZHJtX2NydGMg KmNydGM7Ci0JCWJvb2wgZW5jb2Rlcl9lbmFibGVkOwotCQllbnVtIHBpcGUgcGlwZTsKKwlzdHJ1 Y3QgZHJtX2NydGMgKmNydGMgPSBjb25uZWN0b3ItPmJhc2Uuc3RhdGUtPmNydGM7CiAKLQkJRFJN X0RFQlVHX0tNUygiW0NPTk5FQ1RPUjolZDolc11cbiIsCi0JCQkgICAgICBjb25uZWN0b3ItPmJh c2UuYmFzZS5pZCwKLQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5uYW1lKTsKKwlEUk1fREVCVUdf S01TKCJbQ09OTkVDVE9SOiVkOiVzXVxuIiwKKwkJICAgICAgY29ubmVjdG9yLT5iYXNlLmJhc2Uu aWQsCisJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5uYW1lKTsKIAotCQlJOTE1X1NUQVRFX1dBUk4o Y29ubmVjdG9yLT5iYXNlLmRwbXMgPT0gRFJNX01PREVfRFBNU19PRkYsCi0JCSAgICAgIndyb25n IGNvbm5lY3RvciBkcG1zIHN0YXRlXG4iKTsKLQkJSTkxNV9TVEFURV9XQVJOKGNvbm5lY3Rvci0+ YmFzZS5lbmNvZGVyICE9ICZlbmNvZGVyLT5iYXNlLAotCQkgICAgICJhY3RpdmUgY29ubmVjdG9y IG5vdCBsaW5rZWQgdG8gZW5jb2RlclxuIik7CisJaWYgKGNvbm5lY3Rvci0+Z2V0X2h3X3N0YXRl KGNvbm5lY3RvcikpIHsKKwkJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyID0gJmNvbm5lY3Rv ci0+ZW5jb2Rlci0+YmFzZTsKKwkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3Rh dGUgPSBjb25uZWN0b3ItPmJhc2Uuc3RhdGU7CiAKLQkJaWYgKGVuY29kZXIpIHsKLQkJCUk5MTVf U1RBVEVfV0FSTighZW5jb2Rlci0+Y29ubmVjdG9yc19hY3RpdmUsCi0JCQkgICAgICJlbmNvZGVy LT5jb25uZWN0b3JzX2FjdGl2ZSBub3Qgc2V0XG4iKTsKKwkJSTkxNV9TVEFURV9XQVJOKCFjcnRj LAorCQkJICJjb25uZWN0b3IgZW5hYmxlZCB3aXRob3V0IGF0dGFjaGVkIGNydGNcbiIpOwogCi0J CQllbmNvZGVyX2VuYWJsZWQgPSBlbmNvZGVyLT5nZXRfaHdfc3RhdGUoZW5jb2RlciwgJnBpcGUp OwotCQkJSTkxNV9TVEFURV9XQVJOKCFlbmNvZGVyX2VuYWJsZWQsICJlbmNvZGVyIG5vdCBlbmFi bGVkXG4iKTsKLQkJCWlmIChJOTE1X1NUQVRFX1dBUk5fT04oIWVuY29kZXItPmJhc2UuY3J0Yykp Ci0JCQkJcmV0dXJuOworCQlpZiAoIWNydGMpCisJCQlyZXR1cm47CiAKLQkJCWNydGMgPSBlbmNv ZGVyLT5iYXNlLmNydGM7CisJCUk5MTVfU1RBVEVfV0FSTighY3J0Yy0+c3RhdGUtPmFjdGl2ZSwK KwkJICAgICAgImNvbm5lY3RvciBpcyBhY3RpdmUsIGJ1dCBhdHRhY2hlZCBjcnRjIGlzbid0XG4i KTsKIAotCQkJSTkxNV9TVEFURV9XQVJOKCFjcnRjLT5zdGF0ZS0+ZW5hYmxlLAotCQkJCQkiY3J0 YyBub3QgZW5hYmxlZFxuIik7Ci0JCQlJOTE1X1NUQVRFX1dBUk4oIXRvX2ludGVsX2NydGMoY3J0 YyktPmFjdGl2ZSwgImNydGMgbm90IGFjdGl2ZVxuIik7Ci0JCQlJOTE1X1NUQVRFX1dBUk4ocGlw ZSAhPSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlLAotCQkJICAgICAiZW5jb2RlciBhY3RpdmUg b24gdGhlIHdyb25nIHBpcGVcbiIpOwotCQl9CisJCUk5MTVfU1RBVEVfV0FSTihjb25uX3N0YXRl LT5iZXN0X2VuY29kZXIgIT0gZW5jb2RlciwKKwkJCSJhdG9taWMgZW5jb2RlciBkb2Vzbid0IG1h dGNoIGF0dGFjaGVkIGVuY29kZXJcbiIpOworCisJCUk5MTVfU1RBVEVfV0FSTihjb25uX3N0YXRl LT5jcnRjICE9IGVuY29kZXItPmNydGMsCisJCQkiYXR0YWNoZWQgZW5jb2RlciBjcnRjIGRpZmZl cnMgZnJvbSBjb25uZWN0b3IgY3J0Y1xuIik7CisJfSBlbHNlIHsKKwkJSTkxNV9TVEFURV9XQVJO KCFjcnRjICYmIGNvbm5lY3Rvci0+YmFzZS5zdGF0ZS0+YmVzdF9lbmNvZGVyLAorCQkJImJlc3Qg ZW5jb2RlciBzZXQgd2l0aG91dCBjcnRjIVxuIik7CiAJfQogfQogCkBAIC0xMjY5OSwyMCArMTI2 OTQsMjMgQEAgc3RhdGljIHZvaWQgY2hlY2tfd21fc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIH0KIAogc3RhdGljIHZvaWQKLWNoZWNrX2Nvbm5lY3Rvcl9zdGF0ZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQorY2hlY2tfY29ubmVjdG9yX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CisJCSAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCiB7Ci0Jc3RydWN0 IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRl ICpvbGRfY29ubl9zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOworCWlu dCBpOwogCi0JZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9yKSB7Ci0JCXN0 cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciA9IGNvbm5lY3Rvci0+YmFzZS5lbmNvZGVyOwotCQlz dHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqc3RhdGUgPSBjb25uZWN0b3ItPmJhc2Uuc3RhdGU7 CisJZm9yX2VhY2hfY29ubmVjdG9yX2luX3N0YXRlKG9sZF9zdGF0ZSwgY29ubmVjdG9yLCBvbGRf Y29ubl9zdGF0ZSwgaSkgeworCQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSBjb25uZWN0 b3ItPmVuY29kZXI7CisJCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpzdGF0ZSA9IGNvbm5l Y3Rvci0+c3RhdGU7CiAKIAkJLyogVGhpcyBhbHNvIGNoZWNrcyB0aGUgZW5jb2Rlci9jb25uZWN0 b3IgaHcgc3RhdGUgd2l0aCB0aGUKIAkJICogLT5nZXRfaHdfc3RhdGUgY2FsbGJhY2tzLiAqLwot CQlpbnRlbF9jb25uZWN0b3JfY2hlY2tfc3RhdGUoY29ubmVjdG9yKTsKKwkJaW50ZWxfY29ubmVj dG9yX2NoZWNrX3N0YXRlKHRvX2ludGVsX2Nvbm5lY3Rvcihjb25uZWN0b3IpKTsKIAogCQlJOTE1 X1NUQVRFX1dBUk4oc3RhdGUtPmJlc3RfZW5jb2RlciAhPSBlbmNvZGVyLAotCQkgICAgICJjb25u ZWN0b3IncyBzdGFnZWQgZW5jb2RlciBkb2Vzbid0IG1hdGNoIGN1cnJlbnQgZW5jb2RlclxuIik7 CisJCSAgICAgImNvbm5lY3RvcidzIGF0b21pYyBlbmNvZGVyIGRvZXNuJ3QgbWF0Y2ggbGVnYWN5 IGVuY29kZXJcbiIpOwogCX0KIH0KIApAQCAtMTI5MDMsNyArMTI5MDEsNyBAQCBpbnRlbF9tb2Rl c2V0X2NoZWNrX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgIHN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCiB7CiAJY2hlY2tfd21fc3RhdGUoZGV2KTsKLQljaGVj a19jb25uZWN0b3Jfc3RhdGUoZGV2KTsKKwljaGVja19jb25uZWN0b3Jfc3RhdGUoZGV2LCBvbGRf c3RhdGUpOwogCWNoZWNrX2VuY29kZXJfc3RhdGUoZGV2KTsKIAljaGVja19jcnRjX3N0YXRlKGRl dik7CiAJY2hlY2tfc2hhcmVkX2RwbGxfc3RhdGUoZGV2KTsKLS0gCjIuMS4wCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK