From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v3.1 04/13] drm/i915: Convert connector checking
 to atomic, v3.
Date: Thu, 6 Aug 2015 13:49:22 +0200
Message-ID: <55C349C2.4040909@linux.intel.com>
References: <1438771031-23227-1-git-send-email-maarten.lankhorst@linux.intel.com>
 <1438771031-23227-5-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id C8C6D6EB71
 for <intel-gfx@lists.freedesktop.org>; Thu,  6 Aug 2015 04:49:27 -0700 (PDT)
In-Reply-To: <1438771031-23227-5-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

UmlnaHQgbm93IGRwbXMgY2FsbGJhY2tzIGNhbiBzdGlsbCBmaWRkbGUgd2l0aCB0aGUgY29ubmVj
dG9yIHN0YXRlLApidXQgaXQgY2FuIG9ubHkgdHVybiBjb25uZWN0b3JzIG9mZi4KClRoaXMgaXMg
cmVtZWRpYXRlZCBieSBvbmx5IGNoZWNraW5nIGNydGMtPnN0YXRlLT5hY3RpdmUgd2hlbiB0aGUK
Y29ubmVjdG9yIGlzIGFjdGl2ZSwgYW5kIGlnbm9yZSBjcnRjLT5zdGF0ZS0+YWN0aXZlIHdoZW4g
dGhlCmNvbm5lY3RvciBpcyBvZmYuCgpjb25uZWN0b3JzX2FjdGl2ZSBpcyBubyBsb25nZXIgY2hl
Y2tlZCwgYW5kIHdpbGwgYmUgcmVtb3ZlZCBsYXRlcgppbiB0aGlzIHNlcmllcyB0b2dldGhlciB3
aXRoIGRwbXMuCgpBbm90aGVyIGNoZWNrIGZvciAhZW5jb2Rlci0+Y3J0YyBpcyBwZXJmb3JtZWQg
YnkgY2hlY2tfZW5jb2Rlcl9zdGF0ZQp0b28sIHNvIGl0IGNhbiBiZSByZW1vdmVkLgoKQ2hhbmdl
cyBzaW5jZSB2MToKLSBBZGQgY29tbWl0IG1lc3NhZ2UuCi0gcmVuYW1lIHN0YXRlIHRvIG9sZF9z
dGF0ZS4KLSBNb3ZlIGRlbGV0aW9uIG9mIG1zdF9wb3J0IGNoZWNrIHRvIG1zdCBwYXRjaC4KQ2hh
bmdlcyBzaW5jZSB2MjoKLSBGaXggYSBudWxsIHBvaW50ZXIgZGVyZWZlcmVuY2Ugb24gTVNUIG5v
dyBodyByZWFkb3V0IGlzIGZpeGVkLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3Qg
PG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEFuZGVyIENv
bnNlbHZhbiBkZSBPbGl2ZWlyYSA8Y29uc2VsdmFuMkBnbWFpbC5jb20+Ci0tLQpkaWZmIC0tZ2l0
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDc3YjRkYTdlNjk4Yy4uOWJhZGRjMTZiMjg1IDEw
MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC02MzYwLDM4ICs2MzYwLDM2IEBA
IHN0YXRpYyB2b2lkIGludGVsX2VuY29kZXJfZHBtcyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j
b2RlciwgaW50IG1vZGUpCiAgKiBpbnRlcm5hbCBjb25zaXN0ZW5jeSkuICovCiBzdGF0aWMgdm9p
ZCBpbnRlbF9jb25uZWN0b3JfY2hlY2tfc3RhdGUoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29u
bmVjdG9yKQogeworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGNvbm5lY3Rvci0+YmFzZS5zdGF0
ZS0+Y3J0YzsKKworCURSTV9ERUJVR19LTVMoIltDT05ORUNUT1I6JWQ6JXNdXG4iLAorCQkgICAg
ICBjb25uZWN0b3ItPmJhc2UuYmFzZS5pZCwKKwkJICAgICAgY29ubmVjdG9yLT5iYXNlLm5hbWUp
OworCiAJaWYgKGNvbm5lY3Rvci0+Z2V0X2h3X3N0YXRlKGNvbm5lY3RvcikpIHsKLQkJc3RydWN0
IGludGVsX2VuY29kZXIgKmVuY29kZXIgPSBjb25uZWN0b3ItPmVuY29kZXI7Ci0JCXN0cnVjdCBk
cm1fY3J0YyAqY3J0YzsKLQkJYm9vbCBlbmNvZGVyX2VuYWJsZWQ7Ci0JCWVudW0gcGlwZSBwaXBl
OworCQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSAmY29ubmVjdG9yLT5lbmNvZGVyLT5i
YXNlOworCQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSA9IGNvbm5lY3Rv
ci0+YmFzZS5zdGF0ZTsKIAotCQlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9SOiVkOiVzXVxuIiwK
LQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5iYXNlLmlkLAotCQkJICAgICAgY29ubmVjdG9yLT5i
YXNlLm5hbWUpOworCQlJOTE1X1NUQVRFX1dBUk4oIWNydGMsCisJCQkgImNvbm5lY3RvciBlbmFi
bGVkIHdpdGhvdXQgYXR0YWNoZWQgY3J0Y1xuIik7CiAKLQkJSTkxNV9TVEFURV9XQVJOKGNvbm5l
Y3Rvci0+YmFzZS5kcG1zID09IERSTV9NT0RFX0RQTVNfT0ZGLAotCQkgICAgICJ3cm9uZyBjb25u
ZWN0b3IgZHBtcyBzdGF0ZVxuIik7Ci0JCUk5MTVfU1RBVEVfV0FSTihjb25uZWN0b3ItPmJhc2Uu
ZW5jb2RlciAhPSAmZW5jb2Rlci0+YmFzZSwKLQkJICAgICAiYWN0aXZlIGNvbm5lY3RvciBub3Qg
bGlua2VkIHRvIGVuY29kZXJcbiIpOworCQlpZiAoIWNydGMpCisJCQlyZXR1cm47CiAKLQkJaWYg
KGVuY29kZXIpIHsKLQkJCUk5MTVfU1RBVEVfV0FSTighZW5jb2Rlci0+Y29ubmVjdG9yc19hY3Rp
dmUsCi0JCQkgICAgICJlbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSBub3Qgc2V0XG4iKTsKKwkJ
STkxNV9TVEFURV9XQVJOKCFjcnRjLT5zdGF0ZS0+YWN0aXZlLAorCQkgICAgICAiY29ubmVjdG9y
IGlzIGFjdGl2ZSwgYnV0IGF0dGFjaGVkIGNydGMgaXNuJ3RcbiIpOwogCi0JCQllbmNvZGVyX2Vu
YWJsZWQgPSBlbmNvZGVyLT5nZXRfaHdfc3RhdGUoZW5jb2RlciwgJnBpcGUpOwotCQkJSTkxNV9T
VEFURV9XQVJOKCFlbmNvZGVyX2VuYWJsZWQsICJlbmNvZGVyIG5vdCBlbmFibGVkXG4iKTsKLQkJ
CWlmIChJOTE1X1NUQVRFX1dBUk5fT04oIWVuY29kZXItPmJhc2UuY3J0YykpCi0JCQkJcmV0dXJu
OworCQlpZiAoIWVuY29kZXIpCisJCQlyZXR1cm47CiAKLQkJCWNydGMgPSBlbmNvZGVyLT5iYXNl
LmNydGM7CisJCUk5MTVfU1RBVEVfV0FSTihjb25uX3N0YXRlLT5iZXN0X2VuY29kZXIgIT0gZW5j
b2RlciwKKwkJCSJhdG9taWMgZW5jb2RlciBkb2Vzbid0IG1hdGNoIGF0dGFjaGVkIGVuY29kZXJc
biIpOwogCi0JCQlJOTE1X1NUQVRFX1dBUk4oIWNydGMtPnN0YXRlLT5lbmFibGUsCi0JCQkJCSJj
cnRjIG5vdCBlbmFibGVkXG4iKTsKLQkJCUk5MTVfU1RBVEVfV0FSTighdG9faW50ZWxfY3J0Yyhj
cnRjKS0+YWN0aXZlLCAiY3J0YyBub3QgYWN0aXZlXG4iKTsKLQkJCUk5MTVfU1RBVEVfV0FSTihw
aXBlICE9IHRvX2ludGVsX2NydGMoY3J0YyktPnBpcGUsCi0JCQkgICAgICJlbmNvZGVyIGFjdGl2
ZSBvbiB0aGUgd3JvbmcgcGlwZVxuIik7Ci0JCX0KKwkJSTkxNV9TVEFURV9XQVJOKGNvbm5fc3Rh
dGUtPmNydGMgIT0gZW5jb2Rlci0+Y3J0YywKKwkJCSJhdHRhY2hlZCBlbmNvZGVyIGNydGMgZGlm
ZmVycyBmcm9tIGNvbm5lY3RvciBjcnRjXG4iKTsKKwl9IGVsc2UgeworCQlJOTE1X1NUQVRFX1dB
Uk4oIWNydGMgJiYgY29ubmVjdG9yLT5iYXNlLnN0YXRlLT5iZXN0X2VuY29kZXIsCisJCQkiYmVz
dCBlbmNvZGVyIHNldCB3aXRob3V0IGNydGMhXG4iKTsKIAl9CiB9CiAKQEAgLTEyNjk5LDIwICsx
MjY5NywyMyBAQCBzdGF0aWMgdm9pZCBjaGVja193bV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2KQogfQogCiBzdGF0aWMgdm9pZAotY2hlY2tfY29ubmVjdG9yX3N0YXRlKHN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYpCitjaGVja19jb25uZWN0b3Jfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl
diwKKwkJICAgICAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIHsKLQlzdHJ1
Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3I7CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3Rh
dGUgKm9sZF9jb25uX3N0YXRlOworCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7CisJ
aW50IGk7CiAKLQlmb3JfZWFjaF9pbnRlbF9jb25uZWN0b3IoZGV2LCBjb25uZWN0b3IpIHsKLQkJ
c3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyID0gY29ubmVjdG9yLT5iYXNlLmVuY29kZXI7Ci0J
CXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpzdGF0ZSA9IGNvbm5lY3Rvci0+YmFzZS5zdGF0
ZTsKKwlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUob2xkX3N0YXRlLCBjb25uZWN0b3IsIG9s
ZF9jb25uX3N0YXRlLCBpKSB7CisJCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciA9IGNvbm5l
Y3Rvci0+ZW5jb2RlcjsKKwkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKnN0YXRlID0gY29u
bmVjdG9yLT5zdGF0ZTsKIAogCQkvKiBUaGlzIGFsc28gY2hlY2tzIHRoZSBlbmNvZGVyL2Nvbm5l
Y3RvciBodyBzdGF0ZSB3aXRoIHRoZQogCQkgKiAtPmdldF9od19zdGF0ZSBjYWxsYmFja3MuICov
Ci0JCWludGVsX2Nvbm5lY3Rvcl9jaGVja19zdGF0ZShjb25uZWN0b3IpOworCQlpbnRlbF9jb25u
ZWN0b3JfY2hlY2tfc3RhdGUodG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3RvcikpOwogCiAJCUk5
MTVfU1RBVEVfV0FSTihzdGF0ZS0+YmVzdF9lbmNvZGVyICE9IGVuY29kZXIsCi0JCSAgICAgImNv
bm5lY3RvcidzIHN0YWdlZCBlbmNvZGVyIGRvZXNuJ3QgbWF0Y2ggY3VycmVudCBlbmNvZGVyXG4i
KTsKKwkJICAgICAiY29ubmVjdG9yJ3MgYXRvbWljIGVuY29kZXIgZG9lc24ndCBtYXRjaCBsZWdh
Y3kgZW5jb2RlclxuIik7CiAJfQogfQogCkBAIC0xMjkwMyw3ICsxMjkwNCw3IEBAIGludGVsX21v
ZGVzZXRfY2hlY2tfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSAgc3RydWN0IGRy
bV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIHsKIAljaGVja193bV9zdGF0ZShkZXYpOwotCWNo
ZWNrX2Nvbm5lY3Rvcl9zdGF0ZShkZXYpOworCWNoZWNrX2Nvbm5lY3Rvcl9zdGF0ZShkZXYsIG9s
ZF9zdGF0ZSk7CiAJY2hlY2tfZW5jb2Rlcl9zdGF0ZShkZXYpOwogCWNoZWNrX2NydGNfc3RhdGUo
ZGV2KTsKIAljaGVja19zaGFyZWRfZHBsbF9zdGF0ZShkZXYpOwoKX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl
bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv
bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK