From: Maarten Lankhorst Subject: [PATCH v4 2/5] drm/atomic: Make drm_atomic_plane_disabling easier to understand. Date: Thu, 16 Feb 2017 15:47:07 +0100 Message-ID: <1487256430-7625-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1487256430-7625-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: In-Reply-To: <1487256430-7625-1-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBmdW5jdGlvbiBiZWNvbWVzIGEgbG90IHNpbXBsZXIgd2hlbiBoYXZpbmcgcGFzc2VkIGJv dGggdGhlIG9sZCBhbmQKbmV3IHN0YXRlIHRvIGl0LiBMb29raW5nIGF0IGFsbCBjYWxsZXJzLCBp dCBzZWVtcyB0aGF0IG9sZF9wbGFuZV9zdGF0ZQppcyBuZXZlciBOVUxMIHNvIHRoZSBjaGVjayBj YW4gYmUgZHJvcHBlZC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWNfaGVscGVyLmMgfCAgNyArKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lX2hlbHBl ci5jICB8ICAyICstCiBpbmNsdWRlL2RybS9kcm1fYXRvbWljX2hlbHBlci5oICAgICB8IDI2ICsr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMo KyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRv bWljX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKaW5kZXgg N2Q0MzJkOWExOGNmLi5lYTU0NGJkZGMyOWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9k cm1fYXRvbWljX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBl ci5jCkBAIC0xNzU3LDcgKzE3NTcsOCBAQCB2b2lkIGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9w bGFuZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaWYgKCFmdW5jcykKIAkJCWNvbnRpbnVl OwogCi0JCWRpc2FibGluZyA9IGRybV9hdG9taWNfcGxhbmVfZGlzYWJsaW5nKHBsYW5lLCBvbGRf cGxhbmVfc3RhdGUpOworCQlkaXNhYmxpbmcgPSBkcm1fYXRvbWljX3BsYW5lX2Rpc2FibGluZyhv bGRfcGxhbmVfc3RhdGUsCisJCQkJCQkgICAgICAgbmV3X3BsYW5lX3N0YXRlKTsKIAogCQlpZiAo YWN0aXZlX29ubHkpIHsKIAkJCS8qCkBAIC0xODUyLDExICsxODUzLDExIEBAIGRybV9hdG9taWNf aGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0YyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9j cnRjX3N0YXRlKQogCiAJCVdBUk5fT04ocGxhbmUtPnN0YXRlLT5jcnRjICYmIHBsYW5lLT5zdGF0 ZS0+Y3J0YyAhPSBjcnRjKTsKIAotCQlpZiAoZHJtX2F0b21pY19wbGFuZV9kaXNhYmxpbmcocGxh bmUsIG9sZF9wbGFuZV9zdGF0ZSkgJiYKKwkJaWYgKGRybV9hdG9taWNfcGxhbmVfZGlzYWJsaW5n KG9sZF9wbGFuZV9zdGF0ZSwgcGxhbmUtPnN0YXRlKSAmJgogCQkgICAgcGxhbmVfZnVuY3MtPmF0 b21pY19kaXNhYmxlKQogCQkJcGxhbmVfZnVuY3MtPmF0b21pY19kaXNhYmxlKHBsYW5lLCBvbGRf cGxhbmVfc3RhdGUpOwogCQllbHNlIGlmIChwbGFuZS0+c3RhdGUtPmNydGMgfHwKLQkJCSBkcm1f YXRvbWljX3BsYW5lX2Rpc2FibGluZyhwbGFuZSwgb2xkX3BsYW5lX3N0YXRlKSkKKwkJCSBkcm1f YXRvbWljX3BsYW5lX2Rpc2FibGluZyhvbGRfcGxhbmVfc3RhdGUsIHBsYW5lLT5zdGF0ZSkpCiAJ CQlwbGFuZV9mdW5jcy0+YXRvbWljX3VwZGF0ZShwbGFuZSwgb2xkX3BsYW5lX3N0YXRlKTsKIAl9 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX3BsYW5lX2hlbHBlci5jCmluZGV4IDE0ODY4OGZiOTIwYS4uZjRkNzBk ZDVlM2U0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lX2hlbHBlci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMKQEAgLTQ3MCw3ICs0NzAsNyBA QCBpbnQgZHJtX3BsYW5lX2hlbHBlcl9jb21taXQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ ICogRHJpdmVycyBtYXkgb3B0aW9uYWxseSBpbXBsZW1lbnQgdGhlIC0+YXRvbWljX2Rpc2FibGUg Y2FsbGJhY2ssIHNvCiAJICogc3BlY2lhbC1jYXNlIHRoYXQgaGVyZS4KIAkgKi8KLQlpZiAoZHJt X2F0b21pY19wbGFuZV9kaXNhYmxpbmcocGxhbmUsIHBsYW5lX3N0YXRlKSAmJgorCWlmIChkcm1f YXRvbWljX3BsYW5lX2Rpc2FibGluZyhwbGFuZV9zdGF0ZSwgcGxhbmUtPnN0YXRlKSAmJgogCSAg ICBwbGFuZV9mdW5jcy0+YXRvbWljX2Rpc2FibGUpCiAJCXBsYW5lX2Z1bmNzLT5hdG9taWNfZGlz YWJsZShwbGFuZSwgcGxhbmVfc3RhdGUpOwogCWVsc2UKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJt L2RybV9hdG9taWNfaGVscGVyLmggYi9pbmNsdWRlL2RybS9kcm1fYXRvbWljX2hlbHBlci5oCmlu ZGV4IDljZWRhMzc5Y2U1OC4uZGMxNjI3NDk4N2M3IDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9k cm1fYXRvbWljX2hlbHBlci5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9hdG9taWNfaGVscGVyLmgK QEAgLTIyMCwxMCArMjIwLDEwIEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9sZWdhY3lfZ2FtbWFf c2V0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgICAgIF9fZHJtX2F0b21pY19nZXRfY3Vy cmVudF9wbGFuZV9zdGF0ZSgoY3J0Y19zdGF0ZSktPnN0YXRlLCBcCiAJCQkJCQkJCSAgIHBsYW5l KSkpCiAKLS8qCisvKioKICAqIGRybV9hdG9taWNfcGxhbmVfZGlzYWJsaW5nIC0gY2hlY2sgd2hl dGhlciBhIHBsYW5lIGlzIGJlaW5nIGRpc2FibGVkCi0gKiBAcGxhbmU6IHBsYW5lIG9iamVjdAot ICogQG9sZF9zdGF0ZTogcHJldmlvdXMgYXRvbWljIHN0YXRlCisgKiBAb2xkX3BsYW5lX3N0YXRl OiBvbGQgYXRvbWljIHBsYW5lIHN0YXRlCisgKiBAbmV3X3BsYW5lX3N0YXRlOiBuZXcgYXRvbWlj IHBsYW5lIHN0YXRlCiAgKgogICogQ2hlY2tzIHRoZSBhdG9taWMgc3RhdGUgb2YgYSBwbGFuZSB0 byBkZXRlcm1pbmUgd2hldGhlciBpdCdzIGJlaW5nIGRpc2FibGVkCiAgKiBvciBub3QuIFRoaXMg YWxzbyBXQVJOcyBpZiBpdCBkZXRlY3RzIGFuIGludmFsaWQgc3RhdGUgKGJvdGggQ1JUQyBhbmQg RkIKQEAgLTIzMywyOCArMjMzLDE4IEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9sZWdhY3lfZ2Ft bWFfc2V0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKICAqIFRydWUgaWYgdGhlIHBsYW5lIGlzIGJl aW5nIGRpc2FibGVkLCBmYWxzZSBvdGhlcndpc2UuCiAgKi8KIHN0YXRpYyBpbmxpbmUgYm9vbAot ZHJtX2F0b21pY19wbGFuZV9kaXNhYmxpbmcoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkg ICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfc3RhdGUpCitkcm1fYXRvbWljX3BsYW5lX2Rp c2FibGluZyhzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUsCisJCQkgICBz dHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpuZXdfcGxhbmVfc3RhdGUpCiB7CiAJLyoKIAkgKiBXaGVu IGRpc2FibGluZyBhIHBsYW5lLCBDUlRDIGFuZCBGQiBzaG91bGQgYWx3YXlzIGJlIE5VTEwgdG9n ZXRoZXIuCiAJICogQW55dGhpbmcgZWxzZSBzaG91bGQgYmUgY29uc2lkZXJlZCBhIGJ1ZyBpbiB0 aGUgYXRvbWljIGNvcmUsIHNvIHdlCiAJICogZ2VudGx5IHdhcm4gYWJvdXQgaXQuCiAJICovCi0J V0FSTl9PTigocGxhbmUtPnN0YXRlLT5jcnRjID09IE5VTEwgJiYgcGxhbmUtPnN0YXRlLT5mYiAh PSBOVUxMKSB8fAotCQkocGxhbmUtPnN0YXRlLT5jcnRjICE9IE5VTEwgJiYgcGxhbmUtPnN0YXRl LT5mYiA9PSBOVUxMKSk7CisJV0FSTl9PTigobmV3X3BsYW5lX3N0YXRlLT5jcnRjID09IE5VTEwg JiYgbmV3X3BsYW5lX3N0YXRlLT5mYiAhPSBOVUxMKSB8fAorCQkobmV3X3BsYW5lX3N0YXRlLT5j cnRjICE9IE5VTEwgJiYgbmV3X3BsYW5lX3N0YXRlLT5mYiA9PSBOVUxMKSk7CiAKLQkvKgotCSAq IFdoZW4gdXNpbmcgdGhlIHRyYW5zaXRpb25hbCBoZWxwZXJzLCBvbGRfc3RhdGUgbWF5IGJlIE5V TEwuIElmIHNvLAotCSAqIHdlIGtub3cgbm90aGluZyBhYm91dCB0aGUgY3VycmVudCBzdGF0ZSBh bmQgaGF2ZSB0byBhc3N1bWUgdGhhdCBpdAotCSAqIG1pZ2h0IGJlIGVuYWJsZWQuCi0JICoKLQkg KiBXaGVuIHVzaW5nIHRoZSBhdG9taWMgaGVscGVycywgb2xkX3N0YXRlIHdvbid0IGJlIE5VTEwu IFRoZXJlZm9yZQotCSAqIHRoaXMgY2hlY2sgYXNzdW1lcyB0aGF0IGVpdGhlciB0aGUgZHJpdmVy IHdpbGwgaGF2ZSByZWNvbnN0cnVjdGVkCi0JICogdGhlIGNvcnJlY3Qgc3RhdGUgaW4gLT5yZXNl dCgpIG9yIHRoYXQgdGhlIGRyaXZlciB3aWxsIGhhdmUgdGFrZW4KLQkgKiBhcHByb3ByaWF0ZSBt ZWFzdXJlcyB0byBkaXNhYmxlIGFsbCBwbGFuZXMuCi0JICovCi0JcmV0dXJuICghb2xkX3N0YXRl IHx8IG9sZF9zdGF0ZS0+Y3J0YykgJiYgIXBsYW5lLT5zdGF0ZS0+Y3J0YzsKKwlyZXR1cm4gb2xk X3BsYW5lX3N0YXRlLT5jcnRjICYmICFuZXdfcGxhbmVfc3RhdGUtPmNydGM7CiB9CiAKICNlbmRp ZiAvKiBEUk1fQVRPTUlDX0hFTFBFUl9IXyAqLwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=