From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 10/12] drm/i915: Remove connectors_active. Date: Mon, 27 Jul 2015 14:35:39 +0200 Message-ID: <1438000541-3219-11-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 9B1736E919 for ; Mon, 27 Jul 2015 05:35:49 -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 VGhlcmUgYXJlIG5vIG1vcmUgdXNlcnMsIGJ5ZWJ5ZSEKClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4g TGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzcgKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAg MSAtCiAyIGZpbGVzIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAzNyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMzQxZmFkYjQwYzgxLi4yMzE3NWNl NjU4M2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyMTk2LDI3ICsx MjE5NiwxMiBAQCBzdGF0aWMgYm9vbCBpbnRlbF9jcnRjX2luX3VzZShzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiBzdGF0aWMgdm9pZAogaW50ZWxfbW9kZXNldF91cGRhdGVfc3RhdGUoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0 ZS0+ZGV2OwotCXN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyOwogCXN0cnVjdCBk cm1fY3J0YyAqY3J0YzsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Ci0Jc3Ry dWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlpbnQgaTsKIAogCWludGVsX3NoYXJlZF9k cGxsX2NvbW1pdChzdGF0ZSk7CiAKLQlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgaW50ZWxf ZW5jb2RlcikgewotCQlpZiAoIWludGVsX2VuY29kZXItPmJhc2UuY3J0YykKLQkJCWNvbnRpbnVl OwotCi0JCWNydGMgPSBpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGM7Ci0JCWNydGNfc3RhdGUgPSBk cm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKLQkJaWYgKCFj cnRjX3N0YXRlIHx8ICFuZWVkc19tb2Rlc2V0KGNydGMtPnN0YXRlKSkKLQkJCWNvbnRpbnVlOwot Ci0JCWludGVsX2VuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlID0gZmFsc2U7Ci0JfQotCiAJZHJt X2F0b21pY19oZWxwZXJfdXBkYXRlX2xlZ2FjeV9tb2Rlc2V0X3N0YXRlKHN0YXRlLT5kZXYsIHN0 YXRlKTsKIAogCS8qIERvdWJsZSBjaGVjayBzdGF0ZS4gKi8KQEAgLTEyMjMxLDIxICsxMjIxNiw2 IEBAIGludGVsX21vZGVzZXRfdXBkYXRlX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSkKIAkJZWxzZQogCQkJY3J0Yy0+aHdtb2RlLmNydGNfY2xvY2sgPSAwOwogCX0KLQotCWxp c3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yLCAmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0b3Jf bGlzdCwgaGVhZCkgewotCQlpZiAoIWNvbm5lY3Rvci0+ZW5jb2RlciB8fCAhY29ubmVjdG9yLT5l bmNvZGVyLT5jcnRjKQotCQkJY29udGludWU7Ci0KLQkJY3J0YyA9IGNvbm5lY3Rvci0+ZW5jb2Rl ci0+Y3J0YzsKLQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3Rh dGUoc3RhdGUsIGNydGMpOwotCQlpZiAoIWNydGNfc3RhdGUgfHwgIW5lZWRzX21vZGVzZXQoY3J0 Yy0+c3RhdGUpKQotCQkJY29udGludWU7Ci0KLQkJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUpIHsK LQkJCWludGVsX2VuY29kZXIgPSB0b19pbnRlbF9lbmNvZGVyKGNvbm5lY3Rvci0+ZW5jb2Rlcik7 Ci0JCQlpbnRlbF9lbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSA9IHRydWU7Ci0JCX0KLQl9CiB9 CiAKIHN0YXRpYyBib29sIGludGVsX2Z1enp5X2Nsb2NrX2NoZWNrKGludCBjbG9jazEsIGludCBj bG9jazIpCkBAIC0xNDk2NSwxMCArMTQ5MzUsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6 ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQkgKiAgYWN0dWFsbHkgdXAsIGhlbmNl IG5vIG5lZWQgdG8gYnJlYWsgdGhlbS4gKi8KIAkJV0FSTl9PTihjcnRjLT5hY3RpdmUpOwogCi0J CWZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhkZXYsICZjcnRjLT5iYXNlLCBlbmNvZGVyKSB7Ci0J CQlXQVJOX09OKGVuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlKTsKKwkJZm9yX2VhY2hfZW5jb2Rl cl9vbl9jcnRjKGRldiwgJmNydGMtPmJhc2UsIGVuY29kZXIpCiAJCQllbmNvZGVyLT5iYXNlLmNy dGMgPSBOVUxMOwotCQl9CiAJfQogCiAJaWYgKGNydGMtPmFjdGl2ZSB8fCBIQVNfR01DSF9ESVNQ TEFZKGRldikpIHsKQEAgLTE1MDI3LDcgKzE0OTk1LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2Fu aXRpemVfZW5jb2RlcihzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAkJCQllbmNvZGVy LT5wb3N0X2Rpc2FibGUoZW5jb2Rlcik7CiAJCX0KIAkJZW5jb2Rlci0+YmFzZS5jcnRjID0gTlVM TDsKLQkJZW5jb2Rlci0+Y29ubmVjdG9yc19hY3RpdmUgPSBmYWxzZTsKIAogCQkvKiBJbmNvbnNp c3RlbnQgb3V0cHV0L3BvcnQvcGlwZSBzdGF0ZSBoYXBwZW5zIHByZXN1bWFibHkgZHVlIHRvCiAJ CSAqIGEgYnVnIGluIG9uZSBvZiB0aGUgZ2V0X2h3X3N0YXRlIGZ1bmN0aW9ucy4gT3Igc29tZXBs YWNlIGVsc2UKQEAgLTE1MTg5LDcgKzE1MTU2LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNl dF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQllbmNvZGVyLT5i YXNlLmNydGMgPSBOVUxMOwogCQl9CiAKLQkJZW5jb2Rlci0+Y29ubmVjdG9yc19hY3RpdmUgPSBm YWxzZTsKIAkJRFJNX0RFQlVHX0tNUygiW0VOQ09ERVI6JWQ6JXNdIGh3IHN0YXRlIHJlYWRvdXQ6 ICVzLCBwaXBlICVjXG4iLAogCQkJICAgICAgZW5jb2Rlci0+YmFzZS5iYXNlLmlkLAogCQkJICAg ICAgZW5jb2Rlci0+YmFzZS5uYW1lLApAQCAtMTUyMDAsNyArMTUxNjYsNiBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAlmb3JfZWFjaF9pbnRlbF9jb25uZWN0b3IoZGV2LCBjb25uZWN0b3IpIHsKIAkJaWYgKGNvbm5l Y3Rvci0+Z2V0X2h3X3N0YXRlKGNvbm5lY3RvcikpIHsKIAkJCWNvbm5lY3Rvci0+YmFzZS5kcG1z ID0gRFJNX01PREVfRFBNU19PTjsKLQkJCWNvbm5lY3Rvci0+ZW5jb2Rlci0+Y29ubmVjdG9yc19h Y3RpdmUgPSB0cnVlOwogCQkJY29ubmVjdG9yLT5iYXNlLmVuY29kZXIgPSAmY29ubmVjdG9yLT5l bmNvZGVyLT5iYXNlOwogCQl9IGVsc2UgewogCQkJY29ubmVjdG9yLT5iYXNlLmRwbXMgPSBEUk1f TU9ERV9EUE1TX09GRjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNjIwNzNkMmY4M2Zh Li5jMzBiYmIyMjM4MWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMzMsNyArMTMz LDYgQEAgc3RydWN0IGludGVsX2VuY29kZXIgewogCiAJZW51bSBpbnRlbF9vdXRwdXRfdHlwZSB0 eXBlOwogCXVuc2lnbmVkIGludCBjbG9uZWFibGU7Ci0JYm9vbCBjb25uZWN0b3JzX2FjdGl2ZTsK IAl2b2lkICgqaG90X3BsdWcpKHN0cnVjdCBpbnRlbF9lbmNvZGVyICopOwogCWJvb2wgKCpjb21w dXRlX2NvbmZpZykoc3RydWN0IGludGVsX2VuY29kZXIgKiwKIAkJCSAgICAgICBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqKTsKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=