From: Maarten Lankhorst Subject: [PATCH v2 (resend) 5/6] drm/i915: Kill off intel_crtc_active. Date: Fri, 17 Nov 2017 12:59:36 +0100 Message-ID: <20171117115937.25714-6-maarten.lankhorst@linux.intel.com> References: <20171117115937.25714-1-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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 84EBA6EA35 for ; Fri, 17 Nov 2017 11:59:45 +0000 (UTC) In-Reply-To: <20171117115937.25714-1-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 VXNlIGNydGMtPmFjdGl2ZSBkaXJlY3RseSBpbnN0ZWFkLiBUaGlzIGlzIHN0aWxsIG5vdCBjb21w bGV0ZWx5Cm9wdGltYWwgYW5kIG5lZWRzIGZpeGluZywgYnV0IGl0J3MgYWJvdXQgYXMgZ29vZCBh cyB1c2luZwppbnRlbF9jcnRjX2FjdGl2ZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hv cnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTkgLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZmJjLmMgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgICAgICB8ICA2ICsrKy0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDI0 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjODVi MDc5NzA1MTguLjM2NzFkNTg2MDAzZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtOTcxLDI1ICs5NzEsNiBAQCBib29sIGJ4dF9maW5kX2Jlc3RfZHBsbChzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwgaW50IHRhcmdldF9jbG9jaywKIAkJCQkgIHRhcmdl dF9jbG9jaywgcmVmY2xrLCBOVUxMLCBiZXN0X2Nsb2NrKTsKIH0KIAotYm9vbCBpbnRlbF9jcnRj X2FjdGl2ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKLXsKLQkvKiBCZSBwYXJhbm9pZCBhcyB3 ZSBjYW4gYXJyaXZlIGhlcmUgd2l0aCBvbmx5IHBhcnRpYWwKLQkgKiBzdGF0ZSByZXRyaWV2ZWQg ZnJvbSB0aGUgaGFyZHdhcmUgZHVyaW5nIHNldHVwLgotCSAqCi0JICogV2UgY2FuIGRpdGNoIHRo ZSBhZGp1c3RlZF9tb2RlLmNydGNfY2xvY2sgY2hlY2sgYXMgc29vbgotCSAqIGFzIEhhc3dlbGwg aGFzIGdhaW5lZCBjbG9jayByZWFkb3V0L2Zhc3Rib290IHN1cHBvcnQuCi0JICoKLQkgKiBXZSBj YW4gZGl0Y2ggdGhlIGNydGMtPnByaW1hcnktPmZiIGNoZWNrIGFzIHNvb24gYXMgd2UgY2FuCi0J ICogcHJvcGVybHkgcmVjb25zdHJ1Y3QgZnJhbWVidWZmZXJzLgotCSAqCi0JICogRklYTUU6IFRo ZSBpbnRlbF9jcnRjLT5hY3RpdmUgaGVyZSBzaG91bGQgYmUgc3dpdGNoZWQgdG8KLQkgKiBjcnRj LT5zdGF0ZS0+YWN0aXZlIG9uY2Ugd2UgaGF2ZSBwcm9wZXIgQ1JUQyBzdGF0ZXMgd2lyZWQgdXAK LQkgKiBmb3IgYXRvbWljLgotCSAqLwotCXJldHVybiBjcnRjLT5hY3RpdmUgJiYgY3J0Yy0+YmFz ZS5wcmltYXJ5LT5zdGF0ZS0+ZmIgJiYKLQkJY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21v ZGUuY3J0Y19jbG9jazsKLX0KLQogZW51bSB0cmFuc2NvZGVyIGludGVsX3BpcGVfdG9fY3B1X3Ry YW5zY29kZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCQkgICAgIGVu dW0gcGlwZSBwaXBlKQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAxNTVlN2FhMWUw ZTUuLjFmNGMzNjIwMWUyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTE0OTksNyAr MTQ5OSw2IEBAIGJvb2wgYnh0X2ZpbmRfYmVzdF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlLCBpbnQgdGFyZ2V0X2Nsb2NrLAogCQkJc3RydWN0IGRwbGwgKmJlc3RfY2xv Y2spOwogaW50IGNodl9jYWxjX2RwbGxfcGFyYW1zKGludCByZWZjbGssIHN0cnVjdCBkcGxsICpw bGxfY2xvY2spOwogCi1ib29sIGludGVsX2NydGNfYWN0aXZlKHN0cnVjdCBpbnRlbF9jcnRjICpj cnRjKTsKIHZvaWQgaHN3X2VuYWJsZV9pcHMoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpOwogdm9pZCBoc3dfZGlzYWJsZV9pcHMoY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUpOwogZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBp bnRlbF9wb3J0X3RvX3Bvd2VyX2RvbWFpbihlbnVtIHBvcnQgcG9ydCk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2ZiYy5jCmluZGV4IDFhMGY1ZTBjOGQxMC4uN2RlMGNhMzJkMjg2IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9mYmMuYwpAQCAtMTI5Nyw3ICsxMjk3LDcgQEAgdm9pZCBpbnRlbF9mYmNfaW5pdF9w aXBlX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuOwog CiAJZm9yX2VhY2hfaW50ZWxfY3J0YygmZGV2X3ByaXYtPmRybSwgY3J0YykKLQkJaWYgKGludGVs X2NydGNfYWN0aXZlKGNydGMpICYmCisJCWlmIChjcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUgJiYK IAkJICAgIGNydGMtPmJhc2UucHJpbWFyeS0+c3RhdGUtPnZpc2libGUpCiAJCQlkZXZfcHJpdi0+ ZmJjLnZpc2libGVfcGlwZXNfbWFzayB8PSAoMSA8PCBjcnRjLT5waXBlKTsKIH0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCmluZGV4IGFiMDQ0NWNlNjdhMS4uYWU4YmFkMTAxNDVjIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKQEAgLTgzNCw3ICs4MzQsNyBAQCBzdGF0aWMgc3RydWN0IGludGVsX2Ny dGMgKnNpbmdsZV9lbmFibGVkX2NydGMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCAqZW5hYmxlZCA9IE5VTEw7CiAKIAlmb3JfZWFj aF9pbnRlbF9jcnRjKCZkZXZfcHJpdi0+ZHJtLCBjcnRjKSB7Ci0JCWlmIChpbnRlbF9jcnRjX2Fj dGl2ZShjcnRjKSkgeworCQlpZiAoY3J0Yy0+YWN0aXZlKSB7CiAJCQlpZiAoZW5hYmxlZCkKIAkJ CQlyZXR1cm4gTlVMTDsKIAkJCWVuYWJsZWQgPSBjcnRjOwpAQCAtMjUwOSwxMSArMjUwOSwxMSBA QCBzdGF0aWMgdm9pZCBpOXh4X3Byb2dyYW1fd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAKIAljcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKGRldl9w cml2LCAwKTsKIAlwbGFuZWFfd20gPSBjcnRjLT53bS5hY3RpdmUuaTl4eC5wbGFuZV93bTsKLQlp ZiAoaW50ZWxfY3J0Y19hY3RpdmUoY3J0YykpCisJaWYgKGNydGMtPmFjdGl2ZSkKIAkJZW5hYmxl ZCA9IGNydGM7CiAKIAljcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKGRldl9wcml2LCAx KTsKLQlpZiAoaW50ZWxfY3J0Y19hY3RpdmUoY3J0YykpIHsKKwlpZiAoY3J0Yy0+YWN0aXZlKSB7 CiAJCWlmIChlbmFibGVkID09IE5VTEwpCiAJCQllbmFibGVkID0gY3J0YzsKIAkJZWxzZQotLSAK Mi4xNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK