From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 11/13] drm/i915: Remove connectors_active. Date: Wed, 5 Aug 2015 12:37:09 +0200 Message-ID: <1438771031-23227-12-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 6E3E26E705 for ; Wed, 5 Aug 2015 03:37:19 -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 VGhlcmUgYXJlIG5vIG1vcmUgdXNlcnMsIGJ5ZWJ5ZSEKClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4g TGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5 OiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGNvbnNlbHZhbjJAZ21haWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDM3ICstLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg ICAgIHwgIDEgLQogMiBmaWxlcyBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMzcgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGZmMGEyMmYyMjNlNi4u MWZkOGI3ZGVjN2RhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMjE5 NiwyNyArMTIxOTYsMTIgQEAgc3RhdGljIGJvb2wgaW50ZWxfY3J0Y19pbl91c2Uoc3RydWN0IGRy bV9jcnRjICpjcnRjKQogc3RhdGljIHZvaWQKIGludGVsX21vZGVzZXRfdXBkYXRlX3N0YXRlKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gc3RhdGUtPmRldjsKLQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcjsKIAlz dHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRl OwotCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7CiAJaW50IGk7CiAKIAlpbnRlbF9z aGFyZWRfZHBsbF9jb21taXQoc3RhdGUpOwogCi0JZm9yX2VhY2hfaW50ZWxfZW5jb2RlcihkZXYs IGludGVsX2VuY29kZXIpIHsKLQkJaWYgKCFpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGMpCi0JCQlj b250aW51ZTsKLQotCQljcnRjID0gaW50ZWxfZW5jb2Rlci0+YmFzZS5jcnRjOwotCQljcnRjX3N0 YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7Ci0J CWlmICghY3J0Y19zdGF0ZSB8fCAhbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkpCi0JCQljb250 aW51ZTsKLQotCQlpbnRlbF9lbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSA9IGZhbHNlOwotCX0K LQogCWRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNldF9zdGF0ZShzdGF0ZS0+ ZGV2LCBzdGF0ZSk7CiAKIAkvKiBEb3VibGUgY2hlY2sgc3RhdGUuICovCkBAIC0xMjIzMSwyMSAr MTIyMTYsNiBAQCBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqc3RhdGUpCiAJCWVsc2UKIAkJCWNydGMtPmh3bW9kZS5jcnRjX2Nsb2NrID0gMDsKIAl9 Ci0KLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwgJmRldi0+bW9kZV9jb25maWcuY29u bmVjdG9yX2xpc3QsIGhlYWQpIHsKLQkJaWYgKCFjb25uZWN0b3ItPmVuY29kZXIgfHwgIWNvbm5l Y3Rvci0+ZW5jb2Rlci0+Y3J0YykKLQkJCWNvbnRpbnVlOwotCi0JCWNydGMgPSBjb25uZWN0b3It PmVuY29kZXItPmNydGM7Ci0JCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19j cnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKLQkJaWYgKCFjcnRjX3N0YXRlIHx8ICFuZWVkc19tb2Rl c2V0KGNydGMtPnN0YXRlKSkKLQkJCWNvbnRpbnVlOwotCi0JCWlmIChjcnRjLT5zdGF0ZS0+YWN0 aXZlKSB7Ci0JCQlpbnRlbF9lbmNvZGVyID0gdG9faW50ZWxfZW5jb2Rlcihjb25uZWN0b3ItPmVu Y29kZXIpOwotCQkJaW50ZWxfZW5jb2Rlci0+Y29ubmVjdG9yc19hY3RpdmUgPSB0cnVlOwotCQl9 Ci0JfQogfQogCiBzdGF0aWMgYm9vbCBpbnRlbF9mdXp6eV9jbG9ja19jaGVjayhpbnQgY2xvY2sx LCBpbnQgY2xvY2syKQpAQCAtMTQ5NjYsMTAgKzE0OTM2LDggQEAgc3RhdGljIHZvaWQgaW50ZWxf c2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJICogIGFjdHVhbGx5IHVw LCBoZW5jZSBubyBuZWVkIHRvIGJyZWFrIHRoZW0uICovCiAJCVdBUk5fT04oY3J0Yy0+YWN0aXZl KTsKIAotCQlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2LCAmY3J0Yy0+YmFzZSwgZW5jb2Rl cikgewotCQkJV0FSTl9PTihlbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSk7CisJCWZvcl9lYWNo X2VuY29kZXJfb25fY3J0YyhkZXYsICZjcnRjLT5iYXNlLCBlbmNvZGVyKQogCQkJZW5jb2Rlci0+ YmFzZS5jcnRjID0gTlVMTDsKLQkJfQogCX0KIAogCWlmIChjcnRjLT5hY3RpdmUgfHwgSEFTX0dN Q0hfRElTUExBWShkZXYpKSB7CkBAIC0xNTAyOCw3ICsxNDk5Niw2IEBAIHN0YXRpYyB2b2lkIGlu dGVsX3Nhbml0aXplX2VuY29kZXIoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAJCQkJ ZW5jb2Rlci0+cG9zdF9kaXNhYmxlKGVuY29kZXIpOwogCQl9CiAJCWVuY29kZXItPmJhc2UuY3J0 YyA9IE5VTEw7Ci0JCWVuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlID0gZmFsc2U7CiAKIAkJLyog SW5jb25zaXN0ZW50IG91dHB1dC9wb3J0L3BpcGUgc3RhdGUgaGFwcGVucyBwcmVzdW1hYmx5IGR1 ZSB0bwogCQkgKiBhIGJ1ZyBpbiBvbmUgb2YgdGhlIGdldF9od19zdGF0ZSBmdW5jdGlvbnMuIE9y IHNvbWVwbGFjZSBlbHNlCkBAIC0xNTE5MCw3ICsxNTE1Nyw2IEBAIHN0YXRpYyB2b2lkIGludGVs X21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJZW5j b2Rlci0+YmFzZS5jcnRjID0gTlVMTDsKIAkJfQogCi0JCWVuY29kZXItPmNvbm5lY3RvcnNfYWN0 aXZlID0gZmFsc2U7CiAJCURSTV9ERUJVR19LTVMoIltFTkNPREVSOiVkOiVzXSBodyBzdGF0ZSBy ZWFkb3V0OiAlcywgcGlwZSAlY1xuIiwKIAkJCSAgICAgIGVuY29kZXItPmJhc2UuYmFzZS5pZCwK IAkJCSAgICAgIGVuY29kZXItPmJhc2UubmFtZSwKQEAgLTE1MjAxLDcgKzE1MTY3LDYgQEAgc3Rh dGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9yKSB7CiAJCWlm IChjb25uZWN0b3ItPmdldF9od19zdGF0ZShjb25uZWN0b3IpKSB7CiAJCQljb25uZWN0b3ItPmJh c2UuZHBtcyA9IERSTV9NT0RFX0RQTVNfT047Ci0JCQljb25uZWN0b3ItPmVuY29kZXItPmNvbm5l Y3RvcnNfYWN0aXZlID0gdHJ1ZTsKIAkJCWNvbm5lY3Rvci0+YmFzZS5lbmNvZGVyID0gJmNvbm5l Y3Rvci0+ZW5jb2Rlci0+YmFzZTsKIAkJfSBlbHNlIHsKIAkJCWNvbm5lY3Rvci0+YmFzZS5kcG1z ID0gRFJNX01PREVfRFBNU19PRkY7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDYyMDcz ZDJmODNmYS4uYzMwYmJiMjIzODFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTMz LDcgKzEzMyw2IEBAIHN0cnVjdCBpbnRlbF9lbmNvZGVyIHsKIAogCWVudW0gaW50ZWxfb3V0cHV0 X3R5cGUgdHlwZTsKIAl1bnNpZ25lZCBpbnQgY2xvbmVhYmxlOwotCWJvb2wgY29ubmVjdG9yc19h Y3RpdmU7CiAJdm9pZCAoKmhvdF9wbHVnKShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqKTsKIAlib29s ICgqY29tcHV0ZV9jb25maWcpKHN0cnVjdCBpbnRlbF9lbmNvZGVyICosCiAJCQkgICAgICAgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKik7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK