From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH v3 08/22] drm/i915: Zap call to drm_plane_helper_disable. Date: Thu, 28 May 2015 09:22:50 +0200 Message-ID: <5566C24A.1020503@linux.intel.com> References: <1432129094-11765-1-git-send-email-maarten.lankhorst@linux.intel.com> <1432129094-11765-9-git-send-email-maarten.lankhorst@linux.intel.com> <20150528013726.GA15716@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 44B416E1EC for ; Thu, 28 May 2015 00:22:52 -0700 (PDT) In-Reply-To: <20150528013726.GA15716@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T3AgMjgtMDUtMTUgb20gMDM6Mzcgc2NocmVlZiBNYXR0IFJvcGVyOgo+IE9uIFdlZCwgTWF5IDIw LCAyMDE1IGF0IDAzOjM4OjEzUE0gKzAyMDAsIE1hYXJ0ZW4gTGFua2hvcnN0IHdyb3RlOgo+PiBU aGUgcHJpbWFyeSBwbGFuZSBjYW4gc3RpbGwgYmUgY29uZmlndXJlZCB3aGVuIGNydGMgaXMgb2Zm LAo+PiBmdXJ0aGVybW9yZSB0aGlzIGlzIGFsc28gYSBub29wIG5vdyB0aGF0IGFmZmVjdGVkIHBs YW5lcyBhcmUKPj4gYWRkZWQgb24gbW9kZXNldHMuCj4+Cj4+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0 ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Cj4gVGhpcyB3 YXMgYWRkZWQgaW4gcGF0Y2ggIzIuICBDYW4gd2Ugc3F1YXNoIHRoaXMgY2hhbmdlIHVwLCBvciB3 YXMgdGhlcmUKPiBhIHJlYXNvbiB3ZSBuZWVkZWQgaXQgZm9yIHRoZSBpbnRlcm1lZGlhdGUgcGF0 Y2hlcz8KPgo+IEFjdHVhbGx5LCBJJ20gbm90IHN1cmUgdGhpcyBpcyByZWFsbHkgcXVpdGUgYSBu b29wIHlldC4KPiBwcmVwYXJlX3BsYW5lX2ZiIGlzIG5ldmVyIGNhbGxlZCBvbiB0aGUgcHJpbWFy eSBwbGFuZSBhcyBmYXIgYXMgSSBjYW4KPiBzZWUsIHNvIEkgdGhpbmsgb3VyIGZyb250YnVmZmVy IHRyYWNraW5nIGFuZCBzdWNoIG1pZ2h0IGdldCBjb25mdXNlZC4KPiBJbiB0aGUgcmVndWxhciBw bGFuZSB1cGRhdGUgY29kZXBhdGgsIHdlIGhhdmUgdG8gaGFuZGxlIHRoaXMgd2l0aCBhCj4gc3Bl Y2lhbCBjYXNlIGJ5IGRvaW5nOgo+Cj4gICAgICAgICBpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJs ZWRfcGxhbmVzIHw9ICgxIDw8IGRybV9wbGFuZV9pbmRleChwbGFuZSkpOwo+Cj4gaW4gdGhlIGlu dGVsX3BsYW5lX2F0b21pY19jaGVjayBmdW5jdGlvbi4gIEJ1dCBmcm9tIHdoYXQgSSBjYW4gc2Vl LCB3ZQo+IGJ5cGFzcyB0aGF0IGluIHRoaXMgY29kZXBhdGguICBpZ3Qva21zX3VuaXZlcnNhbF9w bGFuZSBzaG93cyB0aGF0IHdlIGRvCj4gcnVuIGludG8gZnJvbnRidWZmZXIgdHJhY2tpbmcgd2Fy bmluZ3MgaWYgd2UgZG9uJ3QgcHV0IGFuIGVxdWl2YWxlbnQKPiB1cGRhdGUgdG8gdGhlICdkaXNh YmxlZF9wbGFuZXMnIGZsYWcgaGVyZS4KCldlbGwgaWYgdGhpcyBpcyB0aGUgY2FzZSB3ZSdyZSBy ZWFsbHkgbWVzc2luZyB1cCBvbiBhZGRpbmcgcGxhbmVzLi4gSWYgCndlJ3JlIGZpbmUgd2l0aCBs ZWF2aW5nIHRoZSB3YXJuaW5nIGZvciBub3cgSSdtIGZpeGluZyBpdCB1cCBpbiBzZXJpZXMgCjMu CgpEbyB0aGUgYmVsb3cgcGF0Y2hlcyBmaXggaXQ/Cgpjb21taXQgMDVmYWM1YjJjMjlhODU0OTJj Njc3ZTQyZWM2OGU5NGY5MDExZGFhMgpBdXRob3I6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CkRhdGU6ICAgVHVlIE1heSAyNiAxMzowMDowOCAy MDE1ICswMjAwCgogICAgZHJtL2k5MTU6IHVwZGF0ZSBwbGFuZSBzdGF0ZSBkdXJpbmcgaW5pdAog ICAgCiAgICBBdG9taWMgcGxhbmVzIHVwZGF0ZXMgcmVseSBvbiBoYXZpbmcgYSBhY2N1cmF0ZSBw bGFuZV9tYXNrLgogICAgCiAgICBTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwppbmRleCA1NThmZTUxZjE1MWUuLjY5MmNmOTA5MmY2YSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjY0NSw5ICsyNjQ1LDkgQEAgdmFsaWRfZmI6CiAJCWRl dl9wcml2LT5wcmVzZXJ2ZV9iaW9zX3N3aXp6bGUgPSB0cnVlOwogCiAJcHJpbWFyeS0+ZmIgPSBm YjsKLQlwcmltYXJ5LT5zdGF0ZS0+Y3J0YyA9ICZpbnRlbF9jcnRjLT5iYXNlOwotCXByaW1hcnkt PmNydGMgPSAmaW50ZWxfY3J0Yy0+YmFzZTsKKwlwcmltYXJ5LT5jcnRjID0gcHJpbWFyeS0+c3Rh dGUtPmNydGMgPSAmaW50ZWxfY3J0Yy0+YmFzZTsKIAl1cGRhdGVfc3RhdGVfZmIocHJpbWFyeSk7 CisJaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+cGxhbmVfbWFzayB8PSAoMSA8PCBkcm1fcGxhbmVf aW5kZXgocHJpbWFyeSkpOwogCW9iai0+ZnJvbnRidWZmZXJfYml0cyB8PSBJTlRFTF9GUk9OVEJV RkZFUl9QUklNQVJZKGludGVsX2NydGMtPnBpcGUpOwogfQogCkBAIC0xNDk1OSw3ICsxNDk1OSw5 IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9nZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CQkJCSAgdG9faW50ZWxfY3J0YyhjKS0+cGlwZSk7CiAJCQlkcm1fZnJhbWVidWZmZXJfdW5yZWZl cmVuY2UoYy0+cHJpbWFyeS0+ZmIpOwogCQkJYy0+cHJpbWFyeS0+ZmIgPSBOVUxMOworCQkJYy0+ cHJpbWFyeS0+Y3J0YyA9IGMtPnByaW1hcnktPnN0YXRlLT5jcnRjID0gTlVMTDsKIAkJCXVwZGF0 ZV9zdGF0ZV9mYihjLT5wcmltYXJ5KTsKKwkJCWMtPnN0YXRlLT5wbGFuZV9tYXNrICY9IH4oMSA8 PCBkcm1fcGxhbmVfaW5kZXgoYy0+cHJpbWFyeSkpOwogCQl9CiAJfQogCgoKY29tbWl0IGIyY2Fm ZmRlOThkOWY3MzM1ZTc3NGQxODU5Yjg4MWIwZGY4YTEwOWEKQXV0aG9yOiBNYWFydGVuIExhbmto b3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpEYXRlOiAgIE1vbiBNYXkg MjUgMTA6MjU6NDUgMjAxNSArMDIwMAoKICAgIGRybS9pOTE1OiBNYWtlIHN1cmUgYWxsIHBsYW5l cyBhbmQgY29ubmVjdG9ycyBhcmUgYWRkZWQgb24gbW9kZXNldC4KICAgIAogICAgQWRkIG1pc3Np bmcgY2FsbHMgdG8gZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfKi4gVGhpcyBpcyBuZWVkZWQKICAg IHRvIGNvbnZlcnQgdG8gYXRvbWljIHBsYW5lcy4gV2hlbiBjb252ZXJ0aW5nIHRvIGF0b21pYyBh bGwgcGxhbmVzCiAgICBhcmUgbmVlZGVkIG9uIG1vZGVzZXQuIEZvciBnb29kIG1lYXN1cmUgbWFr ZSBzdXJlIGFsbCBjb25uZWN0b3JzCiAgICBhcmUgYWRkZWQgdG9vLgogICAgCiAgICBTaWduZWQt b2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwu Y29tPgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA1YzFlNzRkMWZiMWIu LjU1OGZlNTFmMTUxZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNTYy OCw3ICs1NjI4LDcgQEAgc3RhdGljIGludCB2YWxsZXl2aWV3X21vZGVzZXRfZ2xvYmFsX3BpcGVz KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7 CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCWludCBtYXhfcGl4Y2xrID0g aW50ZWxfbW9kZV9tYXhfcGl4Y2xrKHN0YXRlLT5kZXYsIHN0YXRlKTsKLQlpbnQgY2RjbGssIGk7 CisJaW50IGNkY2xrLCByZXQgPSAwOwogCiAJaWYgKG1heF9waXhjbGsgPCAwKQogCQlyZXR1cm4g bWF4X3BpeGNsazsKQEAgLTU2NDMsMjAgKzU2NDMsMjUgQEAgc3RhdGljIGludCB2YWxsZXl2aWV3 X21vZGVzZXRfZ2xvYmFsX3BpcGVzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAog CS8qIGFkZCBhbGwgYWN0aXZlIHBpcGVzIHRvIHRoZSBzdGF0ZSAqLwogCWZvcl9lYWNoX2NydGMo c3RhdGUtPmRldiwgY3J0YykgewotCQlpZiAoIWNydGMtPnN0YXRlLT5hY3RpdmUpCi0JCQljb250 aW51ZTsKLQogCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwg Y3J0Yyk7CiAJCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkpCiAJCQlyZXR1cm4gUFRSX0VSUihjcnRj X3N0YXRlKTsKLQl9CiAKLQkvKiBkaXNhYmxlL2VuYWJsZSBhbGwgY3VycmVudGx5IGFjdGl2ZSBw aXBlcyB3aGlsZSB3ZSBjaGFuZ2UgY2RjbGsgKi8KLQlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0 YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKQotCQlpZiAoY3J0Y19zdGF0ZS0+YWN0aXZlKQotCQkJ Y3J0Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKKwkJaWYgKCFjcnRjX3N0YXRlLT5hY3Rp dmUgfHwgbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKKwkJCWNvbnRpbnVlOwogCi0JcmV0dXJu IDA7CisJCWNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7CisKKwkJcmV0ID0gZHJtX2F0 b21pY19hZGRfYWZmZWN0ZWRfY29ubmVjdG9ycyhzdGF0ZSwgY3J0Yyk7CisJCWlmIChyZXQpCisJ CQlicmVhazsKKworCQlyZXQgPSBkcm1fYXRvbWljX2FkZF9hZmZlY3RlZF9wbGFuZXMoc3RhdGUs IGNydGMpOworCQlpZiAocmV0KQorCQkJYnJlYWs7CisJfQorCisJcmV0dXJuIHJldDsKIH0KIAog c3RhdGljIHZvaWQgdmx2X3Byb2dyYW1fcGZpX2NyZWRpdHMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQpAQCAtMTE0ODMsOCArMTE0ODgsMTAgQEAgZW5jb2Rlcl9yZXRyeToKIAog CS8qIENoZWNrIGlmIHdlIG5lZWQgdG8gZm9yY2UgYSBtb2Rlc2V0ICovCiAJaWYgKHBpcGVfY29u ZmlnLT5oYXNfYXVkaW8gIT0KLQkgICAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSkt Pmhhc19hdWRpbykKKwkgICAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSktPmhhc19h dWRpbykgewogCQlwaXBlX2NvbmZpZy0+YmFzZS5tb2RlX2NoYW5nZWQgPSB0cnVlOworCQlyZXQg PSBkcm1fYXRvbWljX2FkZF9hZmZlY3RlZF9wbGFuZXMoc3RhdGUsIGNydGMpOworCX0KIAogCS8q CiAJICogTm90ZSB3ZSBoYXZlIGFuIGlzc3VlIGhlcmUgd2l0aCBpbmZvZnJhbWVzOiBjdXJyZW50 IGNvZGUKQEAgLTExNDkyLDggKzExNDk5LDYgQEAgZW5jb2Rlcl9yZXRyeToKIAkgKiByZXF1aXJl bWVudHMuICBTbyBoZXJlIHdlIHNob3VsZCBiZSBjaGVja2luZyBmb3IgYW55CiAJICogcmVxdWly ZWQgY2hhbmdlcyBhbmQgZm9yY2luZyBhIG1vZGUgc2V0LgogCSAqLwotCi0JcmV0dXJuIDA7CiBm YWlsOgogCXJldHVybiByZXQ7CiB9CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=