From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 03/12] drm/i915: Convert connector checking to atomic. Date: Mon, 27 Jul 2015 14:35:32 +0200 Message-ID: <1438000541-3219-4-git-send-email-maarten.lankhorst@linux.intel.com> References: <1438000541-3219-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 DE4706E911 for ; Mon, 27 Jul 2015 05:35:47 -0700 (PDT) In-Reply-To: <1438000541-3219-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 U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYyAgICAgfCAg MiAtCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA3OSArKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oICAgICB8ICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2R2by5jICAgICB8ICAy IC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nkdm8uYyAgICB8ICAyIC0KIDUgZmlsZXMg Y2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgNTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9jcnQuYwppbmRleCA1ZDc4YzFmZWVjODEuLjllYmEzZGQ1YjQzNCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfY3J0LmMKQEAgLTI4MCw4ICsyODAsNiBAQCBzdGF0aWMgaW50IGludGVsX2NydF9k cG1zKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGludCBtb2RlKQogCQlpbnRlbF9j cnRjX3VwZGF0ZV9kcG1zKGNydGMpOwogCX0KIAotCWludGVsX21vZGVzZXRfY2hlY2tfc3RhdGUo Y29ubmVjdG9yLT5kZXYpOwotCiAJcmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwppbmRleCAzYWIwYThhOGU3MDIuLmJhMGI2OGE0MjA5ZCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNjM2MCw0MiArNjM2MCwzMyBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9lbmNvZGVyX2RwbXMoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsIGludCBt b2RlKQogICogaW50ZXJuYWwgY29uc2lzdGVuY3kpLiAqLwogc3RhdGljIHZvaWQgaW50ZWxfY29u bmVjdG9yX2NoZWNrX3N0YXRlKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikKIHsK KwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBjb25uZWN0b3ItPmJhc2Uuc3RhdGUtPmNydGM7CisK KwlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9SOiVkOiVzXVxuIiwKKwkJICAgICAgY29ubmVjdG9y LT5iYXNlLmJhc2UuaWQsCisJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5uYW1lKTsKKwogCWlmIChj b25uZWN0b3ItPmdldF9od19zdGF0ZShjb25uZWN0b3IpKSB7Ci0JCXN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyID0gY29ubmVjdG9yLT5lbmNvZGVyOwotCQlzdHJ1Y3QgZHJtX2NydGMgKmNy dGM7Ci0JCWJvb2wgZW5jb2Rlcl9lbmFibGVkOwotCQllbnVtIHBpcGUgcGlwZTsKKwkJc3RydWN0 IGRybV9lbmNvZGVyICplbmNvZGVyID0gJmNvbm5lY3Rvci0+ZW5jb2Rlci0+YmFzZTsKKwkJc3Ry dWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUgPSBjb25uZWN0b3ItPmJhc2Uuc3Rh dGU7CiAKLQkJRFJNX0RFQlVHX0tNUygiW0NPTk5FQ1RPUjolZDolc11cbiIsCi0JCQkgICAgICBj b25uZWN0b3ItPmJhc2UuYmFzZS5pZCwKLQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5uYW1lKTsK KwkJSTkxNV9TVEFURV9XQVJOKCFjcnRjLAorCQkJICJjb25uZWN0b3IgZW5hYmxlZCB3aXRob3V0 IGF0dGFjaGVkIGNydGNcbiIpOwogCi0JCS8qIHRoZXJlIGlzIG5vIHJlYWwgaHcgc3RhdGUgZm9y IE1TVCBjb25uZWN0b3JzICovCi0JCWlmIChjb25uZWN0b3ItPm1zdF9wb3J0KQorCQlpZiAoIWNy dGMpCiAJCQlyZXR1cm47CiAKLQkJSTkxNV9TVEFURV9XQVJOKGNvbm5lY3Rvci0+YmFzZS5kcG1z ID09IERSTV9NT0RFX0RQTVNfT0ZGLAotCQkgICAgICJ3cm9uZyBjb25uZWN0b3IgZHBtcyBzdGF0 ZVxuIik7Ci0JCUk5MTVfU1RBVEVfV0FSTihjb25uZWN0b3ItPmJhc2UuZW5jb2RlciAhPSAmZW5j b2Rlci0+YmFzZSwKLQkJICAgICAiYWN0aXZlIGNvbm5lY3RvciBub3QgbGlua2VkIHRvIGVuY29k ZXJcbiIpOworCQlJOTE1X1NUQVRFX1dBUk4oIWNydGMtPnN0YXRlLT5hY3RpdmUsCisJCSAgICAg ICJjb25uZWN0b3IgaXMgYWN0aXZlLCBidXQgYXR0YWNoZWQgY3J0YyBpc24ndFxuIik7CiAKLQkJ aWYgKGVuY29kZXIpIHsKLQkJCUk5MTVfU1RBVEVfV0FSTighZW5jb2Rlci0+Y29ubmVjdG9yc19h Y3RpdmUsCi0JCQkgICAgICJlbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSBub3Qgc2V0XG4iKTsK LQotCQkJZW5jb2Rlcl9lbmFibGVkID0gZW5jb2Rlci0+Z2V0X2h3X3N0YXRlKGVuY29kZXIsICZw aXBlKTsKLQkJCUk5MTVfU1RBVEVfV0FSTighZW5jb2Rlcl9lbmFibGVkLCAiZW5jb2RlciBub3Qg ZW5hYmxlZFxuIik7Ci0JCQlpZiAoSTkxNV9TVEFURV9XQVJOX09OKCFlbmNvZGVyLT5iYXNlLmNy dGMpKQotCQkJCXJldHVybjsKKwkJSTkxNV9TVEFURV9XQVJOKGNvbm5fc3RhdGUtPmJlc3RfZW5j b2RlciAhPSBlbmNvZGVyLAorCQkJImF0b21pYyBlbmNvZGVyIGRvZXNuJ3QgbWF0Y2ggYXR0YWNo ZWQgZW5jb2RlclxuIik7CiAKLQkJCWNydGMgPSBlbmNvZGVyLT5iYXNlLmNydGM7Ci0KLQkJCUk5 MTVfU1RBVEVfV0FSTighY3J0Yy0+c3RhdGUtPmVuYWJsZSwKLQkJCQkJImNydGMgbm90IGVuYWJs ZWRcbiIpOwotCQkJSTkxNV9TVEFURV9XQVJOKCF0b19pbnRlbF9jcnRjKGNydGMpLT5hY3RpdmUs ICJjcnRjIG5vdCBhY3RpdmVcbiIpOwotCQkJSTkxNV9TVEFURV9XQVJOKHBpcGUgIT0gdG9faW50 ZWxfY3J0YyhjcnRjKS0+cGlwZSwKLQkJCSAgICAgImVuY29kZXIgYWN0aXZlIG9uIHRoZSB3cm9u ZyBwaXBlXG4iKTsKLQkJfQorCQlJOTE1X1NUQVRFX1dBUk4oY29ubl9zdGF0ZS0+Y3J0YyAhPSBl bmNvZGVyLT5jcnRjLAorCQkJImF0dGFjaGVkIGVuY29kZXIgY3J0YyBkaWZmZXJzIGZyb20gY29u bmVjdG9yIGNydGNcbiIpOworCX0gZWxzZSB7CisJCUk5MTVfU1RBVEVfV0FSTighY3J0YyAmJiBj b25uZWN0b3ItPmJhc2Uuc3RhdGUtPmJlc3RfZW5jb2RlciwKKwkJCSJiZXN0IGVuY29kZXIgc2V0 IHdpdGhvdXQgY3J0YyFcbiIpOwogCX0KIH0KIApAQCAtNjQ0NCw4ICs2NDM1LDYgQEAgaW50IGlu dGVsX2Nvbm5lY3Rvcl9kcG1zKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGludCBt b2RlKQogCWlmIChjb25uZWN0b3ItPmVuY29kZXIpCiAJCWludGVsX2VuY29kZXJfZHBtcyh0b19p bnRlbF9lbmNvZGVyKGNvbm5lY3Rvci0+ZW5jb2RlciksIG1vZGUpOwogCi0JaW50ZWxfbW9kZXNl dF9jaGVja19zdGF0ZShjb25uZWN0b3ItPmRldik7Ci0KIAlyZXR1cm4gMDsKIH0KIApAQCAtMTI3 MDUsMjAgKzEyNjk0LDIyIEBAIHN0YXRpYyB2b2lkIGNoZWNrX3dtX3N0YXRlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiB9CiAKIHN0YXRpYyB2b2lkCi1jaGVja19jb25uZWN0b3Jfc3RhdGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKK2NoZWNrX2Nvbm5lY3Rvcl9zdGF0ZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiB7Ci0Jc3RydWN0IGlu dGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpj b25uX3N0YXRlOworCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7CisJaW50IGk7CiAK LQlmb3JfZWFjaF9pbnRlbF9jb25uZWN0b3IoZGV2LCBjb25uZWN0b3IpIHsKLQkJc3RydWN0IGRy bV9lbmNvZGVyICplbmNvZGVyID0gY29ubmVjdG9yLT5iYXNlLmVuY29kZXI7Ci0JCXN0cnVjdCBk cm1fY29ubmVjdG9yX3N0YXRlICpzdGF0ZSA9IGNvbm5lY3Rvci0+YmFzZS5zdGF0ZTsKKwlmb3Jf ZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubl9zdGF0ZSwgaSkg eworCQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSBjb25uZWN0b3ItPmVuY29kZXI7CisJ CXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpzdGF0ZSA9IGNvbm5lY3Rvci0+c3RhdGU7CiAK IAkJLyogVGhpcyBhbHNvIGNoZWNrcyB0aGUgZW5jb2Rlci9jb25uZWN0b3IgaHcgc3RhdGUgd2l0 aCB0aGUKIAkJICogLT5nZXRfaHdfc3RhdGUgY2FsbGJhY2tzLiAqLwotCQlpbnRlbF9jb25uZWN0 b3JfY2hlY2tfc3RhdGUoY29ubmVjdG9yKTsKKwkJaW50ZWxfY29ubmVjdG9yX2NoZWNrX3N0YXRl KHRvX2ludGVsX2Nvbm5lY3Rvcihjb25uZWN0b3IpKTsKIAogCQlJOTE1X1NUQVRFX1dBUk4oc3Rh dGUtPmJlc3RfZW5jb2RlciAhPSBlbmNvZGVyLAotCQkgICAgICJjb25uZWN0b3IncyBzdGFnZWQg ZW5jb2RlciBkb2Vzbid0IG1hdGNoIGN1cnJlbnQgZW5jb2RlclxuIik7CisJCSAgICAgImNvbm5l Y3RvcidzIGF0b21pYyBlbmNvZGVyIGRvZXNuJ3QgbWF0Y2ggbGVnYWN5IGVuY29kZXJcbiIpOwog CX0KIH0KIApAQCAtMTI5MDQsMTEgKzEyODk1LDEyIEBAIGNoZWNrX3NoYXJlZF9kcGxsX3N0YXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJfQogfQogCi12b2lkCi1pbnRlbF9tb2Rlc2V0X2No ZWNrX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZAoraW50ZWxfbW9k ZXNldF9jaGVja19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJICBzdHJ1Y3QgZHJt X2F0b21pY19zdGF0ZSAqc3RhdGUpCiB7CiAJY2hlY2tfd21fc3RhdGUoZGV2KTsKLQljaGVja19j b25uZWN0b3Jfc3RhdGUoZGV2KTsKKwljaGVja19jb25uZWN0b3Jfc3RhdGUoZGV2LCBzdGF0ZSk7 CiAJY2hlY2tfZW5jb2Rlcl9zdGF0ZShkZXYpOwogCWNoZWNrX2NydGNfc3RhdGUoZGV2KTsKIAlj aGVja19zaGFyZWRfZHBsbF9zdGF0ZShkZXYpOwpAQCAtMTMyOTQsMTAgKzEzMjg2LDExIEBAIHN0 YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJ ZHJtX2F0b21pY19oZWxwZXJfd2FpdF9mb3JfdmJsYW5rcyhkZXYsIHN0YXRlKTsKIAlkcm1fYXRv bWljX2hlbHBlcl9jbGVhbnVwX3BsYW5lcyhkZXYsIHN0YXRlKTsKLQlkcm1fYXRvbWljX3N0YXRl X2ZyZWUoc3RhdGUpOwogCiAJaWYgKGFueV9tcykKLQkJaW50ZWxfbW9kZXNldF9jaGVja19zdGF0 ZShkZXYpOworCQlpbnRlbF9tb2Rlc2V0X2NoZWNrX3N0YXRlKGRldiwgc3RhdGUpOworCisJZHJt X2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKIAogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAppbmRleCAzMjBjOWU2YmQ4NDguLjBkYTQyMzZkYzg1YSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKQEAgLTk5OSw3ICs5OTksNiBAQCBpbnQgaW50ZWxfY29ubmVjdG9yX2lu aXQoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqKTsKIHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmlu dGVsX2Nvbm5lY3Rvcl9hbGxvYyh2b2lkKTsKIGludCBpbnRlbF9jb25uZWN0b3JfZHBtcyhzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqLCBpbnQgbW9kZSk7CiBib29sIGludGVsX2Nvbm5lY3Rvcl9nZXRf aHdfc3RhdGUoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKTsKLXZvaWQgaW50ZWxf bW9kZXNldF9jaGVja19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGJvb2wgaWJ4X2Rp Z2l0YWxfcG9ydF9jb25uZWN0ZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQkJCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKnBvcnQpOwogdm9pZCBpbnRlbF9jb25uZWN0 b3JfYXR0YWNoX2VuY29kZXIoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yLApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHZvLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kdm8uYwppbmRleCBmZDVlNTIyYWJlYmIuLjYwMGY3ZmI4NTVkOCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHZvLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHZvLmMKQEAgLTIzNyw4ICsyMzcsNiBAQCBzdGF0aWMgaW50IGlu dGVsX2R2b19kcG1zKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGludCBtb2RlKQog CQlpbnRlbF9jcnRjX3VwZGF0ZV9kcG1zKGNydGMpOwogCX0KIAotCWludGVsX21vZGVzZXRfY2hl Y2tfc3RhdGUoY29ubmVjdG9yLT5kZXYpOwotCiAJcmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nkdm8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nkdm8uYwppbmRleCAyYzQzNWE3OWQ0ZGEuLjg5MTFlMGU0MTdlZSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nkdm8uYwpAQCAtMTU1MCw4ICsxNTUwLDYgQEAgc3RhdGljIGludCBpbnRl bF9zZHZvX2RwbXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwgaW50IG1vZGUpCiAJ CWludGVsX3Nkdm9fc2V0X2FjdGl2ZV9vdXRwdXRzKGludGVsX3Nkdm8sIGludGVsX3Nkdm8tPmF0 dGFjaGVkX291dHB1dCk7CiAJfQogCi0JaW50ZWxfbW9kZXNldF9jaGVja19zdGF0ZShjb25uZWN0 b3ItPmRldik7Ci0KIAlyZXR1cm4gMDsKIH0KIAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==