From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 13/13] drm/i915: Remove connectors_active. Date: Thu, 16 Jul 2015 10:59:26 +0200 Message-ID: <1437037166-9339-14-git-send-email-maarten.lankhorst@linux.intel.com> References: <1437037166-9339-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 29B156E6E0 for ; Thu, 16 Jul 2015 02:01:08 -0700 (PDT) In-Reply-To: <1437037166-9339-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 cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNDQgKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAg MSAtCiAyIGZpbGVzIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCA0NCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNzkwYjQ2ZjhiZjU0Li40NWZiYmJm NDc4YWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyMjA0LDI3ICsx MjIwNCwxMiBAQCBzdGF0aWMgYm9vbCBpbnRlbF9jcnRjX2luX3VzZShzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiBzdGF0aWMgdm9pZAogaW50ZWxfbW9kZXNldF91cGRhdGVfc3RhdGUoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0 ZS0+ZGV2OwotCXN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyOwogCXN0cnVjdCBk cm1fY3J0YyAqY3J0YzsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Ci0Jc3Ry dWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlpbnQgaTsKIAogCWludGVsX3NoYXJlZF9k cGxsX2NvbW1pdChzdGF0ZSk7CiAKLQlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgaW50ZWxf ZW5jb2RlcikgewotCQlpZiAoIWludGVsX2VuY29kZXItPmJhc2UuY3J0YykKLQkJCWNvbnRpbnVl OwotCi0JCWNydGMgPSBpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGM7Ci0JCWNydGNfc3RhdGUgPSBk cm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKLQkJaWYgKCFj cnRjX3N0YXRlIHx8ICFuZWVkc19tb2Rlc2V0KGNydGMtPnN0YXRlKSkKLQkJCWNvbnRpbnVlOwot Ci0JCWludGVsX2VuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlID0gZmFsc2U7Ci0JfQotCiAJZHJt X2F0b21pY19oZWxwZXJfdXBkYXRlX2xlZ2FjeV9tb2Rlc2V0X3N0YXRlKHN0YXRlLT5kZXYsIHN0 YXRlKTsKIAogCS8qIERvdWJsZSBjaGVjayBzdGF0ZS4gKi8KQEAgLTEyMjM5LDI4ICsxMjIyNCw2 IEBAIGludGVsX21vZGVzZXRfdXBkYXRlX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSkKIAkJZWxzZQogCQkJY3J0Yy0+aHdtb2RlLmNydGNfY2xvY2sgPSAwOwogCX0KLQotCWxp c3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yLCAmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0b3Jf bGlzdCwgaGVhZCkgewotCQlpZiAoIWNvbm5lY3Rvci0+ZW5jb2RlciB8fCAhY29ubmVjdG9yLT5l bmNvZGVyLT5jcnRjKQotCQkJY29udGludWU7Ci0KLQkJY3J0YyA9IGNvbm5lY3Rvci0+ZW5jb2Rl ci0+Y3J0YzsKLQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3Rh dGUoc3RhdGUsIGNydGMpOwotCQlpZiAoIWNydGNfc3RhdGUgfHwgIW5lZWRzX21vZGVzZXQoY3J0 Yy0+c3RhdGUpKQotCQkJY29udGludWU7Ci0KLQkJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUpIHsK LQkJCXN0cnVjdCBkcm1fcHJvcGVydHkgKmRwbXNfcHJvcGVydHkgPQotCQkJCWRldi0+bW9kZV9j b25maWcuZHBtc19wcm9wZXJ0eTsKLQotCQkJY29ubmVjdG9yLT5kcG1zID0gRFJNX01PREVfRFBN U19PTjsKLQkJCWRybV9vYmplY3RfcHJvcGVydHlfc2V0X3ZhbHVlKCZjb25uZWN0b3ItPmJhc2Us IGRwbXNfcHJvcGVydHksIERSTV9NT0RFX0RQTVNfT04pOwotCi0JCQlpbnRlbF9lbmNvZGVyID0g dG9faW50ZWxfZW5jb2Rlcihjb25uZWN0b3ItPmVuY29kZXIpOwotCQkJaW50ZWxfZW5jb2Rlci0+ Y29ubmVjdG9yc19hY3RpdmUgPSB0cnVlOwotCQl9IGVsc2UKLQkJCWNvbm5lY3Rvci0+ZHBtcyA9 IERSTV9NT0RFX0RQTVNfT0ZGOwotCX0KIH0KIAogc3RhdGljIGJvb2wgaW50ZWxfZnV6enlfY2xv Y2tfY2hlY2soaW50IGNsb2NrMSwgaW50IGNsb2NrMikKQEAgLTE0OTg4LDEwICsxNDk1MSw4IEBA IHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMp CiAJCSAqICBhY3R1YWxseSB1cCwgaGVuY2Ugbm8gbmVlZCB0byBicmVhayB0aGVtLiAqLwogCQlX QVJOX09OKGNydGMtPmFjdGl2ZSk7CiAKLQkJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwg JmNydGMtPmJhc2UsIGVuY29kZXIpIHsKLQkJCVdBUk5fT04oZW5jb2Rlci0+Y29ubmVjdG9yc19h Y3RpdmUpOworCQlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2LCAmY3J0Yy0+YmFzZSwgZW5j b2RlcikKIAkJCWVuY29kZXItPmJhc2UuY3J0YyA9IE5VTEw7Ci0JCX0KIAl9CiAKIAlpZiAoY3J0 Yy0+YWN0aXZlIHx8IEhBU19HTUNIX0RJU1BMQVkoZGV2KSkgewpAQCAtMTUwNTAsNyArMTUwMTEs NiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9lbmNvZGVyKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyKQogCQkJCWVuY29kZXItPnBvc3RfZGlzYWJsZShlbmNvZGVyKTsKIAkJfQog CQllbmNvZGVyLT5iYXNlLmNydGMgPSBOVUxMOwotCQllbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2 ZSA9IGZhbHNlOwogCiAJCS8qIEluY29uc2lzdGVudCBvdXRwdXQvcG9ydC9waXBlIHN0YXRlIGhh cHBlbnMgcHJlc3VtYWJseSBkdWUgdG8KIAkJICogYSBidWcgaW4gb25lIG9mIHRoZSBnZXRfaHdf c3RhdGUgZnVuY3Rpb25zLiBPciBzb21lcGxhY2UgZWxzZQpAQCAtMTUyMjAsNyArMTUxODAsNiBA QCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAkJCWVuY29kZXItPmJhc2UuY3J0YyA9IE5VTEw7CiAJCX0KIAotCQllbmNv ZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSA9IGZhbHNlOwogCQlEUk1fREVCVUdfS01TKCJbRU5DT0RF UjolZDolc10gaHcgc3RhdGUgcmVhZG91dDogJXMsIHBpcGUgJWNcbiIsCiAJCQkgICAgICBlbmNv ZGVyLT5iYXNlLmJhc2UuaWQsCiAJCQkgICAgICBlbmNvZGVyLT5iYXNlLm5hbWUsCkBAIC0xNTIz MSw3ICsxNTE5MCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWZvcl9lYWNoX2ludGVsX2Nvbm5lY3RvcihkZXYs IGNvbm5lY3RvcikgewogCQlpZiAoY29ubmVjdG9yLT5nZXRfaHdfc3RhdGUoY29ubmVjdG9yKSkg ewogCQkJY29ubmVjdG9yLT5iYXNlLmRwbXMgPSBEUk1fTU9ERV9EUE1TX09OOwotCQkJY29ubmVj dG9yLT5lbmNvZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSA9IHRydWU7CiAJCQljb25uZWN0b3ItPmJh c2UuZW5jb2RlciA9ICZjb25uZWN0b3ItPmVuY29kZXItPmJhc2U7CiAJCX0gZWxzZSB7CiAJCQlj b25uZWN0b3ItPmJhc2UuZHBtcyA9IERSTV9NT0RFX0RQTVNfT0ZGOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaAppbmRleCAzMThkZGZiOTYzYTIuLjg3ZjYzNjUxOWNjNyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKQEAgLTEzMyw3ICsxMzMsNiBAQCBzdHJ1Y3QgaW50ZWxfZW5jb2RlciB7CiAK IAllbnVtIGludGVsX291dHB1dF90eXBlIHR5cGU7CiAJdW5zaWduZWQgaW50IGNsb25lYWJsZTsK LQlib29sIGNvbm5lY3RvcnNfYWN0aXZlOwogCXZvaWQgKCpob3RfcGx1Zykoc3RydWN0IGludGVs X2VuY29kZXIgKik7CiAJYm9vbCAoKmNvbXB1dGVfY29uZmlnKShzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqLAogCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICopOwotLSAKMi4xLjAKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==